assignable_values 0.5.3 → 0.6.0

data/README.md

@@ -130,6 +130,10 @@ If you would like to change this behavior and allow blank values to be valid, us
       end
     end
 
+The `:allow_blank` option can be a symbol, in which case a method of that name will be called on the record.
+
+The `:allow_blank` option can also be a lambda, in which case the lambda will be called in the context of the record.
+
 
 ### Values are only validated when they change
 

data/lib/assignable_values/active_record/restriction/base.rb

@@ -18,7 +18,7 @@ module AssignableValues
 
         def validate_record(record)
           value = current_value(record)
-          unless allow_blank? && value.blank?
+          unless allow_blank?(record) && value.blank?
             begin
               unless assignable_value?(record, value)
                 record.errors.add(error_property, not_included_error_message)
@@ -115,8 +115,8 @@ module AssignableValues
           @options.has_key?(:secondary_default)
         end
 
-        def allow_blank?
-          @options[:allow_blank]
+        def allow_blank?(record)
+          evaluate_option(record, @options[:allow_blank])
         end
 
         def delegate_definition
@@ -187,10 +187,15 @@ module AssignableValues
         end
 
         def delegate(record)
-          case delegate_definition
-          when Symbol then record.send(delegate_definition)
-          when Proc then record.instance_eval(&delegate_definition)
-          else raise "Illegal delegate definition: #{delegate_definition.inspect}"
+          evaluate_option(record, delegate_definition)
+        end
+
+        def evaluate_option(record, option)
+          case option
+          when NilClass, TrueClass, FalseClass then option
+          when Symbol then record.send(option)
+          when Proc then record.instance_eval(&option)
+          else raise "Illegal option type: #{option.inspect}"
           end
         end
 

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

data/spec/rails-2.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.5.2)
+    assignable_values (0.5.3)
       activerecord
 
 GEM

data/spec/rails-3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.5.2)
+    assignable_values (0.5.3)
       activerecord
 
 GEM

data/spec/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    assignable_values (0.5.2)
+    assignable_values (0.5.3)
       activerecord
 
 GEM

data/spec/shared/assignable_values/active_record_spec.rb

@@ -69,7 +69,7 @@ describe AssignableValues::ActiveRecord do
 
       end
 
-      context 'if the :allow_blank option is set' do
+      context 'if the :allow_blank option is set to true' do
 
         before :each do
           @klass = Song.disposable_copy do
@@ -83,12 +83,55 @@ describe AssignableValues::ActiveRecord do
           @klass.new(:genre => nil).should be_valid
         end
 
-        it 'should allow an empty string as value if the :allow_blank option is set' do
+        it 'should allow an empty string as value' do
           @klass.new(:genre => '').should be_valid
         end
 
       end
 
+      context 'if the :allow_blank option is set to a symbol that refers to an instance method' do
+
+        before :each do
+          @klass = Song.disposable_copy do
+
+            attr_accessor :genre_may_be_blank
+
+            assignable_values_for :genre, :allow_blank => :genre_may_be_blank do
+              %w[pop rock]
+            end
+
+          end
+        end
+
+        it 'should call that method to determine if a blank value is allowed' do
+          @klass.new(:genre => '', :genre_may_be_blank => true).should be_valid
+          @klass.new(:genre => '', :genre_may_be_blank => false).should_not be_valid
+        end
+
+      end
+
+      context 'if the :allow_blank option is set to a lambda ' do
+
+
+        before :each do
+          @klass = Song.disposable_copy do
+
+            attr_accessor :genre_may_be_blank
+
+            assignable_values_for :genre, :allow_blank => lambda { genre_may_be_blank } do
+              %w[pop rock]
+            end
+
+          end
+        end
+
+        it 'should evaluate that lambda in the record context to determine if a blank value is allowed' do
+          @klass.new(:genre => '', :genre_may_be_blank => true).should be_valid
+          @klass.new(:genre => '', :genre_may_be_blank => false).should_not be_valid
+        end
+
+      end
+
     end
 
     context 'when validating belongs_to associations' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-19 00:00:00 +01:00
+date: 2013-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency