Permalink
Browse files

Added validates_each that validates each specified attribute against …

…a block #610 [bitsweat]. Added :allow_nil as an explicit option for validates_length_of, so unless that's set to true having the attribute as nil will also return an error if a range is specified as :within #610 [bitsweat]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@667 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 28edbca commit 5dcbe933dfd34bb799ee370792b6066f6d6ceaac @dhh dhh committed Feb 18, 2005
Showing with 384 additions and 220 deletions.
  1. +254 −181 activerecord/lib/active_record/validations.rb
  2. +130 −39 activerecord/test/validations_test.rb
View
435 activerecord/lib/active_record/validations.rb
@@ -1,4 +1,138 @@
module ActiveRecord
+ # Active Record validation is reported to and from this object, which is used by Base#save to
+ # determine whether the object in a valid state to be saved. See usage example in Validations.
+ class Errors
+ def initialize(base) # :nodoc:
+ @base, @errors = base, {}
+ end
+
+ @@default_error_messages = {
+ :inclusion => "is not included in the list",
+ :invalid => "is invalid",
+ :confirmation => "doesn't match confirmation",
+ :accepted => "must be accepted",
+ :empty => "can't be empty",
+ :too_long => "is too long (max is %d characters)",
+ :too_short => "is too short (min is %d characters)",
+ :wrong_length => "is the wrong length (should be %d characters)",
+ :taken => "has already been taken",
+ }
+ cattr_accessor :default_error_messages
+
+
+ # Adds an error to the base object instead of any particular attribute. This is used
+ # to report errors that doesn't tie to any specific attribute, but rather to the object
+ # as a whole. These error messages doesn't get prepended with any field name when iterating
+ # with each_full, so they should be complete sentences.
+ def add_to_base(msg)
+ add(:base, msg)
+ end
+
+ # Adds an error message (+msg+) to the +attribute+, which will be returned on a call to <tt>on(attribute)</tt>
+ # for the same attribute and ensure that this error object returns false when asked if +empty?+. More than one
+ # error can be added to the same +attribute+ in which case an array will be returned on a call to <tt>on(attribute)</tt>.
+ # If no +msg+ is supplied, "invalid" is assumed.
+ def add(attribute, msg = @@default_error_messages[:invalid])
+ @errors[attribute.to_s] = [] if @errors[attribute.to_s].nil?
+ @errors[attribute.to_s] << msg
+ end
+
+ # Will add an error message to each of the attributes in +attributes+ that is empty (defined by <tt>attribute_present?</tt>).
+ def add_on_empty(attributes, msg = @@default_error_messages[:empty])
+ for attr in [attributes].flatten
+ value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
+ is_empty = value.respond_to?("empty?") ? value.empty? : false
+ add(attr, msg) unless !value.nil? && !is_empty
+ end
+ end
+
+ # Will add an error message to each of the attributes in +attributes+ that has a length outside of the passed boundary +range+.
+ # If the length is above the boundary, the too_long_msg message will be used. If below, the too_short_msg.
+ def add_on_boundary_breaking(attributes, range, too_long_msg = @@default_error_messages[:too_long], too_short_msg = @@default_error_messages[:too_short])
+ for attr in [attributes].flatten
+ value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
+ add(attr, too_short_msg % range.begin) if value && value.length < range.begin
+ add(attr, too_long_msg % range.end) if value && value.length > range.end
+ end
+ end
+
+ alias :add_on_boundry_breaking :add_on_boundary_breaking
+
+ # Returns true if the specified +attribute+ has errors associated with it.
+ def invalid?(attribute)
+ !@errors[attribute.to_s].nil?
+ end
+
+ # * Returns nil, if no errors are associated with the specified +attribute+.
+ # * Returns the error message, if one error is associated with the specified +attribute+.
+ # * Returns an array of error messages, if more than one error is associated with the specified +attribute+.
+ def on(attribute)
+ if @errors[attribute.to_s].nil?
+ nil
+ elsif @errors[attribute.to_s].length == 1
+ @errors[attribute.to_s].first
+ else
+ @errors[attribute.to_s]
+ end
+ end
+
+ alias :[] :on
+
+ # Returns errors assigned to base object through add_to_base according to the normal rules of on(attribute).
+ def on_base
+ on(:base)
+ end
+
+ # Yields each attribute and associated message per error added.
+ def each
+ @errors.each_key { |attr| @errors[attr].each { |msg| yield attr, msg } }
+ end
+
+ # Yields each full error message added. So Person.errors.add("first_name", "can't be empty") will be returned
+ # through iteration as "First name can't be empty".
+ def each_full
+ full_messages.each { |msg| yield msg }
+ end
+
+ # Returns all the full error messages in an array.
+ def full_messages
+ full_messages = []
+
+ @errors.each_key do |attr|
+ @errors[attr].each do |msg|
+ next if msg.nil?
+
+ if attr == "base"
+ full_messages << msg
+ else
+ full_messages << @base.class.human_attribute_name(attr) + " " + msg
+ end
+ end
+ end
+
+ return full_messages
+ end
+
+ # Returns true if no errors have been added.
+ def empty?
+ return @errors.empty?
+ end
+
+ # Removes all the errors that have been added.
+ def clear
+ @errors = {}
+ end
+
+ # Returns the total number of errors added. Two errors added to the same attribute will be counted as such
+ # with this as well.
+ def count
+ error_count = 0
+ @errors.each_value { |attribute| error_count += attribute.length }
+ error_count
+ end
+ end
+
+
# Active Records implement validation by overwriting Base#validate (or the variations, +validate_on_create+ and
# +validate_on_update+). Each of these methods can inspect the state of the object, which usually means ensuring
# that a number of attributes have a certain value (such as not empty, within a given range, matching a certain regular expression).
@@ -40,27 +174,38 @@ module ActiveRecord
# Please do have a look at ActiveRecord::Validations::ClassMethods for a higher level of validations.
module Validations
VALIDATIONS = %w( validate validate_on_create validate_on_update )
-
+
def self.append_features(base) # :nodoc:
super
-
+ base.extend ClassMethods
base.class_eval do
alias_method :save_without_validation, :save
alias_method :save, :save_with_validation
alias_method :update_attribute_without_validation_skipping, :update_attribute
alias_method :update_attribute, :update_attribute_with_validation_skipping
-
- VALIDATIONS.each { |vd| base.class_eval("def self.#{vd}(*methods, &block) write_inheritable_array(\"#{vd}\", methods + [block].compact - (read_inheritable_attribute(\"#{vd}\") || [])) end") }
end
-
- base.extend(ClassMethods)
end
# All of the following validations are defined in the class scope of the model that you're interested in validating.
# They offer a more declarative way of specifying when the model is valid and when it is not. It is recommended to use
# these over the low-level calls to validate and validate_on_create when possible.
module ClassMethods
+ def validate(*methods, &block)
+ methods << block if block_given?
+ write_inheritable_set(:validate, methods)
+ end
+
+ def validate_on_create(*methods, &block)
+ methods << block if block_given?
+ write_inheritable_set(:validate_on_create, methods)
+ end
+
+ def validate_on_update(*methods, &block)
+ methods << block if block_given?
+ write_inheritable_set(:validate_on_update, methods)
+ end
+
# Encapsulates the pattern of wanting to validate a password or email address field with a confirmation. Example:
#
# Model:
@@ -128,12 +273,55 @@ def validates_presence_of(*attr_names)
class_eval(%(#{validation_method(configuration[:on])} %{errors.add_on_empty('#{attr_name}', "#{configuration[:message]}")}))
end
end
-
+
+
+ DEFAULT_VALIDATION_OPTIONS = {
+ :on => :save,
+ :allow_nil => false,
+ :message => nil
+ }.freeze
+
+ DEFAULT_SIZE_VALIDATION_OPTIONS = DEFAULT_VALIDATION_OPTIONS.merge(
+ :too_long => ActiveRecord::Errors.default_error_messages[:too_long],
+ :too_short => ActiveRecord::Errors.default_error_messages[:too_short],
+ :wrong_length => ActiveRecord::Errors.default_error_messages[:wrong_length]
+ ).freeze
+
+ ALL_RANGE_OPTIONS = [ :is, :within, :in, :minimum, :maximum ].freeze
+
+
+ # Validates each attribute against a block.
+ #
+ # class Person < ActiveRecord::Base
+ # validates_each :first_name, :last_name do |record, attr|
+ # record.errors.add attr, 'starts with z.' if attr[0] == ?z
+ # end
+ # end
+ #
+ # Options:
+ # * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
+ # * <tt>allow_nil</tt> - Skip validation if attribute is nil.
+ def validates_each(*attrs)
+ options = attrs.last.is_a?(Hash) ? attrs.pop.symbolize_keys : {}
+ attrs = attrs.flatten
+
+ # Declare the validation.
+ send(validation_method(options[:on] || :save)) do |record|
+ attrs.each do |attr|
+ value = record.send(attr)
+ next if value.nil? && options[:allow_nil]
+ yield record, attr, value
+ end
+ end
+ end
+
+
# Validates that the specified attribute matches the length restrictions supplied. Only one option can be used at a time:
#
# 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 :user_name, :within => 6..20, :too_long => "pick a shorter name", :too_short => "pick a longer name"
# 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."
@@ -145,55 +333,68 @@ def validates_presence_of(*attr_names)
# * <tt>is</tt> - The exact size of the attribute
# * <tt>within</tt> - A range specifying the minimum and maximum size of the attribute
# * <tt>in</tt> - A synonym(or alias) for :within
- #
+ # * <tt>allow_nil</tt> - Attribute may be nil; skip validation.
+ #
# * <tt>too_long</tt> - The error message if the attribute goes over the maximum (default is: "is too long (max 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)")
# * <tt>message</tt> - The error message to use for a :minimum, :maximum, or :is violation. An alias of the appropriate too_long/too_short/wrong_length message
# * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
- def validates_length_of(*attr_names)
- configuration = { :too_long => ActiveRecord::Errors.default_error_messages[:too_long], :too_short => ActiveRecord::Errors.default_error_messages[:too_short], :wrong_length => ActiveRecord::Errors.default_error_messages[:wrong_length], :on => :save }
- configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+ def validates_length_of(*attrs)
+ # Merge given options with defaults.
+ options = DEFAULT_SIZE_VALIDATION_OPTIONS.dup
+ options.update(attrs.pop.symbolize_keys) if attrs.last.is_a?(Hash)
+
+ # Ensure that one and only one range option is specified.
+ range_options = ALL_RANGE_OPTIONS & options.keys
+ case range_options.size
+ when 0
+ raise ArgumentError, 'Range unspecified. Specify the :within, :maximum, :minimum, or :is option.'
+ when 1
+ # Valid number of options; do nothing.
+ else
+ raise ArgumentError, 'Too many range options specified. Choose only one.'
+ end
- # you must use one of 4 options, :within, :maximum, :minimum, or :is
- within = configuration[:within] || configuration[:in]
- maximum = configuration[:maximum]
- minimum = configuration[:minimum]
- is = configuration[:is]
-
- raise(ArgumentError, "The :within, :maximum, :minimum, or :is options must be passed in the configuration hash") unless within or maximum or minimum or is
- # but not more than 1 of them at a time
- options_used = 0
- options_used += 1 if within
- options_used += 1 if maximum
- options_used += 1 if minimum
- options_used += 1 if is
- raise(ArgumentError, "The :within, :maximum, :minimum, and :is options are mutually exclusive") if options_used > 1
-
- option_to_use = within || maximum || minimum || is
- for attr_name in attr_names
- if within
- raise(ArgumentError, "The :within option must be a Range") unless within.kind_of?(Range)
- class_eval(%(#{validation_method(configuration[:on])} %{errors.add_on_boundary_breaking('#{attr_name}', #{within}, "#{configuration[:too_long]}", "#{configuration[:too_short]}")}))
- elsif maximum
- raise(ArgumentError, "The :maximum option must be a Fixnum") unless maximum.kind_of?(Fixnum)
- msg = configuration[:message] || configuration[:too_long]
- msg = (msg % maximum) rescue msg
- class_eval(%(#{validation_method(configuration[:on])} %{errors.add( '#{attr_name}', '#{msg}') if #{attr_name}.to_s.length > #{maximum} }))
- elsif minimum
- raise(ArgumentError, "The :minimum option must be a Fixnum") unless minimum.kind_of?(Fixnum)
- msg = configuration[:message] || configuration[:too_short]
- msg = (msg % minimum) rescue msg
- class_eval(%(#{validation_method(configuration[:on])} %{errors.add( '#{attr_name}', '#{msg}') if #{attr_name}.to_s.length < #{minimum} }))
- else
- raise(ArgumentError, "The :is option must be a Fixnum") unless is.kind_of?(Fixnum)
- msg = configuration[:message] || configuration[:wrong_length]
- msg = (msg % is) rescue msg
- class_eval(%(#{validation_method(configuration[:on])} %{errors.add( '#{attr_name}', '#{msg}') if #{attr_name}.to_s.length != #{is} }))
+ # Get range option and value.
+ option = range_options.first
+ option_value = options[range_options.first]
+
+ # Declare different validations per option.
+ case range_options.first
+ when :within, :in
+ raise ArgumentError, ':within must be a Range' unless option_value.is_a?(Range)
+ validates_each(attrs, options) do |record, attr|
+ next if record.send(attr).nil? and options[:allow_nil]
+ record.errors.add_on_boundary_breaking(attr, option_value, options[:too_long], options[:too_short])
+ end
+ when :is
+ raise ArgumentError, ':is must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0
+ message = options[:message] || options[:wrong_length]
+ message = (message % option_value) rescue message
+ validates_each(attrs, options) do |record, attr, value|
+ record.errors.add(attr, message) if value.nil? or value.size != option_value
end
- end
+ when :minimum
+ raise ArgumentError, ':minimum must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0
+ message = options[:message] || options[:too_short]
+ message = (message % option_value) rescue message
+ validates_each(attrs, options) do |record, attr, value|
+ record.errors.add(attr, message) if value.nil? or value.size < option_value
+ end
+ when :maximum
+ raise ArgumentError, ':maximum must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0
+ message = options[:message] || options[:too_long]
+ message = (message % option_value) rescue message
+ validates_each(attrs, options) do |record, attr, value|
+ record.errors.add(attr, message) if value.nil? or value.size > option_value
+ end
+ end
end
+ alias_method :validates_size_of, :validates_length_of
+
+
# Validates whether the value of the specified attributes are unique across the system. Useful for making sure that only one user
# can be named "davidhh".
#
@@ -307,6 +508,11 @@ def validates_associated(*attr_names)
private
+ def write_inheritable_set(key, methods)
+ existing_methods = read_inheritable_attribute(key) || []
+ write_inheritable_attribute(key, methods | existing_methods)
+ end
+
def validation_method(on)
case on
when :save then :validate
@@ -369,7 +575,7 @@ def validate_on_update # :doc:
private
def run_validations(validation_method)
- validations = self.class.read_inheritable_attribute(validation_method.to_s)
+ validations = self.class.read_inheritable_attribute(validation_method.to_sym)
if validations.nil? then return end
validations.each do |validation|
if validation.is_a?(Symbol)
@@ -398,137 +604,4 @@ def validation_class?(validation, validation_method)
validation.respond_to?(validation_method)
end
end
-
- # Active Record validation is reported to and from this object, which is used by Base#save to
- # determine whether the object in a valid state to be saved. See usage example in Validations.
- class Errors
- def initialize(base) # :nodoc:
- @base, @errors = base, {}
- end
-
- @@default_error_messages = {
- :inclusion => "is not included in the list",
- :invalid => "is invalid",
- :confirmation => "doesn't match confirmation",
- :accepted => "must be accepted",
- :empty => "can't be empty",
- :too_long => "is too long (max is %d characters)",
- :too_short => "is too short (min is %d characters)",
- :wrong_length => "is the wrong length (should be %d characters)",
- :taken => "has already been taken",
- }
- cattr_accessor :default_error_messages
-
-
- # Adds an error to the base object instead of any particular attribute. This is used
- # to report errors that doesn't tie to any specific attribute, but rather to the object
- # as a whole. These error messages doesn't get prepended with any field name when iterating
- # with each_full, so they should be complete sentences.
- def add_to_base(msg)
- add(:base, msg)
- end
-
- # Adds an error message (+msg+) to the +attribute+, which will be returned on a call to <tt>on(attribute)</tt>
- # for the same attribute and ensure that this error object returns false when asked if +empty?+. More than one
- # error can be added to the same +attribute+ in which case an array will be returned on a call to <tt>on(attribute)</tt>.
- # If no +msg+ is supplied, "invalid" is assumed.
- def add(attribute, msg = @@default_error_messages[:invalid])
- @errors[attribute.to_s] = [] if @errors[attribute.to_s].nil?
- @errors[attribute.to_s] << msg
- end
-
- # Will add an error message to each of the attributes in +attributes+ that is empty (defined by <tt>attribute_present?</tt>).
- def add_on_empty(attributes, msg = @@default_error_messages[:empty])
- for attr in [attributes].flatten
- value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
- is_empty = value.respond_to?("empty?") ? value.empty? : false
- add(attr, msg) unless !value.nil? && !is_empty
- end
- end
-
- # Will add an error message to each of the attributes in +attributes+ that has a length outside of the passed boundary +range+.
- # If the length is above the boundary, the too_long_msg message will be used. If below, the too_short_msg.
- def add_on_boundary_breaking(attributes, range, too_long_msg = @@default_error_messages[:too_long], too_short_msg = @@default_error_messages[:too_short])
- for attr in [attributes].flatten
- value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
- add(attr, too_short_msg % range.begin) if value && value.length < range.begin
- add(attr, too_long_msg % range.end) if value && value.length > range.end
- end
- end
-
- alias :add_on_boundry_breaking :add_on_boundary_breaking
-
- # Returns true if the specified +attribute+ has errors associated with it.
- def invalid?(attribute)
- !@errors[attribute.to_s].nil?
- end
-
- # * Returns nil, if no errors are associated with the specified +attribute+.
- # * Returns the error message, if one error is associated with the specified +attribute+.
- # * Returns an array of error messages, if more than one error is associated with the specified +attribute+.
- def on(attribute)
- if @errors[attribute.to_s].nil?
- nil
- elsif @errors[attribute.to_s].length == 1
- @errors[attribute.to_s].first
- else
- @errors[attribute.to_s]
- end
- end
-
- alias :[] :on
-
- # Returns errors assigned to base object through add_to_base according to the normal rules of on(attribute).
- def on_base
- on(:base)
- end
-
- # Yields each attribute and associated message per error added.
- def each
- @errors.each_key { |attr| @errors[attr].each { |msg| yield attr, msg } }
- end
-
- # Yields each full error message added. So Person.errors.add("first_name", "can't be empty") will be returned
- # through iteration as "First name can't be empty".
- def each_full
- full_messages.each { |msg| yield msg }
- end
-
- # Returns all the full error messages in an array.
- def full_messages
- full_messages = []
-
- @errors.each_key do |attr|
- @errors[attr].each do |msg|
- next if msg.nil?
-
- if attr == "base"
- full_messages << msg
- else
- full_messages << @base.class.human_attribute_name(attr) + " " + msg
- end
- end
- end
-
- return full_messages
- end
-
- # Returns true if no errors have been added.
- def empty?
- return @errors.empty?
- end
-
- # Removes all the errors that have been added.
- def clear
- @errors = {}
- end
-
- # Returns the total number of errors added. Two errors added to the same attribute will be counted as such
- # with this as well.
- def count
- error_count = 0
- @errors.each_value { |attribute| error_count += attribute.length }
- error_count
- end
- end
end
View
169 activerecord/test/validations_test.rb
@@ -6,9 +6,10 @@
class ValidationsTest < Test::Unit::TestCase
fixtures :topics, :developers
- def teardown
- Topic.write_inheritable_attribute("validate", [])
- Topic.write_inheritable_attribute("validate_on_create", [])
+ def setup
+ Topic.write_inheritable_attribute(:validate, nil)
+ Topic.write_inheritable_attribute(:validate_on_create, nil)
+ Topic.write_inheritable_attribute(:validate_on_update, nil)
end
def test_single_field_validation
@@ -19,7 +20,7 @@ def test_single_field_validation
r.content = "Messa content!"
assert r.save, "A reply with content should be saveable"
end
-
+
def test_single_attr_validation_and_error_msg
r = Reply.new
r.title = "There's no content!"
@@ -41,7 +42,7 @@ def test_double_attr_validation_and_error_msg
assert_equal 2, r.errors.count
end
-
+
def test_error_on_create
r = Reply.new
r.title = "Wrong Create"
@@ -50,57 +51,55 @@ def test_error_on_create
assert_equal "is Wrong Create", r.errors.on("title"), "A reply with a bad content should contain an error"
end
-
def test_error_on_update
r = Reply.new
r.title = "Bad"
r.content = "Good"
-
assert r.save, "First save should be successful"
-
+
r.title = "Wrong Update"
assert !r.save, "Second save should fail"
-
+
assert r.errors.invalid?("title"), "A reply with a bad title should mark that attribute as invalid"
assert_equal "is Wrong Update", r.errors.on("title"), "A reply with a bad content should contain an error"
end
-
+
def test_single_error_per_attr_iteration
r = Reply.new
r.save
-
+
errors = []
r.errors.each { |attr, msg| errors << [attr, msg] }
-
+
assert errors.include?(["title", "Empty"])
assert errors.include?(["content", "Empty"])
end
-
+
def test_multiple_errors_per_attr_iteration_with_full_error_composition
r = Reply.new
r.title = "Wrong Create"
r.content = "Mismatch"
r.save
-
+
errors = []
r.errors.each_full { |error| errors << error }
-
+
assert_equal "Title is Wrong Create", errors[0]
assert_equal "Title is Content Mismatch", errors[1]
assert_equal 2, r.errors.count
end
-
+
def test_errors_on_base
r = Reply.new
r.content = "Mismatch"
r.save
r.errors.add_to_base "Reply is not dignifying"
-
+
errors = []
r.errors.each_full { |error| errors << error }
-
+
assert_equal "Reply is not dignifying", r.errors.on_base
-
+
assert errors.include?("Title Empty")
assert errors.include?("Reply is not dignifying")
assert_equal 2, r.errors.count
@@ -111,12 +110,30 @@ def test_create_without_validation
assert !reply.save
assert reply.save(false)
end
-
+
+ def test_validates_each
+ perform = true
+ hits = 0
+ Topic.validates_each(:title, :content, [:title, :content]) do |record, attr|
+ if perform
+ record.errors.add attr, 'gotcha'
+ hits += 1
+ end
+ end
+ t = Topic.new("title" => "valid", "content" => "whatever")
+ assert !t.save
+ assert_equal 4, hits
+ assert_equal %w(gotcha gotcha), t.errors.on(:title)
+ assert_equal %w(gotcha gotcha), t.errors.on(:content)
+ ensure
+ perform = false
+ end
+
def test_errors_on_boundary_breaking
developer = Developer.new("name" => "xs")
assert !developer.save
assert_equal "is too short (min is 3 characters)", developer.errors.on("name")
-
+
developer.name = "All too very long for this boundary, it really is"
assert !developer.save
assert_equal "is too long (max is 20 characters)", developer.errors.on("name")
@@ -127,11 +144,11 @@ def test_errors_on_boundary_breaking
def test_title_confirmation_no_confirm
Topic.validates_confirmation_of(:title)
-
+
t = Topic.create("title" => "We should not be confirmed")
assert t.save
end
-
+
def test_title_confirmation
Topic.validates_confirmation_of(:title)
@@ -171,24 +188,24 @@ def test_eula
t.eula = "1"
assert t.save
end
-
+
def test_validate_presences
Topic.validates_presence_of(:title, :content)
t = Topic.create
assert !t.save
assert_equal "can't be empty", t.errors.on(:title)
assert_equal "can't be empty", t.errors.on(:content)
-
+
t.title = "something"
t.content = "another"
-
+
assert t.save
end
-
+
def test_validate_uniqueness
Topic.validates_uniqueness_of(:title)
-
+
t = Topic.new("title" => "I'm unique!")
assert t.save, "Should save t as unique"
@@ -199,14 +216,14 @@ def test_validate_uniqueness
assert !t2.valid?, "Shouldn't be valid"
assert !t2.save, "Shouldn't save t2 as unique"
assert_equal "has already been taken", t2.errors.on(:title)
-
+
t2.title = "Now Im really also unique"
assert t2.save, "Should now save t2 as unique"
end
def test_validate_uniqueness_with_scope
Reply.validates_uniqueness_of(:content, :scope => "parent_id")
-
+
t = Topic.create("title" => "I'm unique!")
r1 = t.replies.create "title" => "r1", "content" => "hello world"
@@ -246,8 +263,7 @@ def test_validates_inclusion_of
assert !Topic.create("title" => "a!", "content" => "abc").valid?
assert !Topic.create("title" => "a b", "content" => "abc").valid?
assert !Topic.create("title" => nil, "content" => "def").valid?
- assert !Topic.create("title" => %w(a b c), "content" => "def").valid?
-
+
t = Topic.create("title" => "a", "content" => "I know you are but what am I?")
assert t.valid?
t.title = "uhoh"
@@ -272,32 +288,61 @@ def test_validates_inclusion_of_with_allow_nil
end
def test_validates_length_of_using_minimum
- Topic.validates_length_of( :title, :minimum=>5 )
+ Topic.validates_length_of :title, :minimum => 5
+
t = Topic.create("title" => "valid", "content" => "whatever")
assert t.valid?
+
t.title = "not"
assert !t.valid?
assert t.errors.on(:title)
assert_equal "is too short (min is 5 characters)", t.errors["title"]
+
t.title = ""
assert !t.valid?
assert t.errors.on(:title)
+ assert_equal "is too short (min is 5 characters)", t.errors["title"]
+
t.title = nil
assert !t.valid?
- assert_equal "is too short (min is 5 characters)", t.errors["title"]
assert t.errors.on(:title)
+ assert_equal "is too short (min is 5 characters)", t.errors["title"]
end
-
+
+ def test_optionally_validates_length_of_using_minimum
+ Topic.validates_length_of :title, :minimum => 5, :allow_nil => true
+
+ t = Topic.create("title" => "valid", "content" => "whatever")
+ assert t.valid?
+
+ t.title = nil
+ assert t.valid?
+ end
+
def test_validates_length_of_using_maximum
- Topic.validates_length_of( :title, :maximum=>5 )
+ Topic.validates_length_of :title, :maximum => 5
+
t = Topic.create("title" => "valid", "content" => "whatever")
assert t.valid?
+
t.title = "notvalid"
assert !t.valid?
assert t.errors.on(:title)
assert_equal "is too long (max is 5 characters)", t.errors["title"]
+
t.title = ""
assert t.valid?
+
+ t.title = nil
+ assert !t.valid?
+ end
+
+ def test_optionally_validates_length_of_using_maximum
+ Topic.validates_length_of :title, :maximum => 5, :allow_nil => true
+
+ t = Topic.create("title" => "valid", "content" => "whatever")
+ assert t.valid?
+
t.title = nil
assert t.valid?
end
@@ -307,29 +352,75 @@ def test_validates_length_of_using_within
t = Topic.create("title" => "a!", "content" => "I'm ooooooooh so very long")
assert !t.save
+
assert_equal "is too short (min is 3 characters)", t.errors.on(:title)
assert_equal "is too long (max is 5 characters)", t.errors.on(:content)
t.title = "abe"
t.content = "mad"
-
assert t.save
end
+ def test_optionally_validates_length_of_using_within
+ Topic.validates_length_of :title, :content, :within => 3..5, :allow_nil => true
+
+ t = Topic.create('title' => 'abc', 'content' => 'abcd')
+ assert t.valid?
+
+ t.title = nil
+ assert t.valid?
+ end
+
def test_validates_length_of_using_is
- Topic.validates_length_of( :title, :is=>5 )
+ Topic.validates_length_of :title, :is => 5
+
t = Topic.create("title" => "valid", "content" => "whatever")
assert t.valid?
+
t.title = "notvalid"
assert !t.valid?
assert t.errors.on(:title)
assert_equal "is the wrong length (should be 5 characters)", t.errors["title"]
+
t.title = ""
assert !t.valid?
+
t.title = nil
assert !t.valid?
end
+ def test_optionally_validates_length_of_using_is
+ Topic.validates_length_of :title, :is => 5, :allow_nil => true
+
+ t = Topic.create("title" => "valid", "content" => "whatever")
+ assert t.valid?
+
+ t.title = nil
+ assert t.valid?
+ end
+
+ def test_validates_length_of_using_bignum
+ bigmin = 2 ** 30
+ bigmax = 2 ** 32
+ bigrange = bigmin...bigmax
+ assert_nothing_raised do
+ Topic.validates_length_of :title, :is => bigmin + 5
+ Topic.validates_length_of :title, :within => bigrange
+ Topic.validates_length_of :title, :in => bigrange
+ Topic.validates_length_of :title, :minimum => bigmin
+ Topic.validates_length_of :title, :maximum => bigmax
+ end
+ end
+
+ def test_validates_size_of_association
+ assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
+ t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
+ assert !t.save
+ assert t.errors.on(:replies)
+ t.replies.create('title' => 'areply', 'content' => 'whateveragain')
+ assert t.valid?
+ end
+
def test_validates_length_of_nasty_params
assert_raise(ArgumentError) { Topic.validates_length_of(:title, :minimum=>6, :maximum=>9) }
assert_raise(ArgumentError) { Topic.validates_length_of(:title, :within=>6, :maximum=>9) }
@@ -372,7 +463,7 @@ def test_validates_length_of_custom_errors_for_maximum_with_too_long
assert t.errors.on(:title)
assert_equal "hoo 5", t.errors["title"]
end
-
+
def test_validates_length_of_custom_errors_for_is_with_message
Topic.validates_length_of( :title, :is=>5, :message=>"boo %d" )
t = Topic.create("title" => "uhohuhoh", "content" => "whatever")

0 comments on commit 5dcbe93

Please sign in to comment.