Ticket #785: validates_confirmatio_of-allow_nil.patch

activerecord/test/validations_test.rb

@@ -206 +206 @@
-    t.title_confirmation = "Parallel Lives"
-    assert t.valid?
-  end
+  
+  def test_no_title_confirmation_allow_nil_false
+    Topic.validates_confirmation_of(:title, :allow_nil => false)
-
+    t = Topic.new(:author_name => "Plutarch")
+    assert t.valid?
+
+    t.title_confirmation = "Parallel Lives"
+    assert !t.valid?
+
+    t.title_confirmation = nil
+    t.title = "Parallel Lives"
+    assert !t.valid?
+
+    t.title_confirmation = "Parallel Lives"
+    assert t.valid?
+  end
+  
+
-  def test_title_confirmation
-    Topic.validates_confirmation_of(:title)
-

activerecord/lib/active_record/validations.rb

@@ -401 +401 @@
-      # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }).  The
-      # method, proc or string should return or evaluate to a true or false value.
+      # * <tt>allow_nil</tt> - Specifies if this validation should pass if _confirmation is nil. (default is true)
-      def validates_confirmation_of(*attr_names)
-
+, :allow_nil => true
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-        attr_accessor *(attr_names.map { |n| "#{n}_confirmation" })
-
-
-record.send("#{attr_name}_confirmation").nil?
+.reject { |k,v| k == :allow_nil }
+(configuration[:allow_nil] && record.send("#{attr_name}_confirmation").nil?)
-        end
-      end
-