Added optionally allow for nil or empty strings with validates_numericality_of #801 [Sebastian Kanthak] Fixed problem with using slashes in validates_format_of regular expressions #801 [Sebastian Kanthak]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@910 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 66 insertions, 72 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 7f1a1fcca4..8655d2bf6b 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,9 @@
 *SVN*
 
+* Added optionally allow for nil or empty strings with validates_numericality_of #801 [Sebastian Kanthak]
+
+* Fixed problem with using slashes in validates_format_of regular expressions #801 [Sebastian Kanthak]
+
 * Fixed that SQLite3 exceptions are caught and reported properly #823 [yerejm]
 
 * Added that all types of after_find/after_initialized callbacks are triggered if the explicit implementation is present, not only the explicit implementation itself
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index abce28a4ec..9364a2501c 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -270,11 +270,11 @@ module ActiveRecord
       def validates_confirmation_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:confirmation], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-        configuration[:message].gsub!(/\"/, '\\\\\"')
 
-        for attr_name in attr_names
-          attr_accessor "#{attr_name}_confirmation"
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', "#{configuration[:message]}") unless #{attr_name}_confirmation.nil? or #{attr_name} == #{attr_name}_confirmation}))
+        attr_accessor *(attr_names.map { |n| "#{n}_confirmation" })
+	
+        validates_each(attr_names, configuration) do |record, attr_name, value|
+          record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_confirmation").nil? or value == record.send("#{attr_name}_confirmation")
         end
       end
 
@@ -294,13 +294,13 @@ module ActiveRecord
       #
       # NOTE: The agreement is considered valid if it's set to the string "1". This makes it easy to relate it to an HTML checkbox.
       def validates_acceptance_of(*attr_names)
-        configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save }
+        configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save, :allow_nil => true }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-        configuration[:message].gsub!(/\"/, '\\\\\"')
 
-        for attr_name in attr_names
-          attr_accessor(attr_name)
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', "#{configuration[:message]}") unless #{attr_name}.nil? or #{attr_name} == "1"}))
+        attr_accessor *attr_names
+	
+        validates_each(attr_names,configuration) do |record, attr_name, value|
+          record.errors.add(attr_name, configuration[:message]) unless value == "1"	  
         end
       end
 
@@ -312,10 +312,13 @@ module ActiveRecord
       def validates_presence_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:empty], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-        configuration[:message].gsub!(/\"/, '\\\\\"')
 
-        for attr_name in attr_names
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add_on_empty('#{attr_name}', "#{configuration[:message]}")}))
+        # can't use validates_each here, because it cannot cope with non-existant attributes,
+        # while errors.add_on_empty can	
+        attr_names.each do |attr_name|
+          send(validation_method(configuration[:on])) do |record|
+            record.errors.add_on_empty(attr_name,configuration[:message])
+          end
         end
       end
 
@@ -414,13 +417,14 @@ module ActiveRecord
       def validates_uniqueness_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken] }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-        configuration[:message].gsub!(/\"/, '\\\\\"')
 
-        for attr_name in attr_names
-          if scope = configuration[:scope]
-            class_eval(%(validate %{errors.add('#{attr_name}', "#{configuration[:message]}") if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
-          else
-            class_eval(%(validate %{errors.add('#{attr_name}', "#{configuration[:message]}") if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ?", #{attr_name}, id])}))
+        if scope = configuration[:scope]
+          validates_each(attr_names,configuration) do |record, attr_name, value|
+            record.errors.add(attr_name, configuration[:message]) if record.class.find_first(record.new_record? ? ["#{attr_name} = ? AND #{scope} = ?", record.send(attr_name), record.send(scope)] : ["#{attr_name} = ? AND #{record.class.primary_key} <> ? AND #{scope} = ?", record.send(attr_name), record.send(:id), record.send(scope)])
+          end
+        else
+          validates_each(attr_names,configuration) do |record, attr_name, value|
+            record.errors.add(attr_name, configuration[:message]) if record.class.find_first(record.new_record? ? ["#{attr_name} = ?", record.send(attr_name)] : ["#{attr_name} = ? AND #{record.class.primary_key} <> ?", record.send(attr_name), record.send(:id) ] )
           end
         end
       end
@@ -441,12 +445,11 @@ module ActiveRecord
       def validates_format_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save, :with => nil }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-        configuration[:message].gsub!(/\"/, '\\\\\"')
 
         raise(ArgumentError, "A regular expression must be supplied as the :with option of the configuration hash") unless configuration[:with].is_a?(Regexp)
 
-        for attr_name in attr_names 
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless #{attr_name} and #{attr_name}.to_s.match(/#{Regexp.quote(configuration[:with].source)}/)}))
+        validates_each(attr_names, configuration) do |record, attr_name, value|
+          record.errors.add(attr_name, configuration[:message]) unless value.to_s =~ configuration[:with]
         end
       end
 
@@ -464,19 +467,13 @@ module ActiveRecord
       def validates_inclusion_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:inclusion], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-        configuration[:message].gsub!(/\"/, '\\\\\"')
-
+ 
         enum = configuration[:in] || configuration[:within]
-        allow_nil = configuration[:allow_nil]
-
+ 
         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?")
 
-        for attr_name in attr_names
-          if allow_nil
-            class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless #{attr_name}.nil? or (#{enum.inspect}).include?(#{attr_name}) }))
-          else
-            class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless (#{enum.inspect}).include?(#{attr_name}) }))
-          end
+        validates_each(attr_names, configuration) do |record, attr_name, value|
+          record.errors.add(attr_name, configuration[:message]) unless enum.include?(value)
         end
       end
 
@@ -504,13 +501,10 @@ module ActiveRecord
       def validates_associated(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-        configuration[:message].gsub!(/\"/, '\\\\\"')
-        
-        for attr_name in attr_names
-          class_eval(%(#{validation_method(configuration[:on])} %{
-            errors.add("#{attr_name}", "#{configuration[:message]}") unless
-              (#{attr_name}.is_a?(Array) ? #{attr_name} : [#{attr_name}]).inject(true){ |memo, record| (record.nil? or record.valid?) and memo }
-          }))
+
+        validates_each(attr_names, configuration) do |record, attr_name, value|
+          record.errors.add(attr_name, configuration[:message]) unless 
+            (value.is_a?(Array) ? value : [value]).inject(true) { |memo, r| (r.nil? or r.valid?) and memo }
         end
       end
       
@@ -526,29 +520,25 @@ module ActiveRecord
       # * <tt>message</tt> - A custom error message (default is: "is not a number")
       # * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)
       # * <tt>only_integer</tt> Specifies whether the value has to be an integer, e.g. an integral value (default is false)
+      # * <tt>allow_nil</tt> Skip validation if attribute is nil (default is false). Notice that for fixnum and float columsn empty strings are converted to nil
       def validates_numericality_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:not_a_number], :on => :save,
-                           :integer => false }
+                           :only_integer => false, :allow_nil => false }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
-        for attr_name in attr_names
-          if configuration[:only_integer]
-            # we have to use a regexp here, because Kernel.Integer accepts nil and "0xdeadbeef", but does not
-            # accept "099" and String#to_i accepts everything. The string containing the regexp is evaluated twice
-            # so we have to escape everything properly
-            class_eval(%(#{validation_method(configuration[:on])} %{
-                errors.add("#{attr_name}", "#{configuration[:message]}") unless #{attr_name}_before_type_cast.to_s =~ /^[\\\\+\\\\-]?\\\\d+$/
-            }))          
-          else
-            class_eval(%(#{validation_method(configuration[:on])} %{
-                begin
-                  Kernel.Float(#{attr_name}_before_type_cast)
-                rescue ArgumentError, TypeError
-                  errors.add("#{attr_name}", "#{configuration[:message]}")
-                end
-            }))
+        if configuration[:only_integer]
+          validates_each(attr_names,configuration) do |record, attr_name,value|
+            record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_before_type_cast").to_s =~ /^[+-]?\d+$/
           end
-        end
+        else
+          validates_each(attr_names,configuration) do |record, attr_name,value|
+            begin
+              Kernel.Float(record.send("#{attr_name}_before_type_cast").to_s)
+            rescue ArgumentError, TypeError
+              record.errors.add(attr_name, configuration[:message])
+            end
+          end
+      	end
       end
 
       private
diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb
index 913c72ea3c..30de66c94b 100755
--- a/activerecord/test/validations_test.rb
+++ b/activerecord/test/validations_test.rb
@@ -606,40 +606,40 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validates_numericality_of_with_string
-    Topic.validates_numericality_of( :replies_count )
+    Topic.validates_numericality_of( :approved )
     ["not a number","42 not a number","0xdeadbeef","00-1","-+019.0","12.12.13.12",nil].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => "not a number")
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => "not a number")
         assert !t.valid?, "#{v} not rejected as a number"
-        assert t.errors.on(:replies_count)
+        assert t.errors.on(:approved)
     end
   end
 
   def test_validates_numericality_of
-    Topic.validates_numericality_of( :replies_count )
-    ["10", "10.0", "10.5", "-10.5", "-0.0001","0090","-090","-090.1"].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => v)
+    Topic.validates_numericality_of( :approved, :allow_nil => true )
+    ["10", "10.0", "10.5", "-10.5", "-0.0001","0090","-090","-090.1",nil,""].each do |v|
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => v)
         assert t.valid?, "#{v} not recognized as a number"
-        # we cannot check this as replies_count is actually an integer field
-        #assert_in_delta v.to_f, t.replies_count, 0.0000001
+        # we cannot check this as approved is actually an integer field
+        #assert_in_delta v.to_f, t.approved, 0.0000001
     end
   end
   
   def test_validates_numericality_of_int_with_string
-    Topic.validates_numericality_of( :replies_count, :only_integer => true )
+    Topic.validates_numericality_of( :approved, :only_integer => true )
     ["not a number","42 not a number","0xdeadbeef","0-1","--3","+-3","+3-1",nil].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => v)
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => v)
         assert !t.valid?, "#{v} not rejected as integer"
-        assert t.errors.on(:replies_count)
+        assert t.errors.on(:approved)
     end
   end
   
   def test_validates_numericality_of_int
-    Topic.validates_numericality_of( :replies_count, :only_integer => true )
-    ["42", "+42", "-42", "042", "0042", "-042", 42].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => v)
+    Topic.validates_numericality_of( :approved, :only_integer => true, :allow_nil => true )
+    ["42", "+42", "-42", "042", "0042", "-042", 42, nil,""].each do |v|
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => v)
         assert t.valid?, "#{v} not recognized as integer"
-        assert_equal v.to_i, t.replies_count
+        assert_equal((v.nil? or v == "")? nil : v.to_i, t.approved)
     end
   end
-  
+
 end