0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Added allow_nil options to validates_inclusion_of so that validation is only triggered if the attribute is not nil [what-a-day]
0
+
0
 * Added work-around for PostgreSQL and the problem of getting fixtures to be created from id 1 on each test case.
0
   This only works for auto-incrementing primary keys called "id" for now #359 [Scott Baron]
0
 

0
@@ -249,15 +249,21 @@
0
       # Configuration options:
0
       # * <tt>in</tt> - An enumerable object of available items
0
       # * <tt>message</tt> - Specifieds a customer error message (default is: "is not included in the list")
0
+      # * <tt>allows_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
0
       def validates_inclusion_of(*attr_names)
0
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:inclusion], :on => :save }
0
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
0
         enum = configuration[:in] || configuration[:within]
0
+        allow_nil = configuration[:allow_nil]
0
 
0
         raise(ArgumentError, "An object with the method include? is required must be supplied as the :in option of the configuration hash") unless enum.respond_to?("include?")
0
 
0
         for attr_name in attr_names
0
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless (#{enum.inspect}).include?(#{attr_name}) }))
0
+          if allow_nil
0
+            class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless #{attr_name}.nil? or (#{enum.inspect}).include?(#{attr_name}) }))
0
+          else
0
+            class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless (#{enum.inspect}).include?(#{attr_name}) }))
0
+          end
0
         end
0
       end
0
       

0
@@ -244,6 +244,14 @@
0
     assert_nothing_raised(ArgumentError) { Topic.validates_inclusion_of( :title, :in => [] ) }
0
   end
0
 
0
+  def test_validates_inclusion_of_with_allow_nil
0
+    Topic.validates_inclusion_of( :title, :in => %w( a b c d e f g ), :allow_nil=>true )
0
+
0
+    assert !Topic.create("title" => "a!", "content" => "abc").valid?
0
+    assert !Topic.create("title" => "", "content" => "abc").valid?
0
+    assert Topic.create("title" => nil, "content" => "abc").valid?
0
+  end
0
+
0
   def test_validates_length_of_using_minimum
0
     Topic.validates_length_of( :title, :minimum=>5 )
0
     t = Topic.create("title" => "valid", "content" => "whatever")