lutaml-model 0.8.94 → 0.8.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082f3275306fcd89a94f69f68b53d38b0c4c644de743dff261b6bc5166b12ec7'
-  data.tar.gz: 968f9d94e179035695be49649bd9c0b0c2e7e83192661ba3f6d95bbd5803a813
+  metadata.gz: c5933a3971f4f39e30541f504636641cd059e7a97751ba67a710203dbfdcc45a
+  data.tar.gz: c23b70227e80d99427b9d4125a09e33d9751112bc72a5e6abaca73d6a3897c60
 SHA512:
-  metadata.gz: 4f06573be9b9da0d12a561522a63d2d14b771a3ff7357fdb92c8d06213fa997efe19470f0d6b6ab39d9c672038715cc6efa1d607cb77dce5487e2134b56335a1
-  data.tar.gz: 275f2d2c74931c84024278dbc5bddcfe18cc267990c0516080605ce1fd2170c5513efcdd141ffbb72b9967cb91fd7ed74b338936a0e1a793aeba2411f8405d09
+  metadata.gz: 473b9970246c24172d6040a9c5062fad06d0fea413a5e04956ac98c0990324f2543668436c9259ad2a30b8647555d1e00102f6346afd3018814d68c2841ca8e5
+  data.tar.gz: f48b568bdc715a7649a262ca5757474f56ecc52d775121be99f18f067570d48d5401ff29cd7141ff768e9ea0a3e0aef5996d32129b8907c386cfd3c72e9f5370

data/.github/workflows/downstream-performance.yml

@@ -116,9 +116,16 @@ jobs:
             File.write("Gemfile", out.join)
           ' /tmp/main-checkout
           bundle install --jobs=4
-          bundle exec ruby ${{ github.workspace }}/bench/bench_${{ matrix.downstream }}.rb || \
-            { echo "::warning::baseline gate failed — re-running once under less contention (#834)"; \
-              sleep 30; bundle exec ruby ${{ github.workspace }}/bench/bench_${{ matrix.downstream }}.rb; }
+          # lutaml-model#834: min-of-N across attempts — contention
+          # inflates single-shot timings, so run three attempts and let
+          # the merge keep the least-interfered measurement per fixture.
+          for i in 1 2 3; do
+            bundle exec ruby ${{ github.workspace }}/bench/bench_${{ matrix.downstream }}.rb || \
+              echo "::warning::baseline attempt $i errored (#834) — continuing with remaining attempts"
+            cp "$BENCH_JSON" "$BENCH_JSON.attempt$i" 2>/dev/null || true
+          done
+          ruby ${{ github.workspace }}/bench/bench_merge_attempts.rb \
+            "$BENCH_JSON" "$BENCH_JSON.attempt1" "$BENCH_JSON.attempt2" "$BENCH_JSON.attempt3"
 
       - name: Run current benchmark (PR branch)
         env:
@@ -146,9 +153,13 @@ jobs:
             File.write("Gemfile", out.join)
           ' ${{ github.workspace }}
           bundle install --jobs=4
-          bundle exec ruby ${{ github.workspace }}/bench/bench_${{ matrix.downstream }}.rb || \
-            { echo "::warning::gate failed — re-running once under less contention (#834)"; \
-              sleep 30; bundle exec ruby ${{ github.workspace }}/bench/bench_${{ matrix.downstream }}.rb; }
+          for i in 1 2 3; do
+            bundle exec ruby ${{ github.workspace }}/bench/bench_${{ matrix.downstream }}.rb || \
+              echo "::warning::current attempt $i errored (#834) — continuing with remaining attempts"
+            cp "$BENCH_JSON" "$BENCH_JSON.attempt$i" 2>/dev/null || true
+          done
+          ruby ${{ github.workspace }}/bench/bench_merge_attempts.rb \
+            "$BENCH_JSON" "$BENCH_JSON.attempt1" "$BENCH_JSON.attempt2" "$BENCH_JSON.attempt3"
 
       - name: Compare baseline vs current
         run: |

data/bench/bench_merge_attempts.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# lutaml-model#834: merge N benchmark-attempt JSONs into one result set,
+# taking the per-fixture minimum of every metric. Contention inflates
+# timings; the minimum across attempts is the least-interfered
+# measurement, so gates evaluated on merged output misfire only when
+# EVERY attempt was slow.
+#
+# Usage: ruby bench_merge_attempts.rb <merged.json> <attempt1.json> [attempt2.json ...]
+#
+# Attempt files may be missing (crashed attempt): missing files are
+# skipped; if none exist, nothing is written and the caller's compare
+# step fails on the missing merged file.
+if ARGV.length < 3
+  warn "Usage: #{$PROGRAM_NAME} <merged.json> <attempt1.json> [attempt2.json ...]"
+  exit 1
+end
+
+merged_path = ARGV[0]
+attempt_paths = ARGV[1..]
+
+require "json"
+
+best = {}
+attempt_paths.each do |path|
+  next unless File.exist?(path)
+
+  results = JSON.parse(File.read(path))
+  results.each do |label, metrics|
+    cur = best[label]
+    if cur
+      cur["avg_time"] = [cur["avg_time"], metrics["avg_time"]].min
+      cur["min_time"] = [cur["min_time"], metrics["min_time"]].min
+      cur["max_time"] = [cur["max_time"], metrics["max_time"]].min
+      cur["allocations"] = [cur["allocations"], metrics["allocations"]].min
+      cur["ips"] = [cur["ips"], metrics["ips"]].max
+    else
+      best[label] = metrics.dup
+    end
+  end
+end
+
+if best.nil? || best.empty?
+  warn "No attempt JSONs found among: #{attempt_paths.join(', ')}"
+  exit 1
+end
+
+File.write(merged_path, JSON.pretty_generate(best))
+puts "Merged #{attempt_paths.size} attempt file(s) into #{merged_path} (#{best.size} fixtures)"

data/lib/lutaml/model/serialize/attribute_definition.rb

@@ -63,18 +63,14 @@ module Lutaml
             end
           RUBY
 
-          # lutaml-model#922: raw readers for the deserializer's
-          # unmatched-rule handling. A custom writer that assigns a
-          # *different* attribute mid-parse (relaton's ICS Isoics
-          # fallback; any derived-value pattern) is invisible to the
-          # value_set tracker -- public setters don't mark it -- so the
-          # tracked "still default" state lies. The deserializer needs
-          # the raw stored state to know whether an attribute was
-          # writer-populated: an attribute still holding its
-          # initialized marker (sentinel / lazy collection) is unset;
-          # anything else was written since init and must never be
-          # overwritten by an unmatched rule's default assignment.
-          raw_lines = attrs.map do |name, _attr|
+          # Raw readers compiled alongside the seeding so every
+          # attribute the register can see — including late-merged
+          # imports that bypass define_attribute_methods — carries
+          # one (#933). Idempotent with the declaration-time
+          # definition.
+          raw_lines = attrs.filter_map do |name, _attr|
+            next unless name.to_s.match?(PLAIN_NAME)
+
             <<~RUBY
               def __lutaml_raw_#{name}
                 @#{name}
@@ -126,6 +122,9 @@ module Lutaml
                           end
             remove_method(compiled) if defined_now
           end
+          # The names cache must go with the methods: the memoized
+          # lookup answers stale names for removed methods otherwise.
+          @state_defaults_names.clear
         end
 
         def define_attribute_methods(attr, register = nil)
@@ -147,7 +146,11 @@ module Lutaml
           # too -- XMI's extension loader declares attributes after
           # first parse.
           if name.to_s.match?(PLAIN_NAME)
-            model.class_eval(<<~RUBY, __FILE__, __LINE__ + 1) # rubocop:disable Style/DocumentDynamicEvalDefinition
+            # class_eval on self: a bare `model` receiver resolves
+            # through the host class's own namespace (omml's Base
+            # answers a Store model) and defined the reader on the
+            # wrong object (#933).
+            class_eval(<<~RUBY, __FILE__, __LINE__ + 1) # rubocop:disable Style/DocumentDynamicEvalDefinition
               def __lutaml_raw_#{name}
                 @#{name}
               end

data/lib/lutaml/model/serialize/initialization.rb

@@ -345,8 +345,20 @@ module Lutaml
         # @param register [Symbol, nil] The register context
         # @return [Object] The allocated instance
         def allocate_for_deserialization(register = nil)
-          instance = allocate
           register_id = extract_register_id(register)
+          # Deferred imports (symbol-form import_model_attributes) must
+          # resolve before state defaults compile: the compiled seeding
+          # and the raw readers cover the post-import attribute set, and
+          # the transform's records already carry the mapping's rules
+          # for imported names — CTR's <m:br> parsed before resolution
+          # had no reader (#933). The constructor path ensures the same
+          # way (initialize_attributes). Guarded: deep object graphs
+          # (XSD schema trees) allocate recursively, and the ensure
+          # chain's frames per level pushed that recursion past the
+          # stack limit — models without pending deferred imports skip
+          # it entirely.
+          ensure_imports!(register_id) if finalized? && deferred_imports_pending?
+          instance = allocate
           instance.finalize_deserialization(register_id)
           instance
         end

data/lib/lutaml/model/serialize/model_import.rb

@@ -60,6 +60,10 @@ module Lutaml
           model.attributes.each_value { |attr| define_attribute_methods(attr) }
           @attributes.merge!(Utils.deep_dup(model.attributes))
           @choice_attributes.concat(deep_duplicate_choice_attributes(model))
+          # Imported attributes grow the state-defaults surface (the
+          # raw readers live there) — a first use may already have
+          # compiled it for the pre-import attribute set (#933).
+          invalidate_state_defaults!
           # Ensure @models_imported is a hash; migrate from legacy nil/false state
           @models_imported ||= {}
           @models_imported[reg] = true
@@ -122,6 +126,9 @@ module Lutaml
             deep_duplicate_choice_attributes(model, register_id),
           )
           @merged_attributes_cache = nil
+          # See import_model_attributes: late-registered attributes
+          # must recompile the register's state defaults (#933).
+          invalidate_state_defaults!
         end
         private :register_only_import_model_attributes
 
@@ -153,6 +160,15 @@ module Lutaml
         # Ensure all model imports are resolved for a specific register
         #
         # @param register_id [Symbol, nil] The register context
+        # Whether deferred (symbol-form) imports are still pending —
+        # gates the allocation-time ensure chain (#933).
+        def deferred_imports_pending?
+          importable_models.any? { |_method, models| models.any? } ||
+            importable_choices.any? do |_choice, imports|
+              imports.any? { |_method, models| models.any? }
+            end || restrict_attributes.any?
+        end
+
         def ensure_model_imports!(register_id = nil)
           register_id ||= Lutaml::Model::Config.default_register
           @models_imported = {} if @models_imported.nil? || @models_imported == false
@@ -197,6 +213,7 @@ module Lutaml
           @choices_imported[register_id] = true
           all_resolved = true
 
+          resolved_any = false
           importable_choices.each do |choice, choice_imports|
             choice_imports.each do |method, models|
               models.uniq.each do |model|
@@ -216,11 +233,19 @@ module Lutaml
                 end
 
                 choice.public_send(method, model_class, register_id)
+                resolved_any = true
               end
             end
           end
 
           @choices_imported[register_id] = true if all_resolved
+          # Choice imports can add attributes without passing through
+          # define_attribute_methods — recompile state defaults so the
+          # seeding and raw readers cover them (#933). Only when an
+          # import actually resolved: ensure_choice_imports! runs on
+          # every ensure_imports! (allocation-time), and a recompile
+          # per allocation would churn.
+          invalidate_state_defaults! if resolved_any
         end
 
         # Ensure all restrict attributes are applied

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.8.94"
+    VERSION = "0.8.95"
   end
 end

data/lib/lutaml/xml/leptris/plan_compiler.rb

@@ -99,6 +99,14 @@ module Lutaml
             attr_rows = [] # [[rule, attr]] hydration metadata
             plan_attrs = [] # [{name:, kind:}] rows for the engine plan
             compiled = [] # [rule, attr, kind, spelling, delegate_target]
+            ns_attr_names = [] # exact-URI attribute rows (ambiguity guard)
+            # Local-name claim tallies for attribute rows: a name claimed
+            # by both an exact-URI row and a plain (any-namespace) row
+            # cannot be dispatched by the walk — the ns form :none
+            # matches any qualification, so the plain row captures the
+            # qualified spelling too (#758). The interpretive matcher
+            # owns shared names.
+            attr_local_claims = Hash.new { |h, k| h[k] = { ns: 0, plain: 0 } }
             cdata = false
             mixed_content = false
             needs_nodes = false
@@ -154,15 +162,10 @@ module Lutaml
               return opt_out!(:fragment_with_ns) if fragment_needed && model_ns
 
               if rule.attribute?
-                return opt_out!(:non_scalar) unless scalar_type?(attr, register)
-                # Attribute plan rows are local-name keyed; a type-level
-                # namespace makes the attribute (URI, local)-identified
-                # (lutaml-model#744) — the interpretive matcher owns it
-                # until plan rows carry namespace identity.
-                return opt_out!(:attr_type_ns) if attr.type_namespace_class(register)
-
-                attr_rows << [rule, attr]
-                plan_attrs << { name: rule.name.to_s }
+                opt = compile_attribute_row(rule, attr, register,
+                                            attr_rows, plan_attrs,
+                                            ns_attr_names, attr_local_claims)
+                return opt_out!(opt) if opt
               elsif rule.content_mapping?
                 return opt_out!(:multi_content) if content_rows(rows) >= 1
 
@@ -247,12 +250,23 @@ module Lutaml
             # namespaced models serialize through the interpretive
             # writer (lutaml-model#847: standalone to_xml under leptris
             # dropped the element xmlns entirely).
-            namespaced = !model_ns.nil? || rows.any? { |r| r[:ns] }
+            # Exact-URI attribute rows include their namespaced spelling
+            # here: the plan serializer writes attributes by local name
+            # (no prefixed wire spelling, no declaration emission —
+            # leptris#1551), so these models serialize interpretively.
+            namespaced = !model_ns.nil? || rows.any? { |r| r[:ns] } ||
+              plan_attrs.any? { |a| a[:ns] }
 
             flags = []
             flags << :cdata if cdata
             flags << :mixed_content if mixed_content
-            flags << :ns_lenient if model_ns
+            # Unconditional: a namespace-less model's children match by
+            # local name even when the document declares a default or
+            # prefixed namespace (#932) — the interpretive matcher's
+            # unprefixed-any-URI behavior; elements (unlike attributes)
+            # inherit the default xmlns, so the strict no-URI default
+            # dropped every child of a namespaced document.
+            flags << :ns_lenient
             tree = { name: mapping.root_element.to_s,
                      attributes: plan_attrs, children: rows }
             tree[:ns] = model_ns if model_ns
@@ -267,12 +281,69 @@ module Lutaml
               return nil
             end
 
+            return opt_out!(:attr_ns_claim_conflict) if attr_local_claims
+              .any? { |_, c| c[:ns].positive? && c[:plain].positive? }
+
+            # Exact-URI attribute rows rely on the sole-claimant lenient
+            # recovery for out-of-namespace spellings (the interpretive
+            # exact-first-then-any-qualification precedence), and that
+            # recovery reads the source node — models carrying such rows
+            # must receive one through the buckets chain.
+            needs_nodes = true unless ns_attr_names.empty?
+
+            # A model combining exact-URI attribute rows with nested
+            # child rows stays interpretive: the engine's walk drops
+            # nested-children attribute capture under such plans
+            # (FontTable's w:name under an mc:Ignorable ns row —
+            # observed 1.9.311.3; filed upstream). Leaf models keep the
+            # lift — that is the measured win (uniword's deep property
+            # models are leaves).
+            return opt_out!(:attr_type_ns_nested) if plan_attrs.any? { |a| a[:ns] } &&
+              rows.any?
+
             { descriptor: descriptor, tree: tree, rows: compiled,
               attr_rows: attr_rows, mapping: mapping,
               row_tags: row_tags, namespaced: namespaced,
               ordered: mapping.ordered? || mapping.mixed_content?,
               needs_nodes: needs_nodes,
-              collection_defaults: collection_defaults }
+              collection_defaults: collection_defaults,
+              ns_attr_names: ns_attr_names.empty? ? nil : ns_attr_names }
+          end
+
+          # Attribute rows: identity is (URI, local) (lutaml-model#744).
+          # A type-level namespace compiles into an exact-URI AttrPlan ns
+          # row (libleptris 1.9.289): the walk captures the (URI, local)
+          # match and the sole-claimant lenient recovery in PlanHydrator
+          # keeps the interpretive exact-first-then-any-qualification
+          # precedence for out-of-namespace spellings. Returns the
+          # opt-out clause when the row must stay interpretive, nil
+          # otherwise. Types declaring alias URI families stay
+          # interpretive (a plan row holds a single exact URI and
+          # non-sole-claimant alias families have no plan-side
+          # resolution order); :blank / :inherit arrive as Symbols —
+          # no URI to express in a row.
+          def compile_attribute_row(rule, attr, register, attr_rows,
+                                    plan_attrs, ns_attr_names,
+                                    attr_local_claims)
+            return :non_scalar unless scalar_type?(attr, register)
+
+            attr_rows << [rule, attr]
+            type_ns = attr.type_namespace_class(register)
+            claim = attr_local_claims[rule.name.to_s]
+            if type_ns.nil?
+              claim[:plain] += 1
+              plan_attrs << { name: rule.name.to_s }
+              return nil
+            end
+            return :attr_type_ns_symbol if type_ns.is_a?(Symbol)
+            return :attr_type_ns_aliases unless Leptris.attr_ns_rows_compatible? &&
+              type_ns.all_uris.size == 1
+
+            claim[:ns] += 1
+            plan_attrs << { name: rule.name.to_s,
+                            ns: { exact: type_ns.uri.to_s } }
+            ns_attr_names << rule.name.to_s
+            nil
           end
 
           def compilable_mapping?(mapping)

data/lib/lutaml/xml/leptris/plan_hydrator.rb

@@ -72,6 +72,7 @@ module Lutaml
           def attributes_kwargs(plan, value, node = nil)
             kwargs = {}
             sole_claimants = sole_claimant_names(plan)
+            ns_attr_names = plan[:ns_attr_names]
             plan_attr_rows(plan).each do |rule, attr, name|
               v = value.attribute(name)
               if v.nil? && node && sole_claimants.include?(name)
@@ -83,6 +84,14 @@ module Lutaml
               end
               next if v.nil?
 
+              # (URI, local) rows mirror the interpretive matcher's
+              # ambiguity refusal: a second spelling of the same local
+              # name binds nothing (lutaml-model#744).
+              if ns_attr_names&.include?(name) &&
+                  ambiguous_local_spellings?(node, name)
+                next
+              end
+
               v = v.split(rule.delimiter) if rule.delimiter
               if rule.as_list && rule.as_list[:import]
                 v = rule.as_list[:import].call(v)
@@ -92,6 +101,53 @@ module Lutaml
             kwargs
           end
 
+          # True when the node carries more than one spelling of the
+          # local name (any qualification). Only consulted for exact-URI
+          # attribute rows.
+          def ambiguous_local_spellings?(node, local_name)
+            return false unless node.respond_to?(:attributes)
+
+            seen = false
+            node.attributes.each_value do |attr|
+              name = attr.name.to_s
+              name = name.split(":").last if name.include?(":")
+              next unless name == local_name
+
+              return true if seen
+
+              seen = true
+            end
+            false
+          end
+
+          # A captured-but-empty child marshals as a nil string value.
+          # The interpretive pipeline classifies the raw "" through the
+          # rule's value map (:empty key) — the :empty directive (the
+          # plain-rule default) keeps it as "", :nil binds nil, and any
+          # other directive means uninitialized, i.e. no binding.
+          def mapped_empty_value(rule)
+            case rule.value_map(:from)[:empty]
+            when :nil then nil
+            when :empty then ""
+            else :skip
+            end
+          end
+
+          def mapped_capture_values(values, rule)
+            return values unless values.include?(nil)
+
+            mapped = mapped_empty_value(rule)
+            out = []
+            values.each do |item|
+              if item.nil?
+                out << mapped unless mapped == :skip
+              else
+                out << item
+              end
+            end
+            out
+          end
+
           # Wire-name strings are plan-frozen; materializing them per
           # hydration allocated two or three strings per attribute row
           # per instance.
@@ -128,6 +184,10 @@ module Lutaml
                   # Interpretive parity: several captures into a
                   # non-collection attribute arrive as the full array.
                   v = vals.map(&:string_value)
+                  if v.include?(nil)
+                    v = v.map { |item| item.nil? ? mapped_empty_value(rule) : item }
+                    v.reject! { |item| item == :skip }
+                  end
                 else
                   first = if tag
                             tagged[tag]&.first
@@ -135,16 +195,26 @@ module Lutaml
                             grouped.dig(rule.name.to_s, 0)
                           end
                   v = first&.string_value
+                  v = mapped_empty_value(rule) if v.nil? && first
                 end
-                unless v.nil?
+                unless v.nil? || v == :skip
                   v = rule.transform_value(attr, v, :from, :xml) if rule.transform.is_a?(Class)
                   assign(kwargs, delegates, delegate, rule, attr, v)
                 end
               when :raw, :custom_method, :polymorphic, :content_deferred
                 # interpreted post-instance (interpret_deferred)
               when :content
-                assign(kwargs, delegates, delegate, rule, attr,
-                       content_runs(value))
+                runs = content_runs(value)
+                if runs.empty? && !attr.collection?
+                  # An empty element's content binds through the rule's
+                  # value map for scalar content attributes: "" for the
+                  # plain :empty directive, nil for :nil, skipped for
+                  # anything else (uninitialized).
+                  bound = mapped_empty_value(rule)
+                  assign(kwargs, delegates, delegate, rule, attr, bound) unless bound == :skip
+                else
+                  assign(kwargs, delegates, delegate, rule, attr, runs)
+                end
               when :ordered_deferred
                 # With a source node the child hydrates natively: one
                 # walk against its own node + element_order from the
@@ -165,7 +235,10 @@ module Lutaml
                   end
                 end
               when :collection_cb
-                values = grouped[rule.name.to_s].to_a.map(&:string_value)
+                values = grouped[rule.name.to_s].to_a.map do |item|
+                  item&.string_value
+                end
+                values = mapped_capture_values(values, rule)
                 if rule.transform.is_a?(Class)
                   values = values.map { |v| rule.transform_value(attr, v, :from, :xml) }
                 end
@@ -178,6 +251,7 @@ module Lutaml
                          else
                            native_collection(value, rule.name.to_s)
                          end
+                values = mapped_capture_values(values, rule) unless values.nil?
                 unless values.nil?
                   assign(kwargs, delegates, delegate, rule, attr, values)
                 end
@@ -232,12 +306,19 @@ module Lutaml
               when :content_deferred
                 runs = content_runs(value)
                 if runs.empty?
-                  # The interpretive pipeline marks every applied rule's
-                  # attribute set (model_transform apply). Skipping the
-                  # mark leaves using_default? true, so the serializer's
-                  # render gate suppresses a mapped reader that derives
-                  # content from other attributes (#856).
+                  # The interpretive pipeline classifies the raw ""
+                  # through the rule's value map: the :empty directive
+                  # (the plain-rule default) binds "" — the attribute is
+                  # still marked set, which is what the #856 mark is
+                  # about; :nil binds nil; other directives leave the
+                  # binding unset.
                   instance.value_set_for(attr.name)
+                  case rule.value_map(:from)[:empty]
+                  when :nil
+                    instance.public_send(:"#{attr.name}=", nil)
+                  when :empty
+                    instance.public_send(:"#{attr.name}=", "")
+                  end
                   next
                 end
 

data/lib/lutaml/xml/leptris.rb

@@ -16,6 +16,11 @@ module Lutaml
       # existing opt-out protocol.
       MIN_LEPTRIS_VERSION = "1.9.273.0"
 
+      # AttrPlan rows carrying an ns form (exact-URI attribute matching,
+      # leptris#1486) shipped in libleptris 1.9.289.0. Older gems keep
+      # type-namespaced attributes on the interpretive path.
+      MIN_LEPTRIS_ATTR_NS_VERSION = "1.9.289.0"
+
       def self.plan_path_compatible?
         return false unless defined?(Gem)
 
@@ -23,6 +28,13 @@ module Lutaml
         spec && spec.version >= Gem::Version.new(MIN_LEPTRIS_VERSION)
       end
 
+      def self.attr_ns_rows_compatible?
+        return false unless defined?(Gem)
+
+        spec = Gem.loaded_specs["leptris"]
+        spec && spec.version >= Gem::Version.new(MIN_LEPTRIS_ATTR_NS_VERSION)
+      end
+
       autoload :PlanCompiler, "lutaml/xml/leptris/plan_compiler"
       autoload :PlanHydrator, "lutaml/xml/leptris/plan_hydrator"
       autoload :PlanOrder, "lutaml/xml/leptris/plan_order"

data/spec/lutaml/model/writer_assigned_attribute_spec.rb

@@ -43,9 +43,9 @@ end
 # unmatched-rule replay must never overwrite a value a writer assigned.
 RSpec.describe "attributes assigned inside another attribute's writer" do
   %i[Plain Defaulted].each do |klass_name|
-    klass = WriterAssigned.const_get(klass_name)
-
     describe "with #{klass_name.to_s.downcase} text attribute" do
+      let(:klass) { WriterAssigned.const_get(klass_name) }
+
       it "keeps the derived value through from_xml" do
         instance = klass.from_xml("<probe><code>67.060</code></probe>")
 

data/spec/lutaml/xml/plan_fast_path_spec.rb

@@ -64,10 +64,12 @@ RSpec.describe "XML plan fast path" do
     expect(parsed).to be_a(node)
   end
 
-  # lutaml-model#744: attribute plan rows are local-name keyed — a
-  # type-namespaced attribute (xmi:type vs type) must take the
-  # interpretive matcher, or the namespaced value is silently lost.
-  it "opts models with type-namespaced attributes out to the interpretive path" do
+  # lutaml-model#744/#758: a local name claimed by BOTH a
+  # type-namespaced attribute row and a plain row stays interpretive —
+  # the walk's ns form :none matches any qualification, so the plain
+  # row would capture the qualified spelling too. The interpretive
+  # matcher dispatches the spellings correctly.
+  it "opts shared-local-name attribute claims out to the interpretive path" do
     xmi_ns = Class.new(Lutaml::Xml::Namespace) do
       uri "http://www.omg.org/spec/XMI/20131001"
       prefix_default "xmi"

data/spec/lutaml/xml/plan_ns_less_document_spec.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "XML plan fast path: namespace-less models on namespaced documents" do
+  # lutaml-model#932: elements (unlike attributes) inherit the default
+  # xmlns, so the walk's strict no-URI default dropped every child of a
+  # namespaced document for models that declare no namespace. The
+  # ns_lenient flag restores the interpretive matcher's behavior:
+  # children match by local name under any document qualification.
+
+  let(:child_class) do
+    klass = Class.new(Lutaml::Model::Serializable) do
+      attribute :fileref, :string
+
+      xml do
+        element "imagedata"
+        map_attribute "fileref", to: :fileref
+      end
+    end
+    stub_const("NsLessDoc::Imagedata", klass)
+    klass
+  end
+
+  def define_parent
+    child_class
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :imagedata, NsLessDoc::Imagedata
+      attribute :content, :string, collection: true
+
+      xml do
+        element "imageobject"
+        map_element "imagedata", to: :imagedata
+        map_content to: :content
+      end
+    end
+    
+  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
+
+  it "binds nested children under a default namespace" do
+    parent = define_parent
+    doc = '<imageobject xmlns="http://docbook.org/ns/docbook">' \
+          '<imagedata fileref="x.png"/></imageobject>' 
+
+    expect(parent.from_xml(doc).imagedata.fileref).to eq("x.png")
+  end
+
+  it "binds nested children under a prefixed namespace" do
+    parent = define_parent
+    doc = '<db:imageobject xmlns:db="http://docbook.org/ns/docbook">' \
+          '<db:imagedata fileref="x.png"/></db:imageobject>' 
+
+    expect(parent.from_xml(doc).imagedata.fileref).to eq("x.png")
+  end
+
+  it "keeps binding on namespace-less documents" do
+    parent = define_parent
+    doc = %(<imageobject><imagedata fileref="x.png"/></imageobject>)
+
+    expect(parent.from_xml(doc).imagedata.fileref).to eq("x.png")
+  end
+
+  it "binds nested children of mixed-content models under a default namespace" do
+    parent = define_parent
+    parent.xml do
+      element "imageobject"
+      mixed_content
+      map_content to: :content
+      map_element "imagedata", to: :imagedata
+    end
+    doc = '<imageobject xmlns="http://docbook.org/ns/docbook">' \
+          'text<imagedata fileref="x.png"/>tail</imageobject>' 
+
+    parsed = parent.from_xml(doc)
+    expect(parsed.imagedata.fileref).to eq("x.png")
+    expect(parsed.content).to include("text")
+  end
+end

data/spec/lutaml/xml/plan_type_ns_attribute_spec.rb

@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "XML plan fast path: type-namespaced attribute rows" do
+  # Attribute identity is (URI, local) (lutaml-model#744). A map_attribute
+  # whose TYPE carries a namespace class used to opt the whole model out
+  # of the plan path; it now compiles into an exact-URI AttrPlan ns row
+  # (libleptris 1.9.289) with the sole-claimant lenient recovery keeping
+  # the interpretive exact-first-then-any-qualification precedence.
+
+  let(:wml_ns) do
+    Class.new(Lutaml::Xml::Namespace) do
+      uri "http://example.com/type-ns/wml"
+      prefix_default "w"
+    end
+  end
+
+  let(:val_type) do
+    stub_const("PlanTypeNsAttr::WmlNs", wml_ns)
+    type = Class.new(Lutaml::Model::Type::String) do
+      include Lutaml::Xml::Type::Configurable
+
+      xml do
+        namespace PlanTypeNsAttr::WmlNs
+      end
+    end
+    stub_const("PlanTypeNsAttr::ValType", type)
+    type
+  end
+
+  let(:klass) do
+    val_type
+    model = Class.new(Lutaml::Model::Serializable) do
+      attribute :val, PlanTypeNsAttr::ValType
+
+      xml do
+        element "keepNext"
+        namespace PlanTypeNsAttr::WmlNs
+        map_attribute "val", to: :val
+      end
+    end
+    stub_const("PlanTypeNsAttr::KeepNext", 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
+
+  it "compiles a model whose attribute type carries a namespace" do
+    plan = Lutaml::Xml::Leptris::PlanCompiler.compile(
+      klass, Lutaml::Model::Config.default_register
+    )
+
+    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")
+  end
+
+  it "binds the attribute from the type's namespace" do
+    doc = %(<w:keepNext xmlns:w="http://example.com/type-ns/wml" w:val="yes"/>)
+
+    expect(klass.from_xml(doc).val).to eq("yes")
+  end
+
+  # The interpretive matcher refuses an ambiguous local name outright:
+  # a foreign spelling alongside the canonical one binds nothing. The
+  # exact-URI row mirrors that refusal (lutaml-model#744).
+  it "refuses to bind when a foreign spelling accompanies the canonical one" do
+    doc = '<w:keepNext xmlns:w="http://example.com/type-ns/wml" ' \
+          'xmlns:f="http://example.com/foreign" val="foreign" w:val="canonical"/>'
+
+    expect(klass.from_xml(doc).val).to be_nil
+  end
+
+  # Interpretive parity: the plan path resolves exactly as the
+  # interpretive matcher (nokogiri) does on every spelling shape.
+  it "matches the interpretive path's resolution on all spelling shapes" do
+    canonical = %(<w:keepNext xmlns:w="http://example.com/type-ns/wml" w:val="yes"/>)
+    ambiguous = '<w:keepNext xmlns:w="http://example.com/type-ns/wml" ' \
+                'xmlns:f="http://example.com/foreign" val="foreign" w:val="canonical"/>'
+    foreign_only = '<w:keepNext xmlns:f="http://example.com/foreign" ' \
+                   'xmlns:w="http://example.com/type-ns/wml" val="foreign"/>'
+
+    [canonical, ambiguous, foreign_only].each do |doc|
+      interpretive = Lutaml::Model::Config.with_adapter(xml: :nokogiri) do
+        klass.from_xml(doc).val
+      end
+
+      expect(klass.from_xml(doc).val).to eq(interpretive)
+    end
+  end
+
+  # A type declaring alias URI families stays interpretive: the plan row
+  # holds one exact URI and non-sole-claimant alias families have no
+  # plan-side resolution order.
+  it "keeps alias-declaring types on the interpretive path" do
+    aliased_ns = Class.new(Lutaml::Xml::Namespace) do
+      uri "http://example.com/type-ns/canonical"
+      uri_aliases "http://example.com/type-ns/alias"
+    end
+    stub_const("PlanTypeNsAttr::AliasedNs", aliased_ns)
+    type = Class.new(Lutaml::Model::Type::String) do
+      include Lutaml::Xml::Type::Configurable
+
+      xml do
+        namespace PlanTypeNsAttr::AliasedNs
+      end
+    end
+    stub_const("PlanTypeNsAttr::AliasedValType", type)
+    model = Class.new(Lutaml::Model::Serializable) do
+      attribute :val, PlanTypeNsAttr::AliasedValType
+
+      xml do
+        element "keepNext"
+        map_attribute "val", to: :val
+      end
+    end
+    stub_const("PlanTypeNsAttr::AliasedKeepNext", model)
+
+    expect(Lutaml::Xml::Leptris::PlanCompiler.compile(
+             model, Lutaml::Model::Config.default_register
+           )).to be_nil
+  end
+
+  # Engines older than the AttrPlan ns form (libleptris 1.9.289) keep
+  # the opt-out — the existing version-gate protocol.
+  it "opts out when the engine predates attribute ns rows" do
+    allow(Lutaml::Xml::Leptris).to receive(:attr_ns_rows_compatible?)
+      .and_return(false)
+
+    expect(Lutaml::Xml::Leptris::PlanCompiler.compile(
+             klass, Lutaml::Model::Config.default_register
+           )).to be_nil
+  end
+end

data/spec/person_spec.rb

@@ -115,12 +115,13 @@ RSpec.describe Person do
     expect(model.to_yaml).to eq(attributes_yaml.to_yaml)
   end
 
-  # yeptris misparses time-only scalars ("07:00:00" anchors to a fixed
-  # date at midnight) — pending the engine fix, this example cannot
-  # pass under the in-suite-detected engine.
-  # rubocop:disable RSpec/PendingWithoutReason -- yeptris misparses time-only
-  # scalars (fixed-date midnight anchor); engine fix pending upstream.
-  xit "deserializes from YAML" do
+  # yeptris 0.6.29.x regressed the time-only scalar anchor: "07:00:00"
+  # comes back as a fixed 2025-07-19 00:00 instead of today-07:00
+  # (psych answers exactly; verified on the psych path). Re-pended
+  # until the yeptris typed-materialize ships the fix — evidence on
+  # moxml#336. 873a67bd un-pended these on the premise that the
+  # 0.6.28.x behavior held; it did not survive the 0.6.29 cut.
+  xit "deserializes from YAML" do # rubocop:disable RSpec/PendingWithoutReason -- yeptris time-only misparse; engine fix pending.
     yaml = attributes_yaml.to_yaml
     person = described_class.from_yaml(yaml)
     expect(person.first_name).to eq("John")
@@ -133,7 +134,7 @@ RSpec.describe Person do
   end
 
   # Same yeptris time-only scalar misparse as above.
-  xit "deserializes from YAML array" do
+  xit "deserializes from YAML array" do # rubocop:disable RSpec/PendingWithoutReason -- yeptris time-only misparse; engine fix pending.
     yaml = [attributes_yaml.dup, attributes_yaml.dup].to_yaml
 
     persons = described_class.from_yaml(yaml)
@@ -154,5 +155,4 @@ RSpec.describe Person do
     expect(persons[1].wakeup_time).to eq(Time.parse("07:00:00"))
     expect(persons[1].active).to be true
   end
-  # rubocop:enable RSpec/PendingWithoutReason
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.94
+  version: 0.8.95
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-05 00:00:00.000000000 Z
+date: 2026-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -184,6 +184,7 @@ files:
 - bench/bench_alloc_audit.rb
 - bench/bench_common.rb
 - bench/bench_compare.rb
+- bench/bench_merge_attempts.rb
 - bench/bench_mml.rb
 - bench/bench_niso.rb
 - bench/bench_sts.rb
@@ -1985,7 +1986,9 @@ 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_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/prefix_control_spec.rb
 - spec/lutaml/xml/register_spec.rb