power_enum 1.1.0 → 1.1.1

data/README.markdown

@@ -3,7 +3,7 @@
 https://github.com/albertosaurus/power_enum
 
 [![Build Status](https://travis-ci.org/albertosaurus/power_enum.png)](https://travis-ci.org/albertosaurus/power_enum)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/albertosaurus/power_enum)
+[![Code Climate](https://codeclimate.com/github/albertosaurus/power_enum.png)](https://codeclimate.com/github/albertosaurus/power_enum)
 
 Enumerations for Rails 3.1/3.2 Done Right.
 

data/lib/active_record/virtual_enumerations.rb

@@ -54,13 +54,35 @@ module ActiveRecord # :nodoc:
   #
   #     config.define :booking_status, :connector_type, :color, :order => :name
   #
-  # STI is also supported:
+  # Single Table Inheritance is also supported:
   #
   # Example:
   #
   #     config.define :base_enum, :name_column => ;foo
   #     config.define :booking_status, :connector_type, :color, :extends => :base_enum
-  module VirtualEnumerations # :nodoc:
+  module VirtualEnumerations
+
+    # Patches Module#const_missing to enable us to dynamically create enum
+    # classes at runtime.
+    def self.patch_const_lookup
+
+      # 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
 
     # Defines enumeration classes.  Passes a config object to the given block
     # which is used to define the virtual enumerations.  Call config.define for

data/lib/power_enum.rb

@@ -14,27 +14,11 @@ class PowerEnum < Rails::Engine
         include PowerEnum::Schema::SchemaStatements
       end
 
-      if defined?(ActiveRecord::Migration::CommandRecorder)
-        ActiveRecord::Migration::CommandRecorder.class_eval do
-          include PowerEnum::Migration::CommandRecorder
-        end
+      ActiveRecord::Migration::CommandRecorder.class_eval do
+        include PowerEnum::Migration::CommandRecorder
       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
+      ActiveRecord::VirtualEnumerations.patch_const_lookup
     end
 
   end

data/lib/power_enum/enumerated.rb

@@ -143,13 +143,6 @@ module PowerEnum::Enumerated
       @all = load_all.collect{|val| val.freeze}.freeze
     end
 
-    def load_all
-      conditions = self.acts_enumerated_conditions
-      order = self.acts_enumerated_order
-      where(conditions).order(order)
-    end
-    private :load_all
-
     # Returns all the active enum values.  See the 'active?' instance method.
     def active
       return @all_active if @all_active
@@ -176,22 +169,7 @@ module PowerEnum::Enumerated
         nil
       when 1
         arg = args.first
-        case arg
-        when Symbol
-          return_val = lookup_name(arg.id2name) and return return_val
-        when String
-          return_val = lookup_name(arg) and return return_val
-        when Fixnum
-          return_val = lookup_id(arg) and return return_val
-        when self
-          return arg
-        when nil
-          nil
-        else
-          raise TypeError, "#{self.name}[]: argument should be a String, Symbol or Fixnum but got a: #{arg.class.name}"
-        end
-
-        handle_lookup_failure(arg)
+        lookup_enum_by_type(arg) || handle_lookup_failure(arg)
       else
         args.map{ |item| self[item] }.uniq
       end
@@ -216,21 +194,6 @@ module PowerEnum::Enumerated
       end
     end
 
-    # Deals with a lookup failure for the given argument.
-    def handle_lookup_failure(arg)
-      if (lookup_failure_handler = self.acts_enumerated_on_lookup_failure)
-        case lookup_failure_handler
-        when Proc
-          lookup_failure_handler.call(arg)
-        else
-          self.send(lookup_failure_handler, arg)
-        end
-      else
-        self.send(:enforce_none, arg)
-      end
-    end
-    private :handle_lookup_failure
-
     # Enum lookup by id
     def lookup_id(arg)
       all_by_id[arg]
@@ -312,6 +275,48 @@ module PowerEnum::Enumerated
 
     # ---Private methods---
 
+    def load_all
+      conditions = self.acts_enumerated_conditions
+      order = self.acts_enumerated_order
+      where(conditions).order(order)
+    end
+    private :load_all
+
+    # Looks up the enum based on the type of the argument.
+    def lookup_enum_by_type(arg)
+      case arg
+      when Symbol
+        lookup_name(arg.id2name)
+      when String
+        lookup_name(arg)
+      when Fixnum
+        lookup_id(arg)
+      when self
+        arg
+      when nil
+        nil
+      else
+        raise TypeError, "#{self.name}[]: argument should"\
+                         " be a String, Symbol or Fixnum but got a: #{arg.class.name}"
+      end
+    end
+    private :lookup_enum_by_type
+
+    # Deals with a lookup failure for the given argument.
+    def handle_lookup_failure(arg)
+      if (lookup_failure_handler = self.acts_enumerated_on_lookup_failure)
+        case lookup_failure_handler
+        when Proc
+          lookup_failure_handler.call(arg)
+        else
+          self.send(lookup_failure_handler, arg)
+        end
+      else
+        self.send(:enforce_none, arg)
+      end
+    end
+    private :handle_lookup_failure
+
     # Returns a hash of all enumeration members keyed by their ids.
     def all_by_id
       @all_by_id ||= all_by_attribute( :id )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ cert_chain:
   amZaYUtWM2wwYTFkR2wyUVNMa2pScFFaRDFiRCtVSDdnT3F5N1piZGNzUkJM
   NEg3VTV6VQpibEtkZEg2dXhDckRTTTdLYWJrelNPVmYKLS0tLS1FTkQgQ0VS
   VElGSUNBVEUtLS0tLQo=
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,6 +170,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4180923029060958212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Allows you to treat instances of your ActiveRecord models as though they