Merge commit 'rails/master'

1 files changed, 18 insertions, 11 deletions

diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
index c6d84c5312..f974999bef 100644
--- a/activemodel/lib/active_model/validations/numericality.rb
+++ b/activemodel/lib/active_model/validations/numericality.rb
@@ -25,11 +25,18 @@ module ActiveModel
 
         return if options[:allow_nil] && raw_value.nil?
 
-        unless value = parse_raw_value(raw_value, options)
+        unless value = parse_raw_value_as_a_number(raw_value)
           record.errors.add(attr_name, :not_a_number, :value => raw_value, :default => options[:message])
           return
         end
 
+        if options[:only_integer]
+          unless value = parse_raw_value_as_an_integer(raw_value)
+            record.errors.add(attr_name, :not_an_integer, :value => raw_value, :default => options[:message])
+            return
+          end
+        end
+
         options.slice(*CHECKS.keys).each do |option, option_value|
           case option
           when :odd, :even
@@ -44,23 +51,23 @@ module ActiveModel
               record.errors.add(attr_name, option, :default => options[:message], :value => value, :count => option_value)
             end
           end
-        end      
+        end
       end
 
     protected
 
-      def parse_raw_value(raw_value, options)
-        if options[:only_integer]
-          raw_value.to_i if raw_value.to_s =~ /\A[+-]?\d+\Z/
-        else
-          begin
-            Kernel.Float(raw_value)
-          rescue ArgumentError, TypeError
-            nil
-          end
+      def parse_raw_value_as_a_number(raw_value)
+        begin
+          Kernel.Float(raw_value)
+        rescue ArgumentError, TypeError
+          nil
         end
       end
 
+      def parse_raw_value_as_an_integer(raw_value)
+        raw_value.to_i if raw_value.to_s =~ /\A[+-]?\d+\Z/
+      end
+
     end
 
     module ClassMethods