Merging pull request #57

savonrb · Nov 10, 2016 · 954d002 · 954d002
1 parent a459e53
commit 954d002
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/gyoku/array.rb b/lib/gyoku/array.rb
@@ -59,7 +59,7 @@ def self.iterate_with_xml(array, key, attributes, options, &block)
       unwrap =  unwrap?(options.fetch(:unwrap, false), key)
 
       if unwrap
-        xml.tag!(key) { iterate_array(xml, array, attributes, &block) }
+        xml.tag!(key, attributes) { iterate_array(xml, array, attributes, &block) }
       else
         iterate_array(xml, array, attributes, &block)
       end

diff --git a/spec/gyoku/array_spec.rb b/spec/gyoku/array_spec.rb
@@ -45,6 +45,17 @@
       expect(to_xml(array, "value", :escape_xml, :active => true)).to eq(result)
     end
 
+    it "adds attributes to tags when :unwrap is true" do
+      array = [{:item=>"abc"}]
+      key = "items"
+      escape_xml = :escape_xml
+      attributes = { "amount"=>"1" }
+      options = { :unwrap => true }
+      result = "<items amount=\"1\"><item>abc</item></items>"
+
+      expect(to_xml(array, key, escape_xml, attributes, options)).to eq result
+    end
+
     it "adds attributes to duplicate tags" do
       array = ["adam", "eve"]
       result = '<value id="1">adam</value><value id="2">eve</value>'