mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
The find should instantiate real objects, not return hashes
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6585 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
9b8399fb7f
commit
46b58d80b9
2 changed files with 6 additions and 3 deletions
|
@ -122,7 +122,7 @@ module ActiveResource
|
|||
case scope
|
||||
when :all then find_every(options)
|
||||
when :first then find_every(options).first
|
||||
when Symbol then get(scope, options)
|
||||
when Symbol then instantiate_collection(get(scope, options))
|
||||
else find_single(scope, options)
|
||||
end
|
||||
end
|
||||
|
@ -142,7 +142,10 @@ module ActiveResource
|
|||
# Find every resource.
|
||||
def find_every(options)
|
||||
prefix_options, query_options = split_options(options)
|
||||
collection = connection.get(collection_path(prefix_options, query_options)) || []
|
||||
instantiate_collection(connection.get(collection_path(prefix_options, query_options)) || [])
|
||||
end
|
||||
|
||||
def instantiate_collection(collection, prefix_options = {})
|
||||
collection.collect! do |element|
|
||||
returning new(element) do |resource|
|
||||
resource.prefix_options = prefix_options
|
||||
|
|
|
@ -82,6 +82,6 @@ class CustomMethodsTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_find_custom_resources
|
||||
assert_equal [{ "id" => 1, "name" => 'Matz' }], Person.find(:managers)
|
||||
assert_equal 'Matz', Person.find(:managers).first.name
|
||||
end
|
||||
end
|
Loading…
Reference in a new issue