power_enum 0.6.3 → 0.7.0

data/README.md

@@ -385,8 +385,12 @@ The `:on_lookup_failure` option in has\_enumerated is there because you may want
 situations where the argument passed to `status=(arg)` is invalid.  By default, an invalid value will cause an
 ArgumentError to be raised.
 
-Of course, this may not be optimal in your situation.  In this case you can specify an *instance* method to be called in
-the case of a lookup failure. The method signature is as follows:
+Of course, this may not be optimal in your situation.  In this case you can do one of two thigs:
+
+1) You can set it to 'validation\_error'.  In this case, the invalid value will be cached and returned on
+subsequent lookups, but the model will fail validation.
+
+2) Specify an *instance* method to be called in the case of a lookup failure. The method signature is as follows:
 
     your_lookup_handler(operation, name, name_foreign_key, acts_enumerated_class_name, lookup_value)
 

data/lib/active_record/aggregations/has_enumerated.rb

@@ -32,8 +32,12 @@ module ActiveRecord
         # [:on_lookup_failure]
         #   The :on_lookup_failure option in has_enumerated is there because you may want to create an error handler for
         #   situations where the argument passed to status=(arg) is invalid. By default, an invalid value will cause an
-        #   ArgumentError to be raised.  Since this may not be optimal in your situation, you can specify an instance
-        #   method to be called in the case of a lookup failure. The method signature is as follows:
+        #   ArgumentError to be raised.  Since this may not be optimal in your situation, you can do one of two things:
+        #
+        #   1) You can set it to 'validation_error'.  In this case, the invalid value will be cached and returned on
+        #   subsequent lookups, but the model will fail validation.
+        #   2) You can specify an instance method to be called in the case of a lookup failure. The method signature is
+        #   as follows:
         #     <tt>your_lookup_handler(operation, name, name_foreign_key, acts_enumerated_class_name, lookup_value)</tt>
         #   The 'operation' arg will be either :read or :write.  In the case of :read you are expected to return
         #   something or raise an exception, while in the case of a :write you don't have to return anything.  Note that
@@ -79,14 +83,20 @@ module ActiveRecord
 
           module_eval( <<-end_eval, __FILE__, __LINE__ )
             def #{name}
+              if @invalid_enum_values && @invalid_enum_values.has_key?(:#{name})
+             	  return @invalid_enum_values[:#{name}]
+             	end
               rval = #{class_name}.lookup_id(self.#{foreign_key})
               if rval.nil? && #{!failure.nil?}
-                return self.send(#{failure.inspect}, :read, #{name.inspect}, #{foreign_key.inspect}, #{class_name.inspect}, self.#{foreign_key})
+                self.send(#{failure.inspect}, :read, #{name.inspect}, #{foreign_key.inspect}, #{class_name.inspect}, self.#{foreign_key})
+              else
+                rval
               end
-              return rval
-            end         
+            end
 
             def #{name}=(arg)
+              @invalid_enum_values ||= {}
+
               #{!empty_name ? 'arg = nil if arg.blank?' : ''}
               case arg
               when #{class_name}
@@ -99,22 +109,46 @@ module ActiveRecord
                 val = #{class_name}.lookup_id(arg)
               when nil
                 self.#{foreign_key} = nil
+                @invalid_enum_values.delete :#{name}
                 return nil
-              else     
-                raise TypeError, "#{self.name}: #{name}= argument must be a #{class_name}, String, Symbol or Fixnum but got a: \#{arg.class.name}"            
+              else
+                raise TypeError, "#{self.name}: #{name}= argument must be a #{class_name}, String, Symbol or Fixnum but got a: \#{arg.class.name}"
               end
 
-              if val.nil? 
+              if val.nil?
                 if #{failure.nil?}
                   raise ArgumentError, "#{self.name}: #{name}= can't assign a #{class_name} for a value of (\#{arg.inspect})"
+                else
+                  @invalid_enum_values.delete :#{name}
+                  self.send(#{failure.inspect}, :write, #{name.inspect}, #{foreign_key.inspect}, #{class_name.inspect}, arg)
                 end
-                self.send(#{failure.inspect}, :write, #{name.inspect}, #{foreign_key.inspect}, #{class_name.inspect}, arg)
               else
+                @invalid_enum_values.delete :#{name}
                 self.#{foreign_key} = val.id
               end
             end
           end_eval
 
+          if failure.to_s == 'validation_error'
+            module_eval( <<-end_eval, __FILE__, __LINE__ )
+              validate do
+                if @invalid_enum_values && @invalid_enum_values.has_key?(:#{name})
+                  errors.add(:#{name}, "is invalid")
+                end
+              end
+
+              def validation_error(operation, name, name_foreign_key, acts_enumerated_class_name, lookup_value)
+                @invalid_enum_values ||= {}
+                if operation == :write
+                  @invalid_enum_values[name.to_sym] = lookup_value
+                else
+                  nil
+                end
+              end
+              private :validation_error
+            end_eval
+          end
+
           enumerated_attributes << name
 
           if options.has_key?(:default)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-19 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Power Enum allows you to treat instances of your ActiveRecord models
   as though they were an enumeration of values.