power_enum 0.4.4 → 0.4.5

data/README.md

@@ -279,12 +279,15 @@ the `has_enumerated` macro behaves more like an aggregation than an association.
     class Booking < ActiveRecord::Base
       has_enumerated  :status, :class_name        => 'BookingStatus',
                                :foreign_key       => 'status_id',
-                               :on_lookup_failure => :optional_instance_method
+                               :on_lookup_failure => :optional_instance_method,
+                               :permit_empty_name => true  #Setting this to true disables automatic conversion of empty strings to nil.  Default is false.
     end
 
 By default, the foreign key is interpreted to be the name of your has\_enumerated field (in this case 'booking_status') plus '\_id'.  Since we
 chose to make the column name 'status\_id' for the sake of brevity, we must explicitly designate it.  Additionally, the default value for
-`:class_name` is the camel-ized version of the name for your has\_enumerated field. `:on_lookup_failure` is explained below.
+`:class_name` is the camel-ized version of the name for your has\_enumerated field. `:on_lookup_failure` is explained below.  `:permit_empty_name`
+is an optional flag to disable automatic conversion of empty strings to nil.  It is typically desirable to have `booking.update_attributes(:status => '')`
+assign status_id to a nil rather than raise an Error, as you'll be often calling `update_attributes` with form data.
 
 With that, your Booking class will have the following methods defined:
 

data/lib/active_record/aggregations/has_enumerated.rb

@@ -20,12 +20,16 @@ module ActiveRecord
         end
 
         def has_enumerated(part_id, options = {})
-          options.assert_valid_keys(:class_name, :foreign_key, :on_lookup_failure)
+          options.assert_valid_keys(:class_name, :foreign_key, :on_lookup_failure, :permit_empty_name)
+
+          reflection = PowerEnum::Reflection::EnumerationReflection.new(part_id, options, self)
+          self.reflections.merge! part_id => reflection
 
           name        = part_id.to_s
-          class_name  = (options[:class_name] || name).to_s.camelize
-          foreign_key = (options[:foreign_key] || "#{name}_id").to_s             
+          class_name  = reflection.class_name
+          foreign_key = reflection.foreign_key
           failure     = options[:on_lookup_failure]
+          empty_name  = options[:permit_empty_name]
 
           module_eval <<-end_eval
             def #{name}
@@ -36,7 +40,8 @@ module ActiveRecord
               return rval
             end         
 
-            def #{name}=(arg)                         
+            def #{name}=(arg)
+              #{!empty_name ? 'arg = nil if arg.blank?' : ''}
               case arg
               when #{class_name}
                 val = #{class_name}.lookup_id(arg.id)

data/lib/power_enum.rb

@@ -7,6 +7,7 @@ class PowerEnum < Rails::Engine
     ActiveSupport.on_load(:active_record) do
       include ActiveRecord::Acts::Enumerated
       include ActiveRecord::Aggregations::HasEnumerated
+      include PowerEnum::Reflection
 
       ActiveRecord::ConnectionAdapters.module_eval do
         include PowerEnum::Schema::SchemaStatements

data/lib/power_enum/reflection.rb

@@ -0,0 +1,29 @@
+module PowerEnum::Reflection
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def reflect_on_all_enumerated
+      # Need to give it a full namespace to avoid getting Rails confused in development
+      # mode where all objects are reloaded on every request.
+      reflections.values.grep(PowerEnum::Reflection::EnumerationReflection)
+    end
+
+    def reflect_on_enumerated enumerated
+      reflections[enumerated.to_sym].is_a?(PowerEnum::Reflection::EnumerationReflection) ? reflections[enumerated.to_sym] : nil
+    end
+  end
+
+  class EnumerationReflection < ActiveRecord::Reflection::MacroReflection
+    def initialize name, options, active_record
+      super :has_enumerated, name, options, active_record
+    end
+    
+    def class_name
+      @class_name ||= (@options[:class_name] || @name).to_s.camelize
+    end
+    
+    def foreign_key
+      @foreign_key ||= (@options[:foreign_key] || "#{@name}_id").to_s
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &15199880 !ruby/object:Gem::Requirement
+  requirement: &27154260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15199880
+  version_requirements: *27154260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15199020 !ruby/object:Gem::Requirement
+  requirement: &27152980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15199020
+  version_requirements: *27152980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15194680 !ruby/object:Gem::Requirement
+  requirement: &27152060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15194680
+  version_requirements: *27152060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &15194020 !ruby/object:Gem::Requirement
+  requirement: &27151240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15194020
+  version_requirements: *27151240
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &15193500 !ruby/object:Gem::Requirement
+  requirement: &27150660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +68,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15193500
+  version_requirements: *27150660
 description: ! 'Power Enum allows you to treat instances of your ActiveRecord models
   as though they were an enumeration of values.
 
@@ -99,6 +99,7 @@ files:
 - lib/generators/enum/templates/rails31_migration.rb.erb
 - lib/power_enum.rb
 - lib/power_enum/migration/command_recorder.rb
+- lib/power_enum/reflection.rb
 - lib/power_enum/schema/schema_statements.rb
 - LICENSE
 - README.md