Ticket #8798: ARES_test_and_fix_for_undefined_method_collect_on_hash_error.patch

lib/active_resource/base.rb

@@ -462 +462 @@
-        end
-        
-        def instantiate_collection(collection, prefix_options = {})
-
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-
-        def instantiate_record(record, prefix_options = {})

test/base_test.rb

@@ -13 +13 @@
-    @people = [{ :id => 1, :name => 'Matz' }, { :id => 2, :name => 'David' }].to_xml(:root => 'people')
-    @people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people')
-    @addresses = [{ :id => 1, :street => '12345 Street' }].to_xml(:root => 'addresses')
-
+
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get    "/people/1.xml",             {}, @matz
-      mock.get    "/people/2.xml",             {}, @david
@@ -441 +441 @@
-    matz = Person.find(1)
-    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<person>\n  <name>Matz</name>\n  <id type=\"integer\">1</id>\n</person>\n", matz.to_xml
-  end
+
+  def test_unspecified_collection_types
+  # Tests and data to prove that we've fixed the "undefined method 'collect!' for Hash" problem
+    @people_xml = <<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<people>
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+XML
+
+    @people_david_xml = <<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<people>
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+XML
+
+    @problematic = <<XML
+<?xml version="1.0" encoding="UTF-8"?> 
+<account>
+  <id type="integer">1</id> 
+  <account-number>1234</account-number> 
+  <name>Checking</name>
+  <txactions>
+    <txaction>
+      <date>2007-05-03</date> 
+      <amount>-89.72</amount> 
+      <merchant>
+        <name>Berkeley Bowl</name> <rating>Fan</rating>
+      </merchant>
+    </txaction>
+  </txactions>
+</account> 
+XML
+
+    ActiveResource::HttpMock.respond_to { |m| 
+      m.get "/firms/1/people.xml", {}, @people_xml 
+      m.get "/partners/1/people.xml", {}, @people_david_xml
+      m.get "/problems/1/people.xml", {}, @problematic
+    }
+
+    people = Person.find(:all, :from => "/firms/1/people.xml")
+    
+    assert_equal 2, people.size
+    assert_kind_of Person, people.first
+    assert_equal "Matz", people.first.name
+    assert_equal "David", people.last.name
+
+    people = Person.find(:all, :from => "/partners/1/people.xml")
+    assert_equal 1, people.size
+    assert_equal "David", people.first.name
+
+    got = Person.find(:all, :from => "/problems/1/people.xml")
+    assert_equal "Checking", got.name
+    assert_equal "-89.72", got.txactions.txaction.amount
+  end
-end