moxml 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd59e7a59b29416c792cd5d84cedceaede12d661e96c1da3b78af9711bcdb95
-  data.tar.gz: bb90166adcfa1e8c5440b6f991c842358df348e62a3a04e11a228ff7c96590c9
+  metadata.gz: 7aeebdab58434af19ecef2aef1d8be83f44aa4cafef5386cc01f90df9c0d74b0
+  data.tar.gz: 365ea23544a86eb5fbe13d6c87a903c844db321ba7884521ba76c4f169558bd2
 SHA512:
-  metadata.gz: 9e23367b7e18bc71b64527f1e8e7481279132366d169551b665e11d474c473e779bb6424158f64a6171f0e6122d12268cd573c2d12abaa20a80666f538224d1b
-  data.tar.gz: 3760403535f405b1153aeb02a7b9ff0c1896b961eed403a017ab32522202b7aa9fe1adb1d455c59ae903e5903ab6d2ddea57ec64cb4570e538420efc63d9014a
+  metadata.gz: 924f7a2e7e6a68d9e78f4f65244bd5f8cdaefa58c00dc7a3a926d2cb41d1d6ac39cc98c46cdd83f13dbdec450ad5b8abbe400c6b89a595aadf2e1c21f074ab01
+  data.tar.gz: f125a15ea901391a648a3545b5afa79d9e3794c4e5f4009c6cca623501ad53071f27fbc3046da7fe0a964a240c8d9ae7f75410283f59daa0b6a34ac561540c68

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-01-13 02:38:07 UTC using RuboCop version 1.70.0.
+# on 2025-02-07 04:56:30 UTC using RuboCop version 1.71.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -28,7 +28,7 @@ Lint/MissingSuper:
 Metrics/AbcSize:
   Max: 30
 
-# Offense count: 46
+# Offense count: 49
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
@@ -63,3 +63,11 @@ Naming/MethodParameterName:
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
+
+# Offense count: 20
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'spec/support/shared_examples/examples/readme_examples.rb'

data/README.adoc

@@ -32,7 +32,7 @@ Install the gem and at least one supported XML library:
 ----
 # In your Gemfile
 gem 'moxml'
-gem 'nokogiri'  # Or 'ox' or 'oga'
+gem 'nokogiri'  # Or 'oga', or 'ox' when it is integrated
 ----
 
 === Basic document creation
@@ -45,7 +45,7 @@ require 'moxml'
 doc = Moxml.new.create_document
 
 # Add XML declaration
-doc.add_declaration(version: "1.0", encoding: "UTF-8")
+doc.add_child(doc.create_declaration("1.0", "UTF-8"))
 
 # Create root element with namespace
 root = doc.create_element('book')
@@ -69,7 +69,7 @@ The builder pattern provides a clean DSL for creating XML documents:
 
 [source,ruby]
 ----
-doc = Moxml.new.build do
+doc = Moxml::Builder.new(Moxml.new).build do
   declaration version: "1.0", encoding: "UTF-8"
 
   element 'library', xmlns: 'http://example.org/library' do
@@ -98,11 +98,12 @@ end
 doc = Moxml.new.create_document
 
 # Add declaration
-doc.add_declaration(version: "1.0", encoding: "UTF-8")
+doc.add_child(doc.create_declaration("1.0", "UTF-8"))
 
 # Create root with namespace
 root = doc.create_element('library')
 root.add_namespace(nil, 'http://example.org/library')
+root.add_namespace("dc", "http://purl.org/dc/elements/1.1/")
 doc.add_child(root)
 
 # Add elements with attributes
@@ -131,23 +132,23 @@ doc = Moxml.new.create_document
 doc = Moxml.new.parse(xml_string)
 
 # Document properties and methods
-doc.encoding                # Get document encoding
-doc.encoding = "UTF-8"      # Set document encoding
+doc.encoding               # Get document encoding
+doc.encoding = "UTF-8"     # Set document encoding
 doc.version                # Get XML version
 doc.version = "1.1"        # Set XML version
 doc.standalone             # Get standalone declaration
 doc.standalone = "yes"     # Set standalone declaration
 
 # Document structure
-doc.root                   # Get root element
+doc.root                  # Get root element
 doc.children              # Get all top-level nodes
 doc.add_child(node)       # Add a child node
 doc.remove_child(node)    # Remove a child node
 
 # Node creation methods
-doc.create_element(name)   # Create new element
-doc.create_text(content)   # Create text node
-doc.create_cdata(content)  # Create CDATA section
+doc.create_element(name)    # Create new element
+doc.create_text(content)    # Create text node
+doc.create_cdata(content)   # Create CDATA section
 doc.create_comment(content) # Create comment
 doc.create_processing_instruction(target, content) # Create PI
 
@@ -171,8 +172,9 @@ element.name               # Get element name
 element.name = "new_name"  # Set element name
 element.text              # Get text content
 element.text = "content"   # Set text content
-element.inner_html        # Get inner XML content
-element.inner_html = xml   # Set inner XML content
+element.inner_text        # Get text content for current node only
+element.inner_xml         # Get inner XML content
+element.inner_xml = xml   # Set inner XML content
 
 # Attributes
 element[name]             # Get attribute value
@@ -443,6 +445,9 @@ rescue Moxml::ValidationError => e
 rescue Moxml::XPathError => e
   # Handles XPath expression errors
   puts "XPath error: #{e.message}"
+rescue Moxml::NamespaceError => e
+  # Handles namespace errors
+  puts "Namespace error: #{e.message}"
 rescue Moxml::Error => e
   # Handles other Moxml-specific errors
   puts "Error: #{e.message}"
@@ -451,7 +456,9 @@ end
 
 == Configuration
 
-Moxml can be configured globally or per instance:
+=== General
+
+Moxml can be configured globally or per instance.
 
 [source,ruby]
 ----
@@ -464,11 +471,31 @@ end
 
 # Instance configuration
 moxml = Moxml.new do |config|
-  config.adapter = :ox
+  config.adapter = :oga
   config.strict = false
 end
 ----
 
+=== Default adapter selection
+
+To use an adapter other than `:nokogiri` as the global default, set it before
+processing any input using the following option.
+
+[source,ruby]
+----
+Moxml::Config.default_adapter = <adapter-symbol>
+----
+
+Moxml supports the following adapters:
+
+`:nokogiri`:: (default) https://github.com/sparklemotion/nokogiri[Nokogiri], a
+wrapper around the https://github.com/GNOME/libxml2[libxml2] C library
+
+`:oga`:: https://github.com/yorickpeterse/oga[Oga], a pure Ruby XML parser
+
+`:ox`:: https://github.com/ohler55/ox[Ox], a fast XML parser (not yet supported)
+
+
 == Thread safety
 
 Moxml is thread-safe when used properly. Each instance maintains its own state
@@ -562,11 +589,11 @@ end
 
 == Contributing
 
-1. Fork the repository
-2. Create your feature branch (`git checkout -b feature/my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin feature/my-new-feature`)
-5. Create a new Pull Request
+. Fork the repository
+. Create your feature branch (`git checkout -b feature/my-new-feature`)
+. Commit your changes (`git commit -am 'Add some feature'`)
+. Push to the branch (`git push origin feature/my-new-feature`)
+. Create a new Pull Request
 
 == License
 

data/lib/moxml/adapter/nokogiri.rb

@@ -224,6 +224,11 @@ module Moxml
           node.content
         end
 
+        def inner_text(node)
+          text_children = node.children - node.element_children
+          text_children.map(&:content).join
+        end
+
         def set_text_content(node, content)
           node.native_content = content
         end

data/lib/moxml/adapter/oga.rb

@@ -237,6 +237,15 @@ module Moxml
           node.text
         end
 
+        def inner_text(node)
+          if node.respond_to?(:inner_text)
+            node.inner_text
+          else
+            # Oga::XML::Text node for example
+            node.text
+          end
+        end
+
         def set_text_content(node, content)
           if node.respond_to?(:inner_text)
             node.inner_text = content

data/lib/moxml/config.rb

@@ -6,8 +6,14 @@ module Moxml
     DEFAULT_ADAPTER = VALID_ADAPTERS.first
 
     class << self
+      attr_writer :default_adapter
+
       def default
-        @default ||= new(DEFAULT_ADAPTER, true, "UTF-8")
+        @default ||= new(default_adapter, true, "UTF-8")
+      end
+
+      def default_adapter
+        @default_adapter ||= DEFAULT_ADAPTER
       end
     end
 
@@ -38,7 +44,10 @@ module Moxml
       adapter
     end
 
-    alias default_adapter= adapter=
+    def default_adapter=(name)
+      self.adapter = name
+      self.class.default_adapter = name
+    end
 
     def adapter
       @adapter ||= Adapter.load(@adapter_name)

data/lib/moxml/element.rb

@@ -79,11 +79,15 @@ module Moxml
       adapter.set_text_content(@native, normalize_xml_value(content))
     end
 
-    def inner_html
-      adapter.inner_html(@native)
+    def inner_text
+      adapter.inner_text(@native)
     end
 
-    def inner_html=(html)
+    def inner_xml
+      adapter.inner_xml(@native)
+    end
+
+    def inner_xml=(html)
       doc = context.parse("<root>#{html}</root>")
       adapter.replace_children(@native, doc.root.children.map(&:native))
     end

data/lib/moxml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Moxml
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/moxml_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Moxml do
 
     it "uses configured options from the block" do
       Moxml.configure do |config|
-        config.adapter = :oga
+        config.default_adapter = :oga
         config.strict_parsing = false
         config.default_encoding = "US-ASCII"
       end

data/spec/support/shared_examples/element.rb

@@ -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")
@@ -106,5 +106,25 @@ RSpec.shared_examples "Moxml::Element" do
         expect(element.to_xml).to include("text<child></child>more")
       end
     end
+
+    describe "complex element structures" do
+      it "creates nested paragraphs without namespaces" do
+        outer_p = doc.create_element("p")
+        inner_p = doc.create_element("p")
+        inner_p.add_child("Some text inside paragraph")
+        outer_p.add_child(inner_p)
+
+        expect(outer_p.to_xml).to include("<p>Some text inside paragraph</p>")
+      end
+
+      it "does not return text of child elements in root text" do
+        outer_p = doc.create_element("p")
+        inner_p = doc.create_element("p")
+        inner_p.add_child("Some text inside paragraph")
+        outer_p.add_child(inner_p)
+        expect(outer_p.inner_text).to eq("")
+        expect(inner_p.text).to include("Some text inside paragraph")
+      end
+    end
   end
 end

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("///")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies: []
 description: 'Moxml is a unified XML manipulation library that provides a common API.