power_enum 1.1.1 → 1.1.2

data/lib/active_record/virtual_enumerations.rb

@@ -65,21 +65,23 @@ module ActiveRecord # :nodoc:
     # Patches Module#const_missing to enable us to dynamically create enum
     # classes at runtime.
     def self.patch_const_lookup
+      # Make sure we haven't patched Module already
+      unless ::Module.respond_to?(:enumerations_original_const_missing)
+        # patch Module to support VirtualEnumerations
+        ::Module.module_eval do
+
+          alias_method :enumerations_original_const_missing, :const_missing
+
+          # Override const_missing to see if VirtualEnumerations can create it.
+          def const_missing(const_id)
+            # let rails have a go at loading it
+            enumerations_original_const_missing(const_id)
+          rescue NameError
+            # now it's our turn
+            ActiveRecord::VirtualEnumerations.synthesize_if_defined(const_id) or raise
+          end
 
-      # patch Module to support VirtualEnumerations
-      ::Module.module_eval do
-
-        alias_method :enumerations_original_const_missing, :const_missing
-
-        # Override const_missing to see if VirtualEnumerations can create it.
-        def const_missing(const_id)
-          # let rails have a go at loading it
-          enumerations_original_const_missing(const_id)
-        rescue NameError
-          # now it's our turn
-          ActiveRecord::VirtualEnumerations.synthesize_if_defined(const_id) or raise
         end
-
       end
 
     end
@@ -89,6 +91,7 @@ module ActiveRecord # :nodoc:
     # each enum or enums with a given set of options.
     def self.define
       raise ArgumentError, "#{self.name}: must pass a block to define()" unless block_given?
+      patch_const_lookup
       config = ActiveRecord::VirtualEnumerations::Config.new
       yield config
       @config = config # we only overwrite config if no exceptions were thrown

data/lib/generators/enum/enum_generator.rb

@@ -3,6 +3,9 @@
 
 # Generator for PowerEnum
 class EnumGenerator < Rails::Generators::Base
+  require File.expand_path('../enum_generator_helpers/migration_number', __FILE__)
+  include 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'
@@ -35,27 +38,6 @@ class EnumGenerator < Rails::Generators::Base
       file_name.camelize
     end
 
-    # Returns the number of the last migration.
-    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
-    def next_migration_number
-      # Lifted directly from ActiveRecord::Generators::Migration
-      # Unfortunately, no API is provided by Rails at this time.
-      next_migration_number = current_migration_number + 1
-      if ActiveRecord::Base.timestamped_migrations
-        [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-      else
-        "%.3d" % next_migration_number
-      end
-    end
-
     # Derives the name for the migration, something like 'create_enum_fruit'
     def migration_name
       "create_enum_#{file_name}"

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

@@ -0,0 +1,27 @@
+module EnumGeneratorHelpers
+  # Helper methods to figure out the migration number.
+  module MigrationNumber
+
+    # Returns the number of the last migration.
+    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
+    def next_migration_number
+      # Lifted directly from ActiveRecord::Generators::Migration
+      # Unfortunately, no API is provided by Rails at this time.
+      next_migration_number = current_migration_number + 1
+      if ActiveRecord::Base.timestamped_migrations
+        [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+      else
+        "%.3d" % next_migration_number
+      end
+    end
+
+  end
+end

data/lib/generators/virtual_enumerations_initializer/templates/virtual_enumerations.rb.erb

@@ -11,7 +11,7 @@ ActiveRecord::VirtualEnumerations.define do |config|
 #                :on_lookup_failure => :enforce_strict,
 #                :name_column       => 'name_column',
 #                :alias_name        => false {
-#    # class_evaled_functions
+#    # class_eval'ed_functions
 #  }
 #
 end

data/lib/power_enum.rb

@@ -17,8 +17,6 @@ class PowerEnum < Rails::Engine
       ActiveRecord::Migration::CommandRecorder.class_eval do
         include PowerEnum::Migration::CommandRecorder
       end
-
-      ActiveRecord::VirtualEnumerations.patch_const_lookup
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ cert_chain:
   amZaYUtWM2wwYTFkR2wyUVNMa2pScFFaRDFiRCtVSDdnT3F5N1piZGNzUkJM
   NEg3VTV6VQpibEtkZEg2dXhDckRTTTdLYWJrelNPVmYKLS0tLS1FTkQgQ0VS
   VElGSUNBVEUtLS0tLQo=
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -144,6 +144,7 @@ files:
 - lib/active_record/virtual_enumerations.rb
 - lib/generators/enum/USAGE
 - lib/generators/enum/enum_generator.rb
+- lib/generators/enum/enum_generator_helpers/migration_number.rb
 - lib/generators/enum/templates/model.rb.erb
 - lib/generators/enum/templates/rails31_migration.rb.erb
 - lib/generators/virtual_enumerations_initializer/USAGE
@@ -172,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4180923029060958212
+      hash: -4143040860677823590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: