power_enum 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQ0Y2ExMWRlNWRlNmNkOTUyMThiNmMxNDVjNDAwN2I4MWQxNGQ3Nw==
+    MGUyY2Y2OGNiNzZmNWEwNjZiNmY2NzcyNjI4NzQxMTQ4ZDcwYTJkNw==
   data.tar.gz: !binary |-
-    NDZhNDNjNjI4ODNjYzZmYjU5MjhiNDUzMGJmZWRmNWJmYjQ1ZTgwNg==
+    MmMzZDk2ODM3OWY5OTZlMzY4ZmY4ZmI0MjQ4ZGMyMDc5NzEzNjdjNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGIzM2ZhYzhmMWQ5Y2U3MDNiMzVjYmExOTA1ZmM5ZmQyYWZlYTI1NTMyNWFi
-    NTkwYTQyOTI0ZGI0NDgwYjdiMDFhNmYwZTg3NzYyMWVlMDk0ZmYxOTg0MDky
-    ZWQwOTc2MGEzMDI2ZmZmMDUyZDhlMjc1YmY3ZGZjOGNkNTgzYzU=
+    NzY3NTQ4MWUzMjJmNmI4MjU1OTM3NDQxNGM0ODE3MzAzYTRmMDIyZmZjM2Ji
+    ZTdiMWY2M2U1OThkMTJlM2QzYTU5YWFjOWFiM2QxODE1ODc1OWMwYzdkMjk4
+    ZTFmODZhNTI2NzBhMTJlM2RjMTQ2ZWJjNTY5NjU0OWI0OWUxN2Q=
   data.tar.gz: !binary |-
-    M2M0ZWQ3ZmNhYzNhNGEzNDNmZWZjOTU0ODAzM2FjMWIyN2Q1YzFkOTQxMGY0
-    ZDdjMjE3NzU3ZGUwNmZlMmIwZmYzMWZmNGJlNTZkMzA4ZTg0MDdiOTgxODYy
-    NWUxNmY3NmUyNGJmYTc1YTM1NTE4ZTkxNDgwZmEyMmU2N2RmMWU=
+    OWY2NDRlYWNmZWEzMDFiZWUzMWIxNzg2YjAzOTU0M2QyZTYxYmZlMGZmZTY1
+    ZDk5NDc5NDc0NzQyZGRlMWRhYmI1OTg2NjRkYTFkZGU2NTYzN2M0NzM3NTEy
+    ZDU5ZmE4ZDM5YTg1MWNiMjQ2ZWY0N2Q5NzM0N2Q4ODgyOTc1NWQ=

data/lib/generators/enum/enum_generator.rb

@@ -2,12 +2,12 @@
 # Released under the MIT license.  See LICENSE for details.
 
 # Generator for PowerEnum
-class EnumGenerator < Rails::Generators::Base
+class EnumGenerator < Rails::Generators::NamedBase
   require File.expand_path('../enum_generator_helpers/migration_number', __FILE__)
-  include EnumGeneratorHelpers::MigrationNumber
+  include Rails::Generators::Migration
+  extend EnumGeneratorHelpers::MigrationNumber
 
   source_root File.expand_path('../templates', __FILE__)
-  argument :enum_name, :type => :string
   class_option :migration, :type => :boolean, :default => true, :desc => 'Generate migration for the enum'
   class_option :fixture, :type => :boolean, :default => false, :desc => 'Generate fixture for the enum'
 
@@ -18,45 +18,17 @@ class EnumGenerator < Rails::Generators::Base
 
   # Generates the migration to create the enum table.
   def generate_migration
-    template migration_template, "db/migrate/#{migration_file_name}.rb" if options.migration?
+    migration_template 'rails31_migration.rb.erb', "db/migrate/create_enum_#{table_name}.rb" if options.migration?
   end
 
-  hook_for :test_framework, :as => :model do |enum_generator_instance, test_generator_class|
-    # Need to do this because I'm changing the default value of the 'fixture' option.
-    enum_generator_instance.invoke( test_generator_class, [enum_generator_instance.enum_name], { 'fixture' => enum_generator_instance.options.fixture? } )
+  # Do not pluralize enumeration names
+  def pluralize_table_names?
+    false
   end
-  
-  no_tasks do
-
-    # Returns the file name of the enum model without the .rb extension.
-    def file_name
-      enum_name.underscore
-    end
-
-    # Returns the class name of the enum.
-    def enum_class_name
-      file_name.camelize
-    end
-
-    # Derives the name for the migration, something like 'create_enum_fruit'
-    def migration_name
-      "create_enum_#{file_name}"
-    end
-
-    # Returns the class name of our migration
-    def migration_class_name
-      migration_name.camelize
-    end
-
-    # Generates and returns the filename of our migration
-    def migration_file_name
-      "#{next_migration_number}_#{migration_name}"
-    end
-
-    # Returns the name of the template file for the migration.
-    def migration_template
-      'rails31_migration.rb.erb'
-    end
 
+  hook_for :test_framework, :as => :model do |enum_generator_instance, test_generator_class|
+    # Need to do this because I'm changing the default value of the 'fixture' option.
+    table_name = enum_generator_instance.send(:table_name)
+    enum_generator_instance.invoke( test_generator_class, [table_name], { 'fixture' => enum_generator_instance.options.fixture? } )
   end
 end

data/lib/generators/enum/enum_generator_helpers/migration_number.rb

@@ -2,23 +2,13 @@
 module EnumGeneratorHelpers
   # Helper methods to figure out the migration number.
   module MigrationNumber
-
-    # Returns the number of the last migration.
-    # @return [Fixnum]
-    def current_migration_number
-      dirname = "#{Rails.root}/db/migrate/[0-9]*_*.rb"
-      Dir.glob(dirname).collect do |file|
-        File.basename(file).split("_").first.to_i
-      end.max.to_i
-    end
-
     # Returns the next upcoming migration number.  Sadly, Rails has no API for
     # this, so we're reduced to copying from ActiveRecord::Generators::Migration
     # @return [Fixnum]
-    def next_migration_number
+    def next_migration_number(dirname)
       # Lifted directly from ActiveRecord::Generators::Migration
       # Unfortunately, no API is provided by Rails at this time.
-      next_migration_number = current_migration_number + 1
+      next_migration_number = current_migration_number(dirname) + 1
       if ActiveRecord::Base.timestamped_migrations
         [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
       else
@@ -27,4 +17,4 @@ module EnumGeneratorHelpers
     end
 
   end
-end
+end

data/lib/generators/enum/templates/model.rb.erb

@@ -1,3 +1,3 @@
-class <%= enum_class_name %> < ActiveRecord::Base
+class <%= class_name %> < ActiveRecord::Base
   acts_as_enumerated
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Trevor Squires
@@ -39,7 +39,7 @@ cert_chain:
   amZaYUtWM2wwYTFkR2wyUVNMa2pScFFaRDFiRCtVSDdnT3F5N1piZGNzUkJM
   NEg3VTV6VQpibEtkZEg2dXhDckRTTTdLYWJrelNPVmYKLS0tLS1FTkQgQ0VS
   VElGSUNBVEUtLS0tLQo=
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,14 +117,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
 description: ! 'Power Enum allows you to treat instances of your ActiveRecord models
   as though they were an enumeration of values.
 
@@ -188,4 +188,3 @@ specification_version: 4
 summary: Allows you to treat instances of your ActiveRecord models as though they
   were an enumeration of values
 test_files: []
-has_rdoc: 

metadata.gz.sig

@@ -1,3 +1 @@
-P�o��cZ`Q�QB�W�A�+�>��>������m�*��,�ʿ���Yz�B�z,�槡Yc��/�V|=�8����b���gY��<��$ ��"UXm�Ln�&iS�y�
��9C���#W=~B��=���NjX����ʔL�)+�%����'�2ܺ�}�#w�#��
-�9�¡�����$ѥ�)����X�|̺�S�<�J
�ռ��
-��6�{��`�*�fq�LYB]�8@ܮ7���
+��Ȗ�R����3�t@j]�@W/Eh�x3�<���&H!�x�V_Ξh`�(`n\M���b�|�z~��G���Q<���g� J*�S���~�%B�);$i���T��S��pi�Dޞ��%$�h��<������υ��Q[���x��?�]��L���e����>�kuˏ<}@�9����