canon 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d1f4de27225e068e0bc1a00b2b7b2d980847bf9027a21f042de148aae65926e
-  data.tar.gz: 4561eaa1efb9abcd541ec8da05f2e33df11859c35d6e5fe3f5fee9fa9d22af3d
+  metadata.gz: b000e9e89684d66d4f037a950a2121a88717dd6c72d975648742f32b5a83fb9f
+  data.tar.gz: c5e8b5ecfdcb8435559be3e6c940e8e8bec99202054b90fa857f9e3afd3097e2
 SHA512:
-  metadata.gz: ee29ec80689f0c53771017dca13d48ba4c3162db98f0e3605c3198148035cd564d818b8e4c08728608ef3abd055231d82850f79f933d2206ec4a36d488c6faa6
-  data.tar.gz: 37ae2bd7e928265b8c54e4025ae73d7e8761ce6e28ee2933e005129bd218d7003a5d547103bba140e11e829ef4d45aa7ef41768766b302f6608814f08fb74983
+  metadata.gz: '0804e7a2a07ff2687e363ee2bd0a1e2d00a5fe826e45ae5bd69fe26749bf2e2b1517a6fb2fcd3518e41d7d9bf6bf0b76fd8e704c288293724d27cbc3613978f4'
+  data.tar.gz: 6d9dca5aa3c29bbde5d067ca02e2a22c4d7bee098635e0fd8b48df16fbf08102fa713608f1965d198f3ace1c064743916b57d34d7a2cc2a6b845902e1553a045

data/lib/canon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canon
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/canon/xml/data_model.rb

@@ -154,11 +154,12 @@ module Canon
       end
 
       def self.build_node_from_nokogiri(nokogiri_node,
-preserve_whitespace: false)
+preserve_whitespace: false, inherited_namespaces: nil)
         case nokogiri_node
         when Nokogiri::XML::Element
           build_element_node(nokogiri_node,
-                             preserve_whitespace: preserve_whitespace)
+                             preserve_whitespace: preserve_whitespace,
+                             inherited_namespaces: inherited_namespaces)
         when Nokogiri::XML::Text, Nokogiri::XML::CDATA
           build_text_node(nokogiri_node,
                           preserve_whitespace: preserve_whitespace)
@@ -169,56 +170,44 @@ preserve_whitespace: false)
         end
       end
 
-      def self.build_element_node(nokogiri_element, preserve_whitespace: false)
+      def self.build_element_node(nokogiri_element, preserve_whitespace: false,
+inherited_namespaces: nil)
         element = Nodes::ElementNode.new(
           name: nokogiri_element.name,
           namespace_uri: nokogiri_element.namespace&.href,
           prefix: nokogiri_element.namespace&.prefix,
         )
 
-        build_namespace_nodes(nokogiri_element, element)
+        scope = nokogiri_namespace_scope(nokogiri_element, inherited_namespaces)
+        scope.each do |prefix, uri|
+          element.add_namespace(Nodes::NamespaceNode.new(
+                                  prefix: prefix,
+                                  uri: uri,
+                                ))
+        end
+
         build_attribute_nodes(nokogiri_element, element)
 
         nokogiri_element.children.each do |child|
           node = build_node_from_nokogiri(child,
-                                          preserve_whitespace: preserve_whitespace)
+                                          preserve_whitespace: preserve_whitespace,
+                                          inherited_namespaces: scope)
           element.add_child(node) if node
         end
 
         element
       end
 
-      def self.build_namespace_nodes(nokogiri_element, element)
-        namespaces = collect_in_scope_namespaces(nokogiri_element)
-
-        namespaces.each do |prefix, uri|
-          ns_node = Nodes::NamespaceNode.new(
-            prefix: prefix,
-            uri: uri,
-          )
-          element.add_namespace(ns_node)
-        end
-      end
-
-      def self.collect_in_scope_namespaces(nokogiri_element)
-        namespaces = {}
-
-        current = nokogiri_element
-        while current && !current.is_a?(Nokogiri::XML::Document)
-          if current.is_a?(Nokogiri::XML::Element)
-            current.namespace_definitions.each do |ns|
-              prefix = ns.prefix || ""
-              unless namespaces.key?(prefix)
-                namespaces[prefix] = ns.href
-              end
-            end
-          end
-          current = current.parent
+      # In-scope namespace bindings: the element's own declarations
+      # shadow inherited ones, xml is prebound. The scope is passed down
+      # the recursion — one definition fetch per element instead of an
+      # ancestor walk per element (O(n) total, not O(n * depth)).
+      def self.nokogiri_namespace_scope(nokogiri_element, inherited)
+        scope = inherited ? inherited.dup : { "xml" => "http://www.w3.org/XML/1998/namespace" }
+        nokogiri_element.namespace_definitions.each do |ns|
+          scope[ns.prefix || ""] = ns.href
         end
-
-        namespaces["xml"] ||= "http://www.w3.org/XML/1998/namespace"
-
-        namespaces
+        scope
       end
 
       def self.build_attribute_nodes(nokogiri_element, element)
@@ -261,7 +250,7 @@ preserve_whitespace: false)
       # --- Moxml path ---
 
       def self.from_moxml_xml(xml_string, preserve_whitespace:)
-        doc = Canon::XmlParsing.parse(xml_string)
+        doc = Canon::XmlParsing.moxml_context.parse(xml_string, readonly: true)
         check_moxml_relative_namespace_uris(doc)
         result = build_from_moxml(doc, preserve_whitespace: preserve_whitespace)
         # Canon owns this document's full lifecycle: the canon tree holds
@@ -390,11 +379,11 @@ preserve_whitespace: false)
                                 ))
         end
 
-        # Adopt completed children (they stack in reverse: unshift
-        # restores document order).
+        # Adopt completed children: they pop in reverse order; reversing
+        # once is O(n) (unshift per child would be O(n^2) on wide trees).
         children = []
-        children.unshift(frames.pop[1]) while frames.any? && frames.last[0] > record[:depth]
-        children.each { |child| element.add_child(child) }
+        children << frames.pop[1] while frames.any? && frames.last[0] > record[:depth]
+        children.reverse_each { |child| element.add_child(child) }
 
         own_namespaces[element] = record[:namespaces]
         element

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.