Merge pull request #15834 from rmehner/allow_proc_and_symbol_for_only_integer

Allow proc and symbol as values for `only_integer` of `NumericalityValidator`

3 files changed, 32 insertions, 1 deletions

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 4d9186017f..890e99415f 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Allow proc and symbol as values for `only_integer` of `NumericalityValidator`
+
+    *Robin Mehner*
+
 *   `has_secure_password` now verifies that the given password is less than 72
     characters if validations are enabled.
 
diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
index a9fb9804d4..5bd162433d 100644
--- a/activemodel/lib/active_model/validations/numericality.rb
+++ b/activemodel/lib/active_model/validations/numericality.rb
@@ -30,7 +30,7 @@ module ActiveModel
           return
         end
 
-        if options[:only_integer]
+        if allow_only_integer?(record)
           unless value = parse_raw_value_as_an_integer(raw_value)
             record.errors.add(attr_name, :not_an_integer, filtered_options(raw_value))
             return
@@ -75,6 +75,17 @@ module ActiveModel
         filtered[:value] = value
         filtered
       end
+
+      def allow_only_integer?(record)
+        case options[:only_integer]
+        when Symbol
+          record.send(options[:only_integer])
+        when Proc
+          options[:only_integer].call(record)
+        else
+          options[:only_integer]
+        end
+      end
     end
 
     module HelperMethods
@@ -121,6 +132,7 @@ module ActiveModel
       # * <tt>:equal_to</tt>
       # * <tt>:less_than</tt>
       # * <tt>:less_than_or_equal_to</tt>
+      # * <tt>:only_integer</tt>
       #
       # For example:
       #
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index e1657407cf..3834d327ea 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -50,6 +50,21 @@ class NumericalityValidationTest < ActiveModel::TestCase
     valid!(NIL + INTEGERS)
   end
 
+  def test_validates_numericality_of_with_integer_only_and_symbol_as_value
+    Topic.validates_numericality_of :approved, only_integer: :condition_is_true_but_its_not
+
+    invalid!(NIL + BLANK + JUNK)
+    valid!(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
+  end
+
+  def test_validates_numericality_of_with_integer_only_and_proc_as_value
+    Topic.send(:define_method, :allow_only_integers?, lambda { false })
+    Topic.validates_numericality_of :approved, only_integer: Proc.new {|topic| topic.allow_only_integers? }
+
+    invalid!(NIL + BLANK + JUNK)
+    valid!(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
+  end
+
   def test_validates_numericality_with_greater_than
     Topic.validates_numericality_of :approved, greater_than: 10