@@ -33,11 +33,11 @@ module ActiveModel # not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The # method, proc or string should return or evaluate to a true or false value. def validates_associated(*attr_names) - configuration = { :message => ActiveModel::Errors.default_error_messages[:invalid], :on => :save } + configuration = { :message => ActiveModel::Errors.default_error_messages[:invalid], :on => default_validation_options[:on] } configuration.update(attr_names.extract_options!) validates_each(attr_names, configuration) do |record, attr_name, value| - record.errors.add(attr_name, configuration[:message]) unless + record.errors[attr_name] << (configuration[:message]) unless (value.is_a?(Array) ? value : [value]).inject(true) { |v, r| (r.nil? || r.valid?) && v } end end activemodel/lib/active_model/validations/associated.rb @@ -29,7 +29,7 @@ module ActiveModel raise(ArgumentError, "An object with the method include? is required must be supplied as the :in option of the configuration hash") unless enum.respond_to?("include?") validates_each(attr_names, configuration) do |record, attr_name, value| - record.errors.add(attr_name, configuration[:message] % value) if enum.include?(value) + record.errors[attr_name] << (configuration[:message] % value) if enum.include?(value) end end end activemodel/lib/active_model/validations/exclusion.rb @@ -25,13 +25,13 @@ module ActiveModel # not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The # method, proc or string should return or evaluate to a true or false value. def validates_format_of(*attr_names) - configuration = { :message => ActiveModel::Errors.default_error_messages[:invalid], :on => :save, :with => nil } + configuration = { :message => ActiveModel::Errors.default_error_messages[:invalid], :on => default_validation_options[:on], :with => nil } configuration.update(attr_names.extract_options!) raise(ArgumentError, "A regular expression must be supplied as the :with option of the configuration hash") unless configuration[:with].is_a?(Regexp) validates_each(attr_names, configuration) do |record, attr_name, value| - record.errors.add(attr_name, configuration[:message] % value) unless value.to_s =~ configuration[:with] + record.errors[attr_name] << (configuration[:message] % value) unless value.to_s =~ configuration[:with] end end end activemodel/lib/active_model/validations/format.rb @@ -40,7 +40,7 @@ module ActiveModel :too_long => ActiveModel::Errors.default_error_messages[:too_long], :too_short => ActiveModel::Errors.default_error_messages[:too_short], :wrong_length => ActiveModel::Errors.default_error_messages[:wrong_length] - }.merge(self.default_validation_options) + }.merge(default_validation_options) options.update(attrs.extract_options!.symbolize_keys) # Ensure that one and only one range option is specified. @@ -68,9 +68,9 @@ module ActiveModel validates_each(attrs, options) do |record, attr, value| value = value.split(//) if value.kind_of?(String) if value.nil? or value.size < option_value.begin - record.errors.add(attr, too_short) + record.errors[attr] << too_short elsif value.size > option_value.end - record.errors.add(attr, too_long) + record.errors[attr] << too_long end end when :is, :minimum, :maximum @@ -84,7 +84,7 @@ module ActiveModel validates_each(attrs, options) do |record, attr, value| value = value.split(//) if value.kind_of?(String) - record.errors.add(attr, message) unless !value.nil? and value.size.method(validity_checks[option])[option_value] + record.errors[attr] << message unless !value.nil? and value.size.method(validity_checks[option])[option_value] end end end activemodel/lib/active_model/validations/length.rb f30ee34c4539ad3633026778559dff648970f282 Ruy Asan ruyasan@gmail.com http://github.com/rubyruy/rails/commit/08144c7a4c68c830e80f31556b20a1ec02d2b135 08144c7a4c68c830e80f31556b20a1ec02d2b135 2008-06-19T11:45:08-07:00 2008-06-19T11:43:23-07:00 Updated macros to use new errors syntax 1061837d72a40aaf41511ded3a0585bdafca4cec Ruy Asan ruyasan@gmail.com