aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-04-25 04:46:52 -0700
committerJosé Valim <jose.valim@gmail.com>2012-04-25 04:46:52 -0700
commit217e9c088e07d55007c5f63a56ad5747cf2f646d (patch)
tree630883d2ecf62e3d6e6af7d990a33bb5e43775ef
parent2aabf8c858f80b46e2ec1f404803794aa622ec82 (diff)
parenta631dd97cb6d11dd6f2338d83425168ba334371a (diff)
downloadrails-217e9c088e07d55007c5f63a56ad5747cf2f646d.tar.gz
rails-217e9c088e07d55007c5f63a56ad5747cf2f646d.tar.bz2
rails-217e9c088e07d55007c5f63a56ad5747cf2f646d.zip
Merge pull request #5977 from oscardelben/refactor_serializable_hash
Minor refactor of serializable hash
-rw-r--r--activemodel/lib/active_model/serialization.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb
index 4323ee1e09..06bedf1c47 100644
--- a/activemodel/lib/active_model/serialization.rb
+++ b/activemodel/lib/active_model/serialization.rb
@@ -78,8 +78,7 @@ module ActiveModel
hash = {}
attribute_names.each { |n| hash[n] = read_attribute_for_serialization(n) }
- method_names = Array(options[:methods]).select { |n| respond_to?(n) }
- method_names.each { |n| hash[n.to_s] = send(n) }
+ Array(options[:methods]).each { |m| hash[m.to_s] = send(m) if respond_to?(m) }
serializable_add_includes(options) do |association, records, opts|
hash[association.to_s] = if records.is_a?(Enumerable)