Merge pull request #72 from lucascaton/generator

Fix/improve enum generator
lucascaton · Aug 21, 2017 · fbad428 · fbad428
2 parents 5feca81 + 31db76a
commit fbad428
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/generators/enumerate_it/enum/enum_generator.rb b/lib/generators/enumerate_it/enum/enum_generator.rb
@@ -3,7 +3,7 @@ module Generators
     class EnumGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
 
-      argument :attributes, type: 'array', default: []
+      argument :attributes, type: 'array'
 
       class_option :singular, type: 'string', desc: 'Singular name for i18n'
 
@@ -14,12 +14,12 @@ def create_locale
         template 'locale.yml', File.join('config/locales', "#{singular_name}.yml")
       end
 
-      desc 'Creates an initializer file that extends ActiveRecord::Base with Enumerate_it'
+      desc 'Creates the enumeration'
       def create_enumerate_it
         template 'enumerate_it.rb', File.join('app/enumerations', "#{singular_name}.rb")
       end
 
-      protected
+      private
 
       def default_lang
         options[:lang]

diff --git a/lib/generators/enumerate_it/enum/templates/enumerate_it.rb b/lib/generators/enumerate_it/enum/templates/enumerate_it.rb
@@ -1,3 +1,5 @@
 class <%= class_name %> < EnumerateIt::Base
-  <% if fields.first.is_a?(Array) %>associate_values <%= fields.map {|field, value| ":#{field} => #{value}"}.join(', ') %><% else %>associate_values <%= fields.map {|field| ":#{field}"}.join(', ') %><% end %>
+  associate_values(
+    <%= fields.map { |field, value| value ? "#{field}: #{value}" : ":#{field}"}.join(",\n    ") %>
+  )
 end