Ticket #8566: handle_complex_xml_types_in_activeresource_updated.diff

test/fixtures/shape.rb

@@ +1 @@
+class Shape < ActiveResource::Base
+  self.site = "http://math.i:3000"
+end

test/base_test.rb

@@ -2 +2 @@
-require "fixtures/person"
-require "fixtures/street_address"
-require "fixtures/beast"
+require "fixtures/shape"
-
-class BaseTest < Test::Unit::TestCase
-  def setup
@@ -266 +267 @@
-    assert_equal "David", david.name
-  end
-
+  def test_find_one_complex
+    side_1    = { :id => 1, :length => 10 }
+    side_2    = { :id => 2, :length => 20 }
+    rectangle = { :id => 2, :name => 'square', :sides => [ side_1, side_2 ]}.to_xml(:root => 'shape')
+    
+    ActiveResource::HttpMock.respond_to { |m| m.get "/shapes/2.xml", {}, rectangle }
+    
+    shape = Shape.find(2)
+    assert_equal 2, shape.id
+    assert_equal 'square', shape.name
+    assert_equal 2, shape.sides.length
+    assert_equal side_1, shape.sides[0].attributes.symbolize_keys
+    assert_equal side_2, shape.sides[1].attributes.symbolize_keys
+  end
+
+  def test_find_one_complex_from_xml
+    shapes_xml = "<shapes><polygons><square>blue</square><square>gold</square></polygons></shapes>"
+    
+    ActiveResource::HttpMock.respond_to { |m| m.get "/shapes.xml", {}, shapes_xml }
+    
+    shapes = Shape.find(:all)
+    assert_equal 1, shapes.length
+    assert_kind_of Array, shapes.first.square
+    assert_equal 2, shapes.first.square.length
+    assert shapes.first.square.include?('blue')
+    assert shapes.first.square.include?('gold')
+  end
+
+  def test_find_all_complex
+    circle    = { :id => 1, :name => 'circle' }
+    square    = { :id => 2, :name => 'square' }
+    rectangle = { :id => 3, :name => 'rectangle' }
+    shapes    = { :circle => circle, :polygons => [square, rectangle] }.to_xml(:root => 'shapes')
+    
+    ActiveResource::HttpMock.respond_to { |m| m.get "/shapes.xml", {}, shapes }
+    
+    shapes = Shape.find(:all)
+    assert_equal 2, shapes.length
+    assert_equal circle,    shapes[0].attributes.symbolize_keys
+    assert_equal 2, shapes[1].length
+    assert_equal square,    shapes[1][0].attributes.symbolize_keys
+    assert_equal rectangle, shapes[1][1].attributes.symbolize_keys
+  end
+
+  def test_find_all_complex_from_xml
+    shapes_xml = "<shapes><polygons><square>blue</square><square>gold</square></polygons><circles><round>big</round></circles></shapes>"
+    
+    ActiveResource::HttpMock.respond_to { |m| m.get "/shapes.xml", {}, shapes_xml }
+    
+    shapes = Shape.find(:all)
+    assert_equal 2, shapes.length
+    assert_kind_of String, shapes[0].round
+    assert_equal 'big', shapes[0].round
+    assert_kind_of Array, shapes[1].square
+    assert shapes[1].square.include?('blue')
+    assert shapes[1].square.include?('gold')
+  end
+  
-  def test_save
-    rick = Person.new
-    assert_equal true, rick.save

lib/active_resource/base.rb

@@ -436 +436 @@
-        end
-        
-        def instantiate_collection(collection, prefix_options = {})
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-
-        def instantiate_record(record, prefix_options = {})
@@ -722 +744 @@
-        @attributes[key.to_s] =
-          case value
-            when Array
-
-
+
+
+
+
+
+
-            when Hash
-              resource = find_or_create_resource_for(key)
-              resource.new(value)