add example with empty node and attribute, fix overwriting of attributes

openHPI · Jul 17, 2023 · f986c7e · f986c7e
1 parent e63f9a1
commit f986c7e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/lib/dachsfisch/xml2_json_converter.rb b/lib/dachsfisch/xml2_json_converter.rb
@@ -20,9 +20,10 @@ def extract_node(node)
       hash = {}
       active_namespaces = add_namespaces_to_active_namespaces(node)
       hash['@xmlns'] = active_namespaces unless active_namespaces.empty?
+
+      handle_attributes(hash, node)
       node.children.each do |child|
         handle_content(hash, child)
-        handle_attributes(hash, node)
       end
       hash
     end

diff --git a/spec/support/examples.rb b/spec/support/examples.rb
@@ -274,6 +274,28 @@ def self.xml
     end
   end
 
+  class CustomExampleEmptyNodeWithAttribute < ExampleBase
+    def self.json
+      <<~JSON
+        {
+          "alice": {
+            "bob": {
+              "@foo": "bar"
+            }
+          }
+        }
+      JSON
+    end
+
+    def self.xml
+      <<-XML
+        <alice>
+          <bob foo="bar"/>
+        </alice>
+      XML
+    end
+  end
+
   class CustomExampleCdata < ExampleBase
     def self.json
       <<~JSON