assignable_values 0.4.0 → 0.4.1

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

@@ -49,11 +49,15 @@ module AssignableValues
         def set_default(record)
           if record.new_record? && record.send(property).nil?
             default_value = evaluate_default(record, default)
-            if secondary_default? && !assignable_value?(record, default_value)
-              secondary_default_value = evaluate_default(record, secondary_default)
-              if assignable_value?(record, secondary_default_value)
-                default_value = secondary_default_value
+            begin
+              if secondary_default? && !assignable_value?(record, default_value)
+                secondary_default_value = evaluate_default(record, secondary_default)
+                if assignable_value?(record, secondary_default_value)
+                  default_value = secondary_default_value
+                end
               end
+            rescue AssignableValues::DelegateUnavailable
+              # skip secondary defaults if querying assignable values from a nil delegate
             end
             record.send("#{property}=", default_value)
           end

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/shared/assignable_values/active_record_spec.rb

@@ -321,6 +321,15 @@ describe AssignableValues::ActiveRecord do
         klass.new.genre.should == 'pop'
       end
 
+      it "should not raise an error or change the primary default if assignable values are retrieved through a delegate, and the delegate is nil" do
+        klass = disposable_song_class do
+          assignable_values_for :genre, :default => 'techno', :secondary_default => 'pop', :through => lambda { nil }
+        end
+        expect do
+          klass.new.genre.should == 'techno'
+        end.to_not raise_error
+      end
+
       it 'should not cause the list of assignable values to be evaluated if the :secondary_default option is not used' do
         klass = disposable_song_class do
           assignable_values_for :genre, :default => 'techno' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Henning Koch