moxml 0.5.72 → 0.5.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe72fe97dab1ded102fe66f946b293e82ace5e8003408a0183bef72150cda92
-  data.tar.gz: 8ce6a685287f317d41c7996f5957e24edb13f2d2a0bb7a8184d02a47506136fc
+  metadata.gz: 9502f77654d0b09a3a8ab3b926702ee07e07009076fbeb4fd7013eb5b2b39499
+  data.tar.gz: 21d7b7dc2742200d83ac2d89c1610857cb0bf90590ef260052ad287bcb427170
 SHA512:
-  metadata.gz: e6b9a1e718b4d39e2169c2f414e5b8aedd030142ca3af8836bee80e64b5e1f9605d53f828f2135d9776b78c7b2f6662ae5054b47c171d8b2883a1e17a74140b5
-  data.tar.gz: 055def54b030a3d0e065b3f6c1ddde92af5f0e0c83a0e02882ebb80f63d5633baf6c69280fbffef8dddac76db95a9ff91c0019bde796a13a28998d87fccf9242
+  metadata.gz: ae16970a10ade16adfb8f186a6269db7c6e5f94374737eb82bee0e5fb3609719171fcb731db2f52b86948848c938cca984255f55dfaf4cfc854e384602c8e32a
+  data.tar.gz: 3f2f44d095a8d0fc6ceb0e506e930a16ef2afaa82f817114fe3dafd609a917e8eac7dd4f2b247caa74a7da9b0642b035432cb2cdfd3f6359ac2d0b56b8e19a59

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 gem "benchmark"
 gem "benchmark-ips"
 gem "get_process_mem"
-gem "leptris", "~> 1.9.216"
+gem "leptris", "~> 1.9.222"
 gem "libxml-ruby", ">= 5.0"
 gem "nokogiri", "~> 1.18"
 gem "openssl", "~> 3.0"

data/lib/moxml/adapter/leptris.rb

@@ -525,6 +525,14 @@ module Moxml
       # remove_doctype complete the set-only creation entries.
       # Attached DOCTYPEs materialize as native nodes, document-PI
       # removal works, and declaration state mirrors through.
+      # The typed executor face (leptris-ruby: typed plan scalars —
+      # [slot, tag] spec entries cast in C, no Ruby String for
+      # numeric/boolean slots). Capability-probed, not
+      # version-gated.
+      NATIVE_PLAN_TYPED =
+        !defined?(::Leptris::XML::Native) ||
+        ::Leptris::XML::Native.respond_to?(:plan_structs_typed?)
+
       NATIVE_DOC_PARTS =
         Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.204.0") &&
         ::Leptris::XML::Document.method_defined?(:remove_doctype) &&

data/lib/moxml/struct_plan.rb

@@ -31,6 +31,13 @@ module Moxml
     # member slots; +text+ and +children+ name the member slots
     # receiving the first text child and the matched children array.
     # Returns self so registrations chain.
+    #
+    # Typed scalars (binding with the typed executor — probe
+    # Moxml::Adapter::Leptris::NATIVE_PLAN_TYPED): slot values may
+    # be [slot, type] pairs — type one of :integer, :float,
+    # :boolean (attrs and text). The executor casts in C with no
+    # Ruby String materialized; unparseable input degrades to the
+    # raw String (lenient). :boolean accepts t/1/y/Y as true.
     def element(name, klass, attrs: {}, text: nil, children: nil)
       @elements[name] = Element.new(klass, attrs, text, children)
       self
@@ -41,18 +48,39 @@ module Moxml
     # resolve to member INDICES once — the C executor's Integer
     # key path then writes by index, skipping the per-write member
     # name scan.
+    TYPE_TAGS = { integer: 1, float: 2, boolean: 3 }.freeze
+
     def compile
+      typed = Moxml::Adapter::Leptris::NATIVE_PLAN_TYPED
       @elements.each_with_object({}) do |(name, el), spec|
         members = el.klass.members
         spec[name] = [
           el.klass,
-          el.attrs.each_with_object({}) { |(a, slot), h| h[a] = members.index(slot) || slot },
-          members.index(el.text) || el.text,
+          el.attrs.each_with_object({}) do |(a, slot), h|
+            h[a] = compile_slot(slot, members, typed)
+          end,
+          compile_slot(el.text, members, typed),
           members.index(el.children) || el.children,
         ]
       end
     end
 
+    # Resolve a slot to the executor's wire form: the member index
+    # (or the raw symbol for unknown slots), wrapped as
+    # [slot, tag] when a type is declared and the binding's
+    # executor is typed. Without the face, types degrade to
+    # strings.
+    def compile_slot(slot, members, typed)
+      if slot.is_a?(Array)
+        inner, type = slot
+        tag = TYPE_TAGS[type] || 0
+        resolved = members.index(inner) || inner
+        return typed && tag != 0 ? [resolved, tag] : resolved
+      end
+
+      members.index(slot) || slot
+    end
+
     def parse(xml, context)
       materialize(context.parse(xml))
     end

data/lib/moxml/version.rb

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

data/moxml.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |spec|
   spec.description = <<~DESCRIPTION
     Moxml is a unified XML manipulation library that provides a common API
     for XML node navigation, manipulation, building and XPath querying
-    interface covering multiple parser implementations including Nokogiri, Oga, REXML, Ox, LibXML.
+    interface covering multiple parser implementations including Leptris,
+    Nokogiri, Oga, REXML, Ox, HeadedOx and LibXML.
   DESCRIPTION
 
   spec.homepage = "https://github.com/lutaml/moxml"

data/spec/moxml/struct_plan_typed_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# Typed plan scalars (leptris plan ABI, #1269a consumer face):
+# [slot, type] declarations cast in C — Integer/Float/TrueClass/
+# FalseClass members with no Ruby String materialized; unparseable
+# input degrades to the raw String. Skipped unless the binding's
+# executor carries the typed face.
+RSpec.describe "Moxml::StructPlan typed scalars" do
+  let(:ctx) { Moxml.new(:leptris) }
+  let(:xml) do
+    %(<r><item price="19.99" qty="3" ok="yes">42</item>) +
+      %(<item price="bad" qty="x" ok="0">7</item></r>)
+  end
+  let(:plan) do
+    Moxml::StructPlan.new do
+      element "item", TypedItem,
+              attrs: { "price" => %i[price float], "qty" => %i[qty integer],
+                       "ok" => %i[ok boolean] },
+              text: %i[label integer]
+    end
+  end
+
+  before do
+    skip "leptris adapter unavailable" unless ctx.config.adapter.name.end_with?("Leptris")
+    Moxml::Adapter::Leptris # load
+    skip "binding lacks the typed executor" unless Moxml::Adapter::Leptris::NATIVE_PLAN_TYPED
+  end
+
+  it "casts typed slots and degrades unparseable input to String" do
+    items = plan.parse(xml, ctx)
+    expect(items[0].price).to eq(19.99)
+    expect(items[0].qty).to eq(3)
+    expect(items[0].ok).to be(true)
+    expect(items[0].label).to eq(42)
+
+    expect(items[1].price).to eq("bad")
+    expect(items[1].qty).to eq("x")
+    expect(items[1].ok).to be(false)
+    expect(items[1].label).to eq(7)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.72
+  version: 0.5.74
 platform: ruby
 authors:
 - Ribose Inc.
@@ -13,7 +13,8 @@ dependencies: []
 description: |
   Moxml is a unified XML manipulation library that provides a common API
   for XML node navigation, manipulation, building and XPath querying
-  interface covering multiple parser implementations including Nokogiri, Oga, REXML, Ox, LibXML.
+  interface covering multiple parser implementations including Leptris,
+  Nokogiri, Oga, REXML, Ox, HeadedOx and LibXML.
 email:
 - open.source@ribose.com
 executables: []
@@ -514,6 +515,7 @@ files:
 - spec/moxml/signature/model_spec.rb
 - spec/moxml/signature/round_trip_spec.rb
 - spec/moxml/struct_plan_spec.rb
+- spec/moxml/struct_plan_typed_spec.rb
 - spec/moxml/text_spec.rb
 - spec/moxml/version_spec.rb
 - spec/moxml/xml_emitter_spec.rb