assignable_values 0.3.0 → 0.4.0

data/README.md

@@ -103,6 +103,18 @@ Defaults can be lambdas:
 
 The lambda will be evaluated in the context of the record instance.
 
+You can also default a secondary default that is only set if the primary default value is not assignable:
+
+    class Song < ActiveRecord::Base
+      assignable_values_for :year, :default => 1999, :secondary_default => lambda { Date.today.year } do
+        (Date.today.year - 2) .. Date.today.year
+      end
+    end
+
+If called in 2013 the code above will fall back to:
+
+    Song.new.year # => 2013
+
 
 ### Allowing blank values
 

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

@@ -3,7 +3,7 @@ module AssignableValues
     module Restriction
       class Base
 
-        attr_reader :model, :property, :options, :values, :default
+        attr_reader :model, :property, :options, :values, :default, :secondary_default
 
         def initialize(model, property, options, &values)
           @model = model
@@ -11,7 +11,7 @@ module AssignableValues
           @options = options
           @values = values
           ensure_values_given
-          setup_default if default?
+          setup_default
           define_assignable_values_method
           setup_validation
         end
@@ -20,8 +20,9 @@ module AssignableValues
           value = current_value(record)
           unless allow_blank? && value.blank?
             begin
-              assignable_values = assignable_values(record)
-              assignable_values.include?(value) or record.errors.add(property, not_included_error_message)
+              unless assignable_value?(record, value)
+                record.errors.add(property, not_included_error_message)
+              end
             rescue DelegateUnavailable
               # if the delegate is unavailable, the validation is skipped
             end
@@ -32,6 +33,10 @@ module AssignableValues
           I18n.t('errors.messages.inclusion', :default => 'is not included in the list')
         end
 
+        def assignable_value?(record, value)
+          assignable_values(record).include?(value)
+        end
+
         def assignable_values(record)
           assignable_values = []
           old_value = previously_saved_value(record)
@@ -43,8 +48,13 @@ module AssignableValues
 
         def set_default(record)
           if record.new_record? && record.send(property).nil?
-            default_value = default
-            default_value = record.instance_eval(&default_value) if default_value.is_a?(Proc)
+            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
+              end
+            end
             record.send("#{property}=", default_value)
           end
           true
@@ -52,6 +62,14 @@ module AssignableValues
 
         private
 
+        def evaluate_default(record, value_or_proc)
+          if value_or_proc.is_a?(Proc)
+            record.instance_eval(&value_or_proc)
+          else
+            value_or_proc
+          end
+        end
+
         def parse_values(values)
           values.to_a
         end
@@ -76,6 +94,10 @@ module AssignableValues
           @options.has_key?(:default)
         end
 
+        def secondary_default?
+          @options.has_key?(:secondary_default)
+        end
+
         def allow_blank?
           @options[:allow_blank]
         end
@@ -89,15 +111,20 @@ module AssignableValues
         end
 
         def setup_default
-          ensure_after_initialize_callback_enabled
-          @default = options[:default]
-          restriction = self
-          enhance_model do
-            set_default_method = "set_default_#{restriction.property}"
-            define_method set_default_method do
-              restriction.set_default(self)
+          if default?
+            @default = options[:default] # for attr_reader
+            @secondary_default = options[:secondary_default] # for attr_reader
+            ensure_after_initialize_callback_enabled
+            restriction = self
+            enhance_model do
+              set_default_method = "set_default_#{restriction.property}"
+              define_method set_default_method do
+                restriction.set_default(self)
+              end
+              after_initialize set_default_method
             end
-            after_initialize set_default_method
+          elsif secondary_default?
+            raise AssignableValues::NoDefault, "cannot use the :secondary_default option without a :default option"
           end
         end
 

data/lib/assignable_values/errors.rb

@@ -2,4 +2,5 @@ module AssignableValues
   class Error < StandardError; end
   class DelegateUnavailable < Error; end
   class NoValuesGiven < Error; end
+  class NoDefault < Error; end
 end

data/lib/assignable_values/version.rb

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

data/spec/shared/assignable_values/active_record_spec.rb

@@ -261,6 +261,79 @@ describe AssignableValues::ActiveRecord do
 
     end
 
+    context 'with :secondary_default option' do
+
+      it 'should set a secondary default value if the primary value is not assignable' do
+        klass = disposable_song_class do
+          assignable_values_for :genre, :default => 'techno', :secondary_default => 'rock' do
+            %w[pop rock]
+          end
+        end
+        klass.new.genre.should == 'rock'
+      end
+
+      it 'should not change the default value if the default value is assignable' do
+        klass = disposable_song_class do
+          assignable_values_for :genre, :default => 'pop', :secondary_default => 'rock' do
+            %w[pop rock]
+          end
+        end
+        klass.new.genre.should == 'pop'
+      end
+
+      it "should not change the primary default if the secondary default value isn't assignable either" do
+        klass = disposable_song_class do
+          assignable_values_for :genre, :default => 'techno', :secondary_default => 'jazz' do
+            %w[pop rock]
+          end
+        end
+        klass.new.genre.should == 'techno'
+      end
+
+      it 'should raise an error if used without a :default option' do
+        expect do
+          disposable_song_class do
+            assignable_values_for :genre, :secondary_default => 'pop' do
+              %w[pop rock]
+            end
+          end
+        end.to raise_error(AssignableValues::NoDefault)
+      end
+
+      it 'should allow to set a secondary default through a lambda' do
+        klass = disposable_song_class do
+          assignable_values_for :genre, :default => 'techno', :secondary_default => lambda { 'pop' } do
+            %w[pop rock]
+          end
+        end
+        klass.new.genre.should == 'pop'
+      end
+
+      it 'should evaluate a secondary lambda default in the context of the record instance' do
+        klass = disposable_song_class do
+          assignable_values_for :genre, :default => 'techno', :secondary_default => lambda { default_genre } do
+            %w[pop rock]
+          end
+          def default_genre
+            'pop'
+          end
+        end
+        klass.new.genre.should == 'pop'
+      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
+            raise "block called!"
+          end
+        end
+        expect do
+          klass.new.genre.should == 'techno'
+        end.to_not raise_error
+      end
+
+    end
+
     context 'when generating methods to list assignable values' do
 
       it 'should generate an instance method returning a list of assignable values' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assignable_values
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-31 00:00:00 +02:00
+date: 2012-08-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency