diff options
author | José Valim <jose.valim@gmail.com> | 2012-01-05 23:31:46 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-01-05 23:31:46 -0800 |
commit | 75a630edf34d09bc57f3088136d418850abc4641 (patch) | |
tree | b54d8b37ddc7c91d58054923a5212057ce6d9393 /activemodel/lib/active_model/serialization.rb | |
parent | e09c3c783433e01b11ee4ea12980340cc325472e (diff) | |
parent | 4311fc45dcfaee61ea6bfbd1631d6672b46f787b (diff) | |
download | rails-75a630edf34d09bc57f3088136d418850abc4641.tar.gz rails-75a630edf34d09bc57f3088136d418850abc4641.tar.bz2 rails-75a630edf34d09bc57f3088136d418850abc4641.zip |
Merge pull request #4340 from rafaelfranca/patch-1
Remove more Array.wrap calls
Diffstat (limited to 'activemodel/lib/active_model/serialization.rb')
-rw-r--r-- | activemodel/lib/active_model/serialization.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index a4b58ab456..ba9721cc70 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -73,15 +73,15 @@ module ActiveModel attribute_names = attributes.keys.sort if only = options[:only] - attribute_names &= Array.wrap(only).map(&:to_s) + attribute_names &= Array(only).map(&:to_s) elsif except = options[:except] - attribute_names -= Array.wrap(except).map(&:to_s) + attribute_names -= Array(except).map(&:to_s) end hash = {} attribute_names.each { |n| hash[n] = read_attribute_for_serialization(n) } - method_names = Array.wrap(options[:methods]).select { |n| respond_to?(n) } + method_names = Array(options[:methods]).select { |n| respond_to?(n) } method_names.each { |n| hash[n] = send(n) } serializable_add_includes(options) do |association, records, opts| |