Fix issues with ActiveResource collection handling. Closes #6291. [bmilekic]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5714 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 28 insertions, 17 deletions

diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 07933d499b..5f3820b2be 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -20,7 +20,7 @@ module ActiveResource
         @connection
       end
 
-      attr_accessor_with_default(:element_name) { to_s.underscore }
+      attr_accessor_with_default(:element_name)    { to_s.underscore }
       attr_accessor_with_default(:collection_name) { element_name.pluralize }
       attr_accessor_with_default(:primary_key, 'id')
       
@@ -69,14 +69,14 @@ module ActiveResource
       end
 
       private
-        # { :people => { :person => [ person1, person2 ] } }
         def find_every(options)
-          connection.get(collection_path(options)).values.first.values.first.collect { |element| new(element, options) }
+          collection = connection.get(collection_path(options)) || []
+          collection.collect! { |element| new(element, options) }
         end
 
         # { :person => person1 }
         def find_single(scope, options)
-          new(connection.get(element_path(scope, options)).values.first, options)
+          new(connection.get(element_path(scope, options)), options)
         end
     end
 
@@ -129,17 +129,8 @@ module ActiveResource
               resource = find_or_create_resource_for_collection(key)
               value.map { |attrs| resource.new(attrs) }
             when Hash
-              # Workaround collections loaded as Hash
-              #   :persons => { :person => [
-              #     { :id => 1, :name => 'a' },
-              #     { :id => 2, :name => 'b' } ]}
-              if value.keys.size == 1 and value.values.first.is_a?(Array)
-                resource = find_or_create_resource_for(value.keys.first)
-                value.values.first.map { |attrs| resource.new(attrs) }
-              else
-                resource = find_or_create_resource_for(key)
-                resource.new(value)
-              end
+              resource = find_or_create_resource_for(key)
+              resource.new(value)
             when ActiveResource::Base
               value.class.new(value.attributes)
             else
@@ -189,7 +180,7 @@ module ActiveResource
       rescue NameError
         resource = self.class.const_set(resource_name, Class.new(ActiveResource::Base))
         resource.prefix = self.class.prefix
-        resource.site = self.class.site
+        resource.site   = self.class.site
         resource
       end
 
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index e4f733cf70..c52d4d4839 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -49,7 +49,7 @@ module ActiveResource
     end
 
     def get(path)
-      Hash.from_xml(request(:get, path, build_request_headers).body)
+      from_xml_data(Hash.from_xml(request(:get, path, build_request_headers).body).values.first)
     end
 
     def delete(path)
@@ -113,5 +113,25 @@ module ActiveResource
       def logger
         ActiveResource::Base.logger
       end
+
+      # Manipulate from_xml Hash, because xml_simple is not exactly what we
+      # want for ActiveResource.
+      def from_xml_data(data)
+        case data
+          when Hash
+            if data.keys.size == 1
+              case data.values.first
+                when Hash  then [ from_xml_data(data.values.first) ]
+                when Array then from_xml_data(data.values.first)
+                else       data
+              end
+            else
+              data.each_key { |key| data[key] = from_xml_data(data[key]) }
+              data
+            end
+          when Array then data.collect { |val| from_xml_data(val) }
+          else data
+        end
+      end
   end
 end