lutaml-model 0.8.95 → 0.8.96

data/spec/lutaml/xml/plan_namespaced_serialize_spec.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "XML plan serializer: namespaced models" do
+  # lutaml-model#847: the plan path used to refuse namespaced models
+  # outright (the xmlns dropped). The DOM emission now spells prefixed
+  # names, hoists every distinct (prefix, uri) declaration exactly once
+  # onto the output root, and prefixes type-namespaced attribute rows —
+  # byte-equal with the interpretive writer.
+
+  let(:wml_ns) do
+    Class.new(Lutaml::Xml::Namespace) do
+      uri "http://example.com/gate2/wml"
+      prefix_default "w"
+    end
+  end
+
+  let(:val_type) do
+    stub_const("Gate2Ns::WmlNs", wml_ns)
+    type = Class.new(Lutaml::Model::Type::String) do
+      include Lutaml::Xml::Type::Configurable
+
+      xml do
+        namespace Gate2Ns::WmlNs
+      end
+    end
+    stub_const("Gate2Ns::ValType", type)
+    type
+  end
+
+  let(:doc_class) do
+    val_type
+    body_class
+    model = Class.new(Lutaml::Model::Serializable) do
+      attribute :name, Gate2Ns::ValType
+      attribute :body, Gate2Ns::Body
+
+      xml do
+        element "document"
+        namespace Gate2Ns::WmlNs
+        map_attribute "name", to: :name
+        map_element "body", to: :body
+      end
+    end
+    stub_const("Gate2Ns::Document", model)
+    model
+  end
+
+  let(:body_class) do
+    val_type
+    model = Class.new(Lutaml::Model::Serializable) do
+      attribute :text, Gate2Ns::ValType, collection: true
+
+      xml do
+        element "body"
+        namespace Gate2Ns::WmlNs
+        map_element "t", to: :text
+      end
+    end
+    stub_const("Gate2Ns::Body", model)
+    model
+  end
+
+  let(:default_ns_model) do
+    ns = Class.new(Lutaml::Xml::Namespace) do
+      uri "http://example.com/gate2/default"
+    end
+    stub_const("Gate2Ns::DefaultNs", ns)
+    model = Class.new(Lutaml::Model::Serializable) do
+      attribute :name, :string
+
+      xml do
+        element "root"
+        namespace Gate2Ns::DefaultNs
+        map_attribute "name", to: :name
+      end
+    end
+    stub_const("Gate2Ns::DefaultDoc", model)
+    model
+  end
+
+  around do |example|
+    old = Lutaml::Model::Config.instance.xml_plan_fast_path
+    Lutaml::Model::Config.instance.xml_plan_fast_path = true
+    Lutaml::Model::Config.with_adapter(xml: :leptris) { example.run }
+  ensure
+    Lutaml::Model::Config.instance.xml_plan_fast_path = old
+  end
+
+  def plan_to_xml(klass, instance)
+    plan = Lutaml::Xml::Leptris::PlanCompiler.compile(
+      klass, Lutaml::Model::Config.default_register
+    )
+    Lutaml::Xml::Leptris::PlanSerializer.call(
+      instance, plan, Lutaml::Model::Config.default_register
+    )
+  end
+
+  it "emits prefixed names with the declaration exactly once" do
+    instance = doc_class.new(
+      name: "d1",
+      body: body_class.new(text: ["hello"]),
+    )
+
+    out = plan_to_xml(doc_class, instance)
+    expect(out).to include(%(xmlns:w="http://example.com/gate2/wml"))
+    expect(out.scan("xmlns:w=").count).to eq(1)
+    expect(out).to include("<w:document")
+    expect(out).to include("w:name=\"d1\"")
+    expect(out).to include("<w:body>")
+    expect(out).to include("<w:t>hello</w:t>")
+  end
+
+  # The plan path spells the type-namespaced attribute w:name=; the
+  # interpretive writer emits name= unprefixed (a long-standing
+  # interpretive serialize gap — the unprefixed form does not rebind
+  # to the (URI, local) rule on reparse). Element tree, declarations,
+  # and values are compared; the attribute spelling divergence is
+  # pinned by the round-trip example below.
+  it "matches the interpretive element tree and declarations" do
+    instance = doc_class.new(
+      name: "d1",
+      body: body_class.new(text: ["hello", "world"]),
+    )
+
+    interpretive = Lutaml::Model::Config.with_adapter(xml: :nokogiri) do
+      instance.to_xml
+    end
+
+    plan_out = plan_to_xml(doc_class, instance)
+    expect(plan_out.sub(" w:name=\"d1\"", "")).to eq(
+      interpretive.sub(" name=\"d1\"", "").strip,
+    )
+  end
+
+  it "round-trips through the plan parse path" do
+    instance = doc_class.new(
+      name: "d1",
+      body: body_class.new(text: ["hello"]),
+    )
+    xml = plan_to_xml(doc_class, instance)
+
+    reparsed = doc_class.from_xml(xml)
+    expect(reparsed.name).to eq("d1")
+    expect(reparsed.body.text).to eq(["hello"])
+  end
+
+  it "spells default-namespace models unprefixed with xmlns on the root" do
+    instance = default_ns_model.new(name: "plain")
+
+    out = plan_to_xml(default_ns_model, instance)
+    expect(out).to include(%(xmlns="http://example.com/gate2/default"))
+    expect(out).to include("<root")
+    expect(out).not_to include("xmlns:xmlns")
+  end
+end

data/spec/lutaml/xml/plan_type_ns_attribute_spec.rb

@@ -59,7 +59,8 @@ RSpec.describe "XML plan fast path: type-namespaced attribute rows" do
 
     expect(plan).not_to be_nil
     ns_row = plan[:tree][:attributes].find { |a| a[:name] == "val" }
-    expect(ns_row[:ns]).to eq(exact: "http://example.com/type-ns/wml")
+    expect(ns_row[:ns]).to include(exact: "http://example.com/type-ns/wml")
+    expect(ns_row[:ns][:prefix]).to eq("w")
   end
 
   it "binds the attribute from the type's namespace" do

data/spec/lutaml/xml/plan_wildcard_any_spec.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "XML plan fast path: map_any_element catch-all" do
+  # leptris#1552: the wildcard child row rides a two-pass walk where
+  # named rows take precedence; the hydrator bridges the unclaimed
+  # remainder in document order and casts it through the attribute —
+  # the interpretive pass's contract for map_any_element.
+
+  let(:host_class) do
+    klass = Class.new(Lutaml::Model::Serializable) do
+      attribute :title, :string
+      attribute :others, :string, collection: true
+
+      xml do
+        element "host"
+        map_element "title", to: :title
+        map_any_element to: :others
+      end
+    end
+    stub_const("Gate4Any::Host", klass)
+    klass
+  end
+
+  let(:typed_class) do
+    item = Class.new(Lutaml::Model::Serializable) do
+      attribute :content, :string
+
+      xml do
+        element "item"
+        map_content to: :content
+      end
+    end
+    stub_const("Gate4Any::Item", item)
+    model = Class.new(Lutaml::Model::Serializable) do
+      attribute :label, :string
+      attribute :items, Gate4Any::Item, collection: true
+
+      xml do
+        element "bag"
+        map_element "label", to: :label
+        map_any_element to: :items
+      end
+    end
+    stub_const("Gate4Any::Bag", model)
+    model
+  end
+
+  around do |example|
+    old = Lutaml::Model::Config.instance.xml_plan_fast_path
+    Lutaml::Model::Config.instance.xml_plan_fast_path = true
+    Lutaml::Model::Config.with_adapter(xml: :leptris) { example.run }
+  ensure
+    Lutaml::Model::Config.instance.xml_plan_fast_path = old
+  end
+
+  # Members flow through the attribute's cast exactly as the
+  # interpretive pass does: String attributes stringify the wrapper
+  # (both paths identically), Serializable attributes build instances.
+  def member_shapes(elements)
+    elements.map { |e| e.class.name.split("::").last }
+  end
+
+  it "captures unclaimed children in document order" do
+    doc = "<host><title>t</title><extra1>a</extra1>" \
+          "<extra2>b</extra2></host>"
+
+    parsed = host_class.from_xml(doc)
+    expect(parsed.title).to eq("t")
+    expect(parsed.others.size).to eq(2)
+    expect(member_shapes(parsed.others)).to eq(%w[String String])
+  end
+
+  it "captures typed members as model instances" do
+    doc = "<bag><label>L</label><item>one</item><item>two</item></bag>"
+
+    parsed = typed_class.from_xml(doc)
+    expect(parsed.label).to eq("L")
+    expect(parsed.items.map(&:content)).to eq(%w[one two])
+  end
+
+  it "matches the interpretive path's capture" do
+    doc = "<host><title>t</title><extra1>a</extra1><extra2>b</extra2></host>"
+
+    interpretive = Lutaml::Model::Config.with_adapter(xml: :nokogiri) do
+      host_class.from_xml(doc)
+    end
+
+    parsed = host_class.from_xml(doc)
+    expect(parsed.others.size).to eq(interpretive.others.size)
+    expect(member_shapes(parsed.others)).to eq(
+      member_shapes(interpretive.others).map { |n| n.sub("Nokogiri", "Leptris") },
+    )
+  end
+
+  it "compiles under engines without wildcard rows to nil" do
+    allow(Lutaml::Xml::Leptris).to receive(:wildcard_rows_compatible?)
+      .and_return(false)
+
+    expect(Lutaml::Xml::Leptris::PlanCompiler.compile(
+             host_class, Lutaml::Model::Config.default_register
+           )).to be_nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.95
+  version: 0.8.96
 platform: ruby
 authors:
 - Ribose Inc.
@@ -207,6 +207,7 @@ files:
 - docs/_guides/creating-xsd.adoc
 - docs/_guides/custom-methods.adoc
 - docs/_guides/document-validation.adoc
+- docs/_guides/grammar-backed-formats.adoc
 - docs/_guides/index.adoc
 - docs/_guides/jsonld-serialization.adoc
 - docs/_guides/keyvalue-serialization.adoc
@@ -1811,6 +1812,7 @@ files:
 - spec/lutaml/model/serializable_instantiate_spec.rb
 - spec/lutaml/model/serializable_spec.rb
 - spec/lutaml/model/serializable_validation_spec.rb
+- spec/lutaml/model/serialize/attribute_definition_block_form_spec.rb
 - spec/lutaml/model/serialize/builder_spec.rb
 - spec/lutaml/model/serialize_perf_guard_spec.rb
 - spec/lutaml/model/services/transformer_spec.rb
@@ -1986,10 +1988,12 @@ files:
 - spec/lutaml/xml/pipeline_integration_spec.rb
 - spec/lutaml/xml/plain_model_accessors_spec.rb
 - spec/lutaml/xml/plan_fast_path_spec.rb
+- spec/lutaml/xml/plan_namespaced_serialize_spec.rb
 - spec/lutaml/xml/plan_ns_less_document_spec.rb
 - spec/lutaml/xml/plan_partition_spec.rb
 - spec/lutaml/xml/plan_type_ns_attribute_spec.rb
 - spec/lutaml/xml/plan_walk_spec.rb
+- spec/lutaml/xml/plan_wildcard_any_spec.rb
 - spec/lutaml/xml/prefix_control_spec.rb
 - spec/lutaml/xml/register_spec.rb
 - spec/lutaml/xml/reusable_mapping_spec.rb