Ticket #9574: validates_length_of_in.diff

activerecord/test/validations_test.rb

@@ -568 +568 @@
-    assert t.valid?
-  end
-
+  def test_validates_length_of_using_in
+    Topic.validates_length_of(:title, :content, :in => 3..5)
+
+    t = Topic.new("title" => "a!", "content" => "I'm ooooooooh so very long")
+    assert !t.valid?
+    assert_equal "is too short (minimum is 3 characters)", t.errors.on(:title)
+    assert_equal "is too long (maximum is 5 characters)", t.errors.on(:content)
+
+    t.title = nil
+    t.content = nil
+    assert !t.valid?
+    assert_equal "is too short (minimum is 3 characters)", t.errors.on(:title)
+    assert_equal "is too short (minimum is 3 characters)", t.errors.on(:content)
+
+    t.title = "abe"
+    t.content  = "mad"
+    assert t.valid?
+  end
+
-  def test_optionally_validates_length_of_using_within
-    Topic.validates_length_of :title, :content, :within => 3..5, :allow_nil => true
-
@@ -684 +703 @@
-    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :within=>6, :maximum=>9) }
-    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :within=>6, :minimum=>9) }
-    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :within=>6, :is=>9) }
+    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :minimum=>-1) }
+    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :maximum=>-1) }
+    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :is=>-1) }
-    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :minimum=>"a") }
-    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :maximum=>"a") }
-
+.."z"
-    assert_raise(ArgumentError) { Topic.validates_length_of(:title, :is=>"a") }
-  end
-
+  def test_validates_length_of_range_option_provided
+    assert_raise(ArgumentError) { Topic.validates_length_of(:title) }
+  end
+
+  def test_validates_length_of_custom_errors_for_in_with_message
+    Topic.validates_length_of( :title, :in=>2..5, :message=>"booin' must be between 2 and 5 characters" )
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    assert !t.valid?
+    assert t.errors.on(:title)
+    assert_equal "booin' must be between 2 and 5 characters", t.errors["title"]
+  end
+
-  def test_validates_length_of_custom_errors_for_minimum_with_message
-    Topic.validates_length_of( :title, :minimum=>5, :message=>"boo %d" )
-    t = Topic.create("title" => "uhoh", "content" => "whatever")

activerecord/lib/active_record/validations.rb

@@ -479 +479 @@
-
-        # can't use validates_each here, because it cannot cope with nonexistent attributes,
-        # while errors.add_on_empty can
-
-
-
-
-
+      
+      
+      
+      
+      
-      end
-
-
+
+
-      #
-      #   class Person < ActiveRecord::Base
-      #     validates_length_of :first_name, :maximum=>30
-      #     validates_length_of :last_name, :maximum=>30, :message=>"less than %d if you don't mind"
-      #     validates_length_of :fax, :in => 7..32, :allow_nil => true
-      #     validates_length_of :phone, :in => 7..32, :allow_blank => true
-with
+
-      #     validates_length_of :fav_bra_size, :minimum=>1, :too_short=>"please enter at least %d character"
-      #     validates_length_of :smurf_leader, :is=>4, :message=>"papa is spelled with %d characters... don't play me."
-      #   end
-      #
-C
+Length restriction c
-      # * <tt>minimum</tt> - The minimum size of the attribute
-      # * <tt>maximum</tt> - The maximum size of the attribute
-      # * <tt>is</tt> - The exact size of the attribute
-
-
+
+
+
-      # * <tt>allow_nil</tt> - Attribute may be nil; skip validation.
-      # * <tt>allow_blank</tt> - Attribute may be blank; skip validation.
-      #
-      # * <tt>too_long</tt> - The error message if the attribute goes over the maximum (default is: "is too long (maximum is %d characters)")
-      # * <tt>too_short</tt> - The error message if the attribute goes under the minimum (default is: "is too short (min is %d characters)")
-      # * <tt>wrong_length</tt> - The error message if using the :is method and the attribute is the wrong size (default is: "is the wrong length (should be %d characters)")
-The error message to use for a :minimum, :maximum, or :is violation.  An alias of the appropriate too_long/too_short/wrong_length message
+Specifies a custom error message (default is nil). When defined it overrides the too_long/too_short/wrong_length messages.
-      # * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
-      # * <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>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }).  The
-      
+
-      def validates_length_of(*attrs)
-        # Merge given options with defaults.
-        options = {
@@ -531 +532 @@
-        range_options = ALL_RANGE_OPTIONS & options.keys
-        case range_options.size
-          when 0
-with
+
-          when 1
-            # Valid number of options; do nothing.
-          else
@@ -543 +544 @@
-        option_value = options[range_options.first]
-
-        case option
-within, :
+in, :with
-            raise ArgumentError, ":#{option} must be a Range" unless option_value.is_a?(Range)
-
-            too_short = options[:too_short] % option_value.begin
@@ -551 +552 @@
-
-            validates_each(attrs, options) do |record, attr, value|
-              if value.nil? or value.split(//).size < option_value.begin
-
+options[:message] || 
-              elsif value.split(//).size > option_value.end
-
+options[:message] || 
-              end
-            end
-          when :is, :minimum, :maximum
@@ -693 +694 @@
-
-        enum = configuration[:in] || configuration[:within]
-
-is required 
+
-
-        validates_each(attr_names, configuration) do |record, attr_name, value|
-          record.errors.add(attr_name, configuration[:message]) unless enum.include?(value)
@@ -724 +725 @@
-
-        enum = configuration[:in] || configuration[:within]
-
-is required 
+
-
-        validates_each(attr_names, configuration) do |record, attr_name, value|
-          record.errors.add(attr_name, configuration[:message]) if enum.include?(value)