aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib
diff options
context:
space:
mode:
authorRyan Bigg <radarlistener@gmail.com>2008-10-06 11:57:12 +1030
committerRyan Bigg <radarlistener@gmail.com>2008-10-06 11:57:12 +1030
commita21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7 (patch)
treebb0b0e9423d4e259de6041e661bba119f7871faa /activeresource/lib
parentb340337aaff5b59fdf2110207fec3e1c43f1380a (diff)
parent6090513cfb8acb5554a6653a6f2cb87648585d41 (diff)
downloadrails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.tar.gz
rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.tar.bz2
rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'activeresource/lib')
-rw-r--r--activeresource/lib/active_resource/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index d966062c7f..74d8128c0e 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -884,6 +884,7 @@ module ActiveResource
#
# ==== Examples
# my_attrs = {:name => 'J&J Textiles', :industry => 'Cloth and textiles'}
+ # my_attrs = {:name => 'Marty', :colors => ["red", "green", "blue"]}
#
# the_supplier = Supplier.find(:first)
# the_supplier.name # => 'J&M Textiles'
@@ -906,7 +907,7 @@ module ActiveResource
case value
when Array
resource = find_or_create_resource_for_collection(key)
- value.map { |attrs| resource.new(attrs) }
+ value.map { |attrs| attrs.is_a?(String) ? attrs.dup : resource.new(attrs) }
when Hash
resource = find_or_create_resource_for(key)
resource.new(value)