moxml 0.1.2 → 0.1.4

data/spec/support/shared_examples/element.rb

@@ -55,7 +55,7 @@ RSpec.shared_examples "Moxml::Element" do
       end
 
       it "sets namespace" do
-        ns = element.add_namespace("x", "http://example.org").namespace
+        ns = element.add_namespace("x", "http://example.org").namespaces.first
         element.namespace = ns
         expect(element.namespace).to eq(ns)
       end
@@ -79,8 +79,8 @@ RSpec.shared_examples "Moxml::Element" do
         expect(element.text).to eq("firstsecond")
       end
 
-      it "sets inner HTML" do
-        element.inner_html = "<child>text</child>"
+      it "sets inner XML" do
+        element.inner_xml = "<child>text</child>"
         expect(element.children.size).to eq(1)
         expect(element.children.first.name).to eq("child")
         expect(element.children.first.text).to eq("text")

data/spec/support/shared_examples/examples/readme_examples.rb

@@ -1,20 +1,25 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples "README Examples" do
-  describe "Quick Start example" do
+  describe "Basic document creation" do
     it "builds document as shown in README" do
-      context = Moxml.new
-      doc = context.create_document
+      doc = Moxml.new.create_document
+
+      # Add XML declaration
+      doc.add_child(doc.create_declaration("1.0", "UTF-8"))
 
+      # Create root element with namespace
       root = doc.create_element("book")
+      root.add_namespace("dc", "http://purl.org/dc/elements/1.1/")
       doc.add_child(root)
 
-      root.add_namespace("dc", "http://purl.org/dc/elements/1.1/")
+      # Add content
       title = doc.create_element("dc:title")
-      title.add_child(doc.create_text("XML Processing with Ruby"))
+      title.text = "XML Processing with Ruby"
       root.add_child(title)
 
       expect(doc.to_xml).to include(
+        '<?xml version="1.0" encoding="UTF-8"?>',
         '<book xmlns:dc="http://purl.org/dc/elements/1.1/">',
         "<dc:title>XML Processing with Ruby</dc:title>",
         "</book>"
@@ -22,7 +27,42 @@ RSpec.shared_examples "README Examples" do
     end
   end
 
-  describe "Complex document example" do
+  describe "Using the builder pattern" do
+    it "builds a correct document" do
+      doc = Moxml::Builder.new(Moxml.new).build do
+        declaration version: "1.0", encoding: "UTF-8"
+
+        element "library", xmlns: "http://example.org/library" do
+          element "book" do
+            element "title" do
+              text "Ruby Programming"
+            end
+
+            element "author" do
+              text "Jane Smith"
+            end
+
+            comment "Publication details"
+            element "published", year: "2024"
+
+            cdata "<custom>metadata</custom>"
+          end
+        end
+      end
+
+      expect(doc.to_xml).to include(
+        '<?xml version="1.0" encoding="UTF-8"?>',
+        '<library xmlns="http://example.org/library">',
+        "<title>Ruby Programming</title>",
+        "<!--Publication details-->",
+        '<published year="2024"></published>',
+        "<![CDATA[<custom>metadata</custom>]]>",
+        "</book>"
+      )
+    end
+  end
+
+  describe "Direct document manipulation" do
     it "builds document with all features" do
       doc = Moxml.new.create_document
 
@@ -38,10 +78,12 @@ RSpec.shared_examples "README Examples" do
       # Add books
       %w[Ruby XML].each do |title|
         book = doc.create_element("book")
+        book["id"] = "b1-#{title}"
 
-        # Add metadata
+        # Add mixed content
+        book.add_child(doc.create_comment("Book details"))
         dc_title = doc.create_element("dc:title")
-        dc_title.add_child(doc.create_text(title))
+        dc_title.text = title
         book.add_child(dc_title)
 
         # Add description
@@ -52,13 +94,16 @@ RSpec.shared_examples "README Examples" do
         root.add_child(book)
       end
 
-      xml = doc.to_xml
-      expect(xml).to include('<?xml version="1.0" encoding="UTF-8"?>')
-      expect(xml).to include('<library xmlns="http://example.org/library" xmlns:dc="http://purl.org/dc/elements/1.1/">')
-      expect(xml).to include("<dc:title>Ruby</dc:title>")
-      expect(xml).to include("<![CDATA[About Ruby...]]>")
-      expect(xml).to include("<dc:title>XML</dc:title>")
-      expect(xml).to include("<![CDATA[About XML...]]>")
+      expect(doc.to_xml).to include(
+        '<?xml version="1.0" encoding="UTF-8"?>',
+        '<library xmlns="http://example.org/library" xmlns:dc="http://purl.org/dc/elements/1.1/">',
+        '<book id="b1-Ruby">',
+        "<!--Book details-->",
+        "<dc:title>Ruby</dc:title>",
+        "<![CDATA[About Ruby...]]>",
+        "<dc:title>XML</dc:title>",
+        "<![CDATA[About XML...]]>"
+      )
     end
   end
 
@@ -70,6 +115,18 @@ RSpec.shared_examples "README Examples" do
         context.parse("<invalid>")
       end.to raise_error(Moxml::ParseError)
 
+      expect do
+        doc = context.parse("<root/>")
+        root = doc.root
+        root.add_namespace("n", "wrong.url")
+      end.to raise_error(Moxml::NamespaceError)
+
+      expect do
+        doc = context.parse("<root/>")
+        element = doc.create_element("wrong,name")
+        doc.add_child(element)
+      end.to raise_error(Moxml::ValidationError)
+
       doc = context.parse("<root/>")
       expect do
         doc.xpath("///")

data/spec/support/shared_examples/integration.rb

@@ -111,7 +111,7 @@ RSpec.shared_examples "Moxml Integration" do
       # Move nodes
       b_node = doc.at_xpath("//b")
       a_node = doc.at_xpath("//a")
-      b_node.add_previous_sibling(a_node)
+      a_node.add_previous_sibling(b_node)
 
       # Add nodes
       c_node = doc.create_element("c")
@@ -125,7 +125,7 @@ RSpec.shared_examples "Moxml Integration" do
       b_node.add_child(doc.create_comment(" comment "))
       b_node.add_child(doc.create_cdata("<tag>"))
 
-      expect(doc.root.children.map(&:name)).to eq(%w[a b c])
+      expect(doc.root.children.map(&:name)).to eq(%w[b c a])
       expect(doc.to_xml).to include(
         '<root id="main">',
         "<b>2<!-- comment --><![CDATA[<tag>]]></b>"

data/spec/support/shared_examples/xml_adapter.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# This test works directly with native nodes which looks quite strange
+# A better way is to run it through Moxml wrappers
 RSpec.shared_examples "xml adapter" do
   let(:xml) do
     <<~XML
@@ -80,7 +82,7 @@ RSpec.shared_examples "xml adapter" do
       expect(children.length).to eq(3)
     end
 
-    it "gets siblings", skip: "Oga includes text nodes into siblings" do
+    it "gets siblings" do
       children = described_class.children(root)
       first = children[0]
       second = children[1]
@@ -97,13 +99,16 @@ RSpec.shared_examples "xml adapter" do
 
     it "adds text child" do
       described_class.add_child(root, "text")
-      expect(described_class.children(root).last.text).to eq("text")
+      # a workaround for Rexml until we convert tests to work with Moxml wrappers
+      last_child = described_class.children(root).last
+      last_text = last_child.respond_to?(:text) ? last_child.text : last_child.to_s
+      expect(last_text).to eq("text")
     end
   end
 
   describe "attributes" do
-    let(:doc) { described_class.parse(xml) }
-    let(:element) { described_class.children(described_class.root(doc.native)).first }
+    let(:doc) { described_class.parse(xml).native }
+    let(:element) { described_class.children(described_class.root(doc)).first }
 
     it "gets attributes" do
       attrs = described_class.attributes(element)
@@ -123,7 +128,9 @@ RSpec.shared_examples "xml adapter" do
 
     it "handles special characters in attributes" do
       described_class.set_attribute(element, "special", '< > & " \'')
-      value = described_class.get_attribute(element, "special")&.to_xml
+      # a workaround for Rexml until we convert tests to work with Moxml wrappers
+      attr = described_class.get_attribute(element, "special")
+      value = attr.respond_to?(:to_xml) ? attr&.to_xml : attr.to_s
       expect(value).to match(/&lt; &gt; &amp; (&quot;|") ('|&apos;)/)
     end
   end
@@ -156,7 +163,10 @@ RSpec.shared_examples "xml adapter" do
       expect(result).to include("</root>")
     end
 
-    it "respects indentation settings", skip: "Indent cannot be negative, and zero indent doesn't remove newlines" do
+    it "respects indentation settings" do
+      pending("Oga does not support indentation settings") if described_class.name.include?("Oga")
+      pending("Postponed for Rexml till better times") if described_class.name.include?("Rexml")
+
       unindented = described_class.serialize(doc, indent: 0)
       indented = described_class.serialize(doc, indent: 2)
 
@@ -176,7 +186,7 @@ RSpec.shared_examples "xml adapter" do
   end
 
   describe "xpath" do
-    let(:doc) { described_class.parse(xml) }
+    let(:doc) { described_class.parse(xml).native }
 
     it "finds nodes by xpath" do
       nodes = described_class.xpath(doc, "//xmlns:child")
@@ -188,4 +198,156 @@ RSpec.shared_examples "xml adapter" do
       expect(described_class.get_attribute_value(node, "id")).to eq("1")
     end
   end
+
+  describe "namespace handling" do
+    context "case 1" do
+      let(:xml) do
+        <<~XML
+          <?xml version="1.0" encoding="UTF-8"?>
+          <svg xmlns="http://www.w3.org/2000/svg"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               width="100" height="100">
+            <defs>
+              <circle id="myCircle" cx="50" cy="50" r="40"/>
+            </defs>
+            <use xlink:href="#myCircle" fill="red"/>
+            <text x="50" y="50" text-anchor="middle">SVG</text>
+          </svg>
+        XML
+      end
+
+      it "preserves and correctly handles multiple namespaces" do
+        pending("Rexml does not respect ZPath namespaces") if described_class.name.include?("Rexml")
+        # Parse original XML
+        doc = described_class.parse(xml).native
+
+        # Test namespace preservation in serialization
+        result = described_class.serialize(doc)
+        expect(result).to include('xmlns="http://www.w3.org/2000/svg"')
+        expect(result).to include('xmlns:xlink="http://www.w3.org/1999/xlink"')
+
+        # Test xpath with namespaces
+        namespaces = {
+          "svg" => "http://www.w3.org/2000/svg",
+          "xlink" => "http://www.w3.org/1999/xlink"
+        }
+
+        # Find use element and verify xlink:href attribute
+        use_elem = described_class.at_xpath(doc, "//svg:use", namespaces)
+        expect(use_elem).not_to be_nil
+        expect(described_class.get_attribute_value(use_elem, "xlink:href")).to eq("#myCircle")
+
+        # Verify circle element exists in defs
+        circle = described_class.at_xpath(doc, "//svg:defs/svg:circle", namespaces)
+        expect(circle).not_to be_nil
+        expect(described_class.get_attribute_value(circle, "id")).to eq("myCircle")
+
+        # Test default SVG namespace
+        text = described_class.at_xpath(doc, "//svg:text", namespaces)
+        expect(described_class.text_content(text)).to eq("SVG")
+      end
+    end
+
+    context "case 2" do
+      let(:xml) do
+        <<~XML
+          <?xml version="1.0" encoding="UTF-8"?>
+          <rss version="2.0"#{" "}
+            xmlns:atom="http://www.w3.org/2005/Atom"
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:content="http://purl.org/rss/1.0/modules/content/">
+            <channel>
+              <title>Example RSS Feed</title>
+              <atom:link href="http://example.com/feed" rel="self"/>
+              <item>
+                <title>Example Post</title>
+                <dc:creator>John Doe</dc:creator>
+                <content:encoded><![CDATA[<p>Post content</p>]]></content:encoded>
+              </item>
+            </channel>
+          </rss>
+        XML
+      end
+
+      it "preserves and correctly handles multiple namespaces" do
+        # Parse original XML
+        doc = described_class.parse(xml).native
+
+        # Test namespace preservation in serialization
+        result = described_class.serialize(doc)
+        expect(result).to include('xmlns:atom="http://www.w3.org/2005/Atom"')
+        expect(result).to include('xmlns:dc="http://purl.org/dc/elements/1.1/"')
+        expect(result).to include('xmlns:content="http://purl.org/rss/1.0/modules/content/"')
+
+        # Test xpath with namespaces
+        namespaces = {
+          "atom" => "http://www.w3.org/2005/Atom",
+          "dc" => "http://purl.org/dc/elements/1.1/",
+          "content" => "http://purl.org/rss/1.0/modules/content/"
+        }
+
+        # Find creator using namespaced xpath
+        creator = described_class.at_xpath(doc, "//dc:creator", namespaces)
+        expect(described_class.text_content(creator)).to eq("John Doe")
+
+        # Verify atom:link exists
+        link = described_class.at_xpath(doc, "//atom:link", namespaces)
+        expect(link).not_to be_nil
+        expect(described_class.get_attribute_value(link, "href")).to eq("http://example.com/feed")
+
+        # Verify CDATA in content:encoded
+        content = described_class.at_xpath(doc, "//content:encoded", namespaces)
+        expect(described_class.text_content(content)).to eq("<p>Post content</p>")
+      end
+    end
+
+    context "case 3" do
+      let(:xml) do
+        <<~XML
+          <?xml version="1.0" encoding="UTF-8"?>
+          <soap:Envelope#{" "}
+            xmlns:soap="http://www.w3.org/2003/05/soap-envelope"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:ns="urn:example:namespace">
+            <soap:Header>
+              <ns:SessionId>12345</ns:SessionId>
+            </soap:Header>
+            <soap:Body>
+              <ns:GetUserRequest>
+                <ns:UserId xsi:type="xsi:string">user123</ns:UserId>
+              </ns:GetUserRequest>
+            </soap:Body>
+          </soap:Envelope>
+        XML
+      end
+
+      it "preserves and correctly handles multiple namespaces" do
+        # Parse original XML
+        doc = described_class.parse(xml).native
+
+        # Test namespace preservation in serialization
+        result = described_class.serialize(doc)
+        expect(result).to include('xmlns:soap="http://www.w3.org/2003/05/soap-envelope"')
+        expect(result).to include('xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"')
+        expect(result).to include('xmlns:ns="urn:example:namespace"')
+
+        # Test xpath with namespaces
+        namespaces = {
+          "soap" => "http://www.w3.org/2003/05/soap-envelope",
+          "ns" => "urn:example:namespace"
+        }
+
+        # Find user ID using namespaced xpath
+        user_id = described_class.at_xpath(doc, "//ns:UserId", namespaces)
+        expect(described_class.text_content(user_id)).to eq("user123")
+
+        # Verify soap:Body exists
+        body = described_class.at_xpath(doc, "//soap:Body", namespaces)
+        expect(body).not_to be_nil
+
+        # Verify attribute with namespace
+        expect(described_class.get_attribute_value(user_id, "xsi:type")).to eq("xsi:string")
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-07 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies: []
 description: 'Moxml is a unified XML manipulation library that provides a common API.
 
@@ -27,6 +27,7 @@ files:
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - Gemfile
+- LICENSE.md
 - README.adoc
 - Rakefile
 - bin/console
@@ -36,9 +37,11 @@ files:
 - lib/moxml/adapter/base.rb
 - lib/moxml/adapter/customized_oga/xml_declaration.rb
 - lib/moxml/adapter/customized_oga/xml_generator.rb
+- lib/moxml/adapter/customized_rexml/formatter.rb
 - lib/moxml/adapter/nokogiri.rb
 - lib/moxml/adapter/oga.rb
 - lib/moxml/adapter/ox.rb
+- lib/moxml/adapter/rexml.rb
 - lib/moxml/attribute.rb
 - lib/moxml/builder.rb
 - lib/moxml/cdata.rb
@@ -64,6 +67,7 @@ files:
 - spec/moxml/adapter/nokogiri_spec.rb
 - spec/moxml/adapter/oga_spec.rb
 - spec/moxml/adapter/ox_spec.rb
+- spec/moxml/adapter/rexml_spec.rb
 - spec/moxml/all_with_adapters_spec.rb
 - spec/moxml/config_spec.rb
 - spec/moxml/error_spec.rb
@@ -116,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Unified XML manipulation library