Avoid to set tag name from representer. Use as option instead.

trailblazer · Jun 11, 2015 · befb79c · befb79c
1 parent fd67284
commit befb79c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/lib/representable/xml/binding.rb b/lib/representable/xml/binding.rb
@@ -37,7 +37,10 @@ def serialize_for(value, parent)
       end
 
       def serialize_node(node, value)
-        return value if typed?
+        if typed?
+          value.name = as if value.is_a?(::Nokogiri::XML::Element) && as != '_self'
+          return value
+        end
 
         node.content = value
         node
@@ -64,7 +67,7 @@ def xpath
       def find_nodes(doc)
         selector  = xpath
         selector  = "#{self[:wrap]}/#{xpath}" if self[:wrap]
-        nodes     = doc.xpath(selector)
+        doc.xpath(selector)
       end
 
       def node_for(parent, name)

diff --git a/test/parse_strategy_test.rb b/test/parse_strategy_test.rb
@@ -17,11 +17,12 @@ class ParseStrategySyncTest < BaseTest
 
       representer!(:module => mod, :name => :song_representer) do
         property :title
-        self.representation_wrap = :song if format == :xml
       end
 
       representer!(:inject => :song_representer, :module => mod) do
-        property :song, :parse_strategy => :sync, :extend => song_representer
+        options = { :parse_strategy => :sync, :extend => song_representer }
+        options[:as] = :song if format == :xml
+        property :song, options
       end
 
       let (:hit) { hit = OpenStruct.new(:song => song).extend(representer) }
@@ -46,19 +47,20 @@ class ParseStrategySyncTest < BaseTest
   for_formats(
     :hash => [Representable::Hash, {"songs"=>[{"title"=>"Resist Stance"}]}, {"songs"=>[{"title"=>"Suffer"}]}],
     #:json => [Representable::JSON, "{\"song\":{\"name\":\"Alive\"}}", "{\"song\":{\"name\":\"You've Taken Everything\"}}"],
-    :xml  => [Representable::XML, "<open_struct><song><title>Resist Stance</title></song></open_struct>", "<open_struct><songs><title>Suffer</title></songs></open_struct>"],
+    :xml  => [Representable::XML, "<open_struct><song><title>Resist Stance</title></song></open_struct>", "<open_struct><song><title>Suffer</title></song></open_struct>"],
     :yaml => [Representable::YAML, "---\nsongs:\n- title: Resist Stance\n", "---\nsongs:\n- title: Suffer\n"],
   ) do |format, mod, output, input|
 
     describe "[#{format}] collection with :parse_strategy: :sync" do # TODO: introduce :representable option?
       let (:format) { format }
       representer!(:module => mod, :name => :song_representer) do
         property :title
-        self.representation_wrap = :song if format == :xml
       end
 
       representer!(:inject => :song_representer, :module => mod) do
-        collection :songs, :parse_strategy => :sync, :extend => song_representer
+        options = { :parse_strategy => :sync, :extend => song_representer }
+        options[:as] = :song if format == :xml
+        collection :songs, options
       end
 
       let (:album) { OpenStruct.new(:songs => [song]).extend(representer) }
@@ -71,12 +73,10 @@ class ParseStrategySyncTest < BaseTest
         collection_id = album.songs.object_id
         song          = album.songs.first
         song_id       = song.object_id
-
         parse(album, input)
-
         album.songs.first.title.must_equal "Suffer"
         song.title.must_equal "Suffer"
-        #album.songs.object_id.must_equal collection_id # TODO: don't replace!
+        album.songs.object_id.must_equal collection_id # TODO: don't replace!
         song.object_id.must_equal song_id
       end
     end

diff --git a/test/xml_test.rb b/test/xml_test.rb
@@ -160,7 +160,7 @@ def name=(v)
         @album.extend(AlbumRepresenter)
 
         assert_xml_equal "<album>
-  <song><name>Mr. Charisma</name></song>
+  <best_song><name>Mr. Charisma</name></best_song>
   <song><name>I Hate My Brain</name></song>
   <song><name>Mr. Charisma</name></song>
 </album>", @album.to_xml
@@ -277,9 +277,9 @@ def to_node(*)
         album = Album.new(band).extend(AlbumRepresenter)
 
         assert_xml_equal %{<album>
-         <c_data_band>
+         <band>
            <name><![CDATA[Bad Religion]]></name>
-         </c_data_band>
+         </band>
        </album>}, album.to_xml
       end
     end
@@ -481,7 +481,7 @@ class XmlHashTest < MiniTest::Spec
 
   describe "with objects" do
     representer!(module: Representable::XML) do
-      hash :songs, class: OpenStruct do
+      hash :songs, class: OpenStruct, as: :open_struct do
         property :title
       end
     end