Changeset 6850

Timestamp:

05/26/07 00:30:14 (2 years ago)

Author:

bitsweat

Message:

validates_numericality_of takes :greater_than, :greater_than_or_equal_to, :equal_to, :less_than, :less_than_or_equal_to, :odd, and :even options. Closes #3952.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/validations.rb (modified) (3 diffs)
• trunk/activerecord/test/validations_test.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* validates_numericality_of takes :greater_than, :greater_than_or_equal_to, :equal_to, :less_than, :less_than_or_equal_to, :odd, and :even options.  #3952 [Bob Silva, Dan Kubb, Josh Peek]
-
-* MySQL: create_database takes :charset and :collation options. Charset defaults to utf8.  #8448 [matt]

trunk/activerecord/lib/active_record/validations.rb

@@ -36 +36 @@
-      :wrong_length => "is the wrong length (should be %d characters)",
-      :taken => "has already been taken",
-
+
+
+
+
+
+
+
+
-    }
-
@@ -299 +306 @@
-
-      ALL_RANGE_OPTIONS = [ :is, :within, :in, :minimum, :maximum ].freeze
+      ALL_NUMERICALITY_CHECKS = { :greater_than => '>', :greater_than_or_equal_to => '>=',
+                                  :equal_to => '==', :less_than => '<', :less_than_or_equal_to => '<=',
+                                  :odd => 'odd?', :even => 'even?' }.freeze
+
-
-      def validate(*methods, &block)
@@ -752 +763 @@
-      # * <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 columns empty strings are converted to nil
+      # * <tt>greater_than</tt> Specifies the value must be greater than the supplied value
+      # * <tt>greater_than_or_equal_to</tt> Specifies the value must be greater than or equal the supplied value
+      # * <tt>equal_to</tt> Specifies the value must be equal to the supplied value
+      # * <tt>less_than</tt> Specifies the value must be less than the supplied value
+      # * <tt>less_than_or_equal_to</tt> Specifies the value must be less than or equal the supplied value
+      # * <tt>odd</tt> Specifies the value must be an odd number
+      # * <tt>even</tt> Specifies the value must be an even number
-      # * <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.
-      def validates_numericality_of(*attr_names)
-
-
+
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            rescue ArgumentError, TypeError
-
+
+
-            end
-          end
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-      # Creates an object just like Base.create but calls save! instead of save

trunk/activerecord/test/validations_test.rb

@@ -445 +445 @@
-  end
-
+  def test_numericality_with_getter_method
+    Developer.validates_numericality_of( :salary )
+    developer = Developer.new("name" => "michael", "salary" => nil)
+    developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
+    assert developer.valid?
+  end
+
-  def test_numericality_with_allow_nil_and_getter_method
-    Developer.validates_numericality_of( :salary, :allow_nil => true)
@@ -1120 +1127 @@
-  end
-
+  def test_validates_numericality_with_greater_than
+    Topic.validates_numericality_of :approved, :greater_than => 10
+
+    invalid!([-10, 10], 'must be greater than 10')
+    valid!([11])
+  end
+
+  def test_validates_numericality_with_greater_than_or_equal
+    Topic.validates_numericality_of :approved, :greater_than_or_equal_to => 10
+
+    invalid!([-9, 9], 'must be greater than or equal to 10')
+    valid!([10])
+  end
+
+  def test_validates_numericality_with_equal_to
+    Topic.validates_numericality_of :approved, :equal_to => 10
+
+    invalid!([-10, 11], 'must be equal to 10')
+    valid!([10])
+  end
+
+  def test_validates_numericality_with_less_than
+    Topic.validates_numericality_of :approved, :less_than => 10
+
+    invalid!([10], 'must be less than 10')
+    valid!([-9, 9])
+  end
+
+  def test_validates_numericality_with_less_than_or_equal_to
+    Topic.validates_numericality_of :approved, :less_than_or_equal_to => 10
+
+    invalid!([11], 'must be less than or equal to 10')
+    valid!([-10, 10])
+  end
+
+  def test_validates_numericality_with_odd
+    Topic.validates_numericality_of :approved, :odd => true
+
+    invalid!([-2, 2], 'must be odd')
+    valid!([-1, 1])
+  end
+
+  def test_validates_numericality_with_even
+    Topic.validates_numericality_of :approved, :even => true
+
+    invalid!([-1, 1], 'must be even')
+    valid!([-2, 2])
+  end
+
+  def test_validates_numericality_with_greater_than_less_than_and_even
+    Topic.validates_numericality_of :approved, :greater_than => 1, :less_than => 4, :even => true
+
+    invalid!([1, 3, 4])
+    valid!([2])
+  end
+
-  private
-
+, error=nil
-      with_each_topic_approved_value(values) do |topic, value|
-        assert !topic.valid?, "#{value.inspect} not rejected as a number"
-        assert topic.errors.on(:approved)
+        assert_equal error, topic.errors.on(:approved) if error
-      end
-    end