TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactor AMo::Errors

Browse Source 
* Use merge!, remove reverse_merge
* Use case statement instead of is_a? checks
This commit is contained in:
Carlos Antonio da Silva 2012-04-27 21:02:51 -03:00
parent 3e8d88f7da
commit 709b748f09
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemodel/lib/active_model/errors.rb
View File

@ -3,7 +3,6 @@
require 'active_support/core_ext/array/conversions'
require 'active_support/core_ext/string/inflections'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/hash/reverse_merge'
module ActiveModel
# == Active Model Errors
@ -202,7 +201,7 @@ def empty?
# # <error>name must be specified</error>
# # </errors>
def to_xml(options={})
to_a.to_xml options.reverse_merge(:root => "errors", :skip_types => true)
to_a.to_xml({ :root => "errors", :skip_types => true }.merge!(options))
end
# Returns an Hash that can be used as the JSON representation for this object.
@ -217,7 +216,7 @@ def to_hash(full_messages = false)
if full_messages
messages = {}
self.messages.each do |attribute, array|
messages[attribute] = array.map{|message| full_message(attribute, message) }
messages[attribute] = array.map { |message| full_message(attribute, message) }
end
messages
else
@ -347,7 +346,7 @@ def generate_message(attribute, type = :invalid, options = {})
:model => @base.class.model_name.human,
:attribute => @base.class.human_attribute_name(attribute),
:value => value
}.merge(options)
}.merge!(options)
I18n.translate(key, options)
end
@ -356,9 +355,10 @@ def generate_message(attribute, type = :invalid, options = {})
def normalize_message(attribute, message, options)
message ||= :invalid
if message.is_a?(Symbol)
case message
when Symbol
generate_message(attribute, message, options.except(*CALLBACKS_OPTIONS))
elsif message.is_a?(Proc)
when Proc
message.call
else
message