moxml 0.5.57 → 0.5.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4db82d82671fd5cc6189294198abf6d019cd9a719dd25eff901227ebd6c411e
-  data.tar.gz: 34611277972cb9687a3b1350ee4a9d5d3036c432fb2ed89409492a2bae812821
+  metadata.gz: 03fd3940f1334b3f417e4847f35e87497581404372209de4426819a8acc6d363
+  data.tar.gz: 805f6966495456ff6e36c4f1be3df9fcbbf1c89cfcf2ddc6a4153c37e1bcec71
 SHA512:
-  metadata.gz: 22ee802575e1c85d3f2a03981ed0fce5ed24e23576d005bbf08861e06051026b23276977a8cdedc3340709ea617fcd8a01cade368f74083d4a05728b6dd5f9f0
-  data.tar.gz: 43b6109e181270728559005b64e7e8b728a38403b2230f2c868b125def432ceddc5e9e1e468ad6afebcb2a073c9d5e9f69da48acae2499218dbe7c12a81a61aa
+  metadata.gz: 872ba59e6f8b72779d2ea43c8af201052a69be9d75ad1add3fa2618bc58e81cee0503ce352d06c8b46c64cc6340859006b36afeadef4302f29c81e2760285baa
+  data.tar.gz: 01eed98fc6ac76efb35d2456c9af57487bbdddf13092a09b0667d11e6e2d48a1905865046aab6a59ca8a89523fc4337a705c1b1cf95d98342d56cb4494c0d91e

data/lib/moxml/adapter/leptris.rb

@@ -246,6 +246,31 @@ module Moxml
             NATIVE_MUTATIONS_COHERENT &&
             Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.174.4")
 
+          # leptris-ruby#246 klass-propagating reads: the read
+          # family (children/element_children/next_sibling/parent)
+          # mints the mapped subclass per kind, so children arrive
+          # already carrying the contract — wrap_native's is_a?
+          # guard short-circuits and the per-visit from() mint
+          # (the second allocation of the pair) drops out. Kind
+          # order is the C layer's node-type ints: element, text,
+          # comment, cdata, pi.
+          NATIVE_KLASS_CHILDREN =
+            NATIVE_IDENTITY &&
+            Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.193.2")
+
+          if NATIVE_KLASS_CHILDREN
+            kind_classes = [
+              Identity::ELEMENT,
+              Identity::TEXT,
+              Identity::COMMENT,
+              Identity::CDATA,
+              Identity::PROCESSING_INSTRUCTION,
+            ]
+            kind_classes.each do |klass|
+              klass.install_child_klasses(kind_classes)
+            end
+          end
+
           def wrap_native(node, type, _context)
             return nil unless NATIVE_IDENTITY &&
               node.is_a?(::Leptris::XML::NativeNode)

data/lib/moxml/node.rb

@@ -593,10 +593,16 @@ module Moxml
 
       # Extend-in-place (issue #230): adapters whose natives can
       # carry the contract modules directly (leptris TypedData) mint
-      # the native itself as the wrapper — @native is self.
+      # the native itself as the wrapper — @native is self. The
+      # minted wrapper primes with ITSELF (not the input native):
+      # adapter calls then receive the contract-bearing receiver,
+      # which klass-propagating reads (#246) dispatch on — and the
+      # input native keeps its registration so later wraps of the
+      # same base object hit the cache instead of re-minting.
       if (extended = adapter.wrap_native(node, type, context))
-        extended.prime_contract(node, context, adapter, type)
+        extended.prime_contract(extended, context, adapter, type)
         context.register_wrapper(node, extended)
+        context.register_wrapper(extended, extended) unless extended.equal?(node)
         return extended
       end
 

data/lib/moxml/version.rb

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

data/spec/moxml/adapter/leptris_spec.rb

@@ -798,4 +798,32 @@ RSpec.describe Moxml::Adapter::Leptris do
       expect(pi[2]).to be_a(Integer)
     end
   end
+
+  describe "klass-propagating children" do
+    let(:ctx) { Moxml.new(:leptris) }
+
+    it "mints contract-bearing children in C" do
+      skip "requires klass-propagating reads (leptris 1.9.193.2+)" unless described_class.singleton_class.const_get(:NATIVE_KLASS_CHILDREN)
+
+      doc = ctx.parse(%(<r><e a="1"/>t</r>))
+      kids = doc.root.children
+      expect(kids.first).to be_a(Moxml::Element)
+      expect(kids.last).to be_a(Moxml::Text)
+      expect(kids.first["a"]).to eq("1")
+      expect(kids.last.text).to eq("t")
+      # The C mint IS the wrapper — @native is self, no re-mint.
+      expect(kids.first.native).to equal(kids.first)
+    end
+
+    it "keeps identity across access paths" do
+      skip "requires klass-propagating reads (leptris 1.9.193.2+)" unless described_class.singleton_class.const_get(:NATIVE_KLASS_CHILDREN)
+
+      doc = ctx.parse(%(<r><a/>t</r>))
+      first = doc.root.children.first
+      expect(doc.root.element_children.first).to equal(first)
+      expect(first.parent.children.first).to equal(first)
+      expect(first.next_sibling.text).to eq("t")
+      expect(first.next_sibling.parent).to eq(doc.root)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.57
+  version: 0.5.58
 platform: ruby
 authors:
 - Ribose Inc.