lutaml-model 0.8.32 → 0.8.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a0c1ee735ac6b12da331e1f43dc6617d05cfe18534dc5255aaba0c789ee601e
-  data.tar.gz: bde4936c85167bcec7a4618cd8e91c9c4cf65d2feb97b0d94c78bf368f085248
+  metadata.gz: 559deafaf5121c17a2703c362f355feb440380ba2f80fbb0ff9afa5440995841
+  data.tar.gz: 48ea3bfb26265e940cc54d88e49ce60b54887b7a52372e7e174284625185f88a
 SHA512:
-  metadata.gz: 773ec772915ec1fd0645d68fa2e62c50bea3af147b19c67c22e5bd16cf1f6dec2a00bc1ff1945e612a7a6f5d22ce404d3e9687fead480d54390a847908e6d804
-  data.tar.gz: 318c31871e7bbb83bd1bea6547f3dbeda4e1768da9d44f0e85c7434bd8db15ade859bdf9a909771126b33a85e345bc1e803a93eacdec2e557a51d39bf0e6f8cb
+  metadata.gz: a28e6ef895329e27e3796266c197b700a391df1aa0b8c8cdf4ed89c3c0e4016d876c92053481a2b6f118817327213445e88e7f9ea9c4f3e7c2b5d3b8465052b1
+  data.tar.gz: e87f3702b6e783da4be97faeae5a7a0c572cd05995d4a7f15d73d9784d8ead92bddcb696c12c584b372ff603fb6a94dbfd1ef21eb63c33bfd4da69569ecd9349

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.8.32"
+    VERSION = "0.8.33"
   end
 end

data/lib/lutaml/xml/model_transform.rb

@@ -469,7 +469,31 @@ _effective_register)
         end
       end
 
-      def value_for_xml_attribute(doc, rule, rule_names)
+      # Whether no OTHER attribute rule in the mapping claims the same
+      # local name. A sole claimant is namespace-flexible on the local-
+      # name fallback: real-world documents qualify such attributes in
+      # the element's namespace, a foreign extension namespace, or not
+      # at all (OOXML w:val on w15: elements — lutaml-model#790). When
+      # a sibling claims the name, matching stays strict so each rule
+      # keeps its own namespace (#744, #758).
+      def attribute_rule_sole_local_claimant?(instance, rule,
+                                              effective_register)
+        klass = instance.class
+        return true unless klass.include?(Lutaml::Model::Serialize)
+
+        mapping = klass.mappings_for(:xml, effective_register)
+        return true unless mapping
+
+        expected = Array(rule.name).map(&:to_s)
+        mapping.mappings.none? do |sib|
+          next false unless sib.attribute? && !sib.equal?(rule)
+
+          Array(sib.name).map(&:to_s) == expected
+        end
+      end
+
+      def value_for_xml_attribute(doc, rule, rule_names,
+                                  flexible_local: false)
         # For attributes, rule_names may contain namespaced names, but find_attribute_value
         # expects prefix:name or just name, so we need to convert namespaced names to prefix format.
         #
@@ -496,7 +520,8 @@ _effective_register)
         # This handles the case where the namespace prefix is not declared in the document
         # (e.g., v:ext without xmlns:v="...").
         if value.nil? && rule_names.any? { |rn| rn.include?(":") }
-          value = find_attribute_by_local_name(doc, rule_names)
+          value = find_attribute_by_local_name(doc, rule_names,
+                                               flexible_local: flexible_local)
         end
 
         value = value&.split(rule.delimiter) if rule.delimiter
@@ -559,7 +584,8 @@ _effective_register)
       # @param doc [XmlElement] the parsed XML document root
       # @param rule_names [Array<String>] the rule names to match
       # @return [String, nil] the attribute value or nil
-      def find_attribute_by_local_name(doc, rule_names)
+      def find_attribute_by_local_name(doc, rule_names,
+                                       flexible_local: false)
         rule_names.each do |rn|
           next unless rn.include?(":")
 
@@ -579,7 +605,12 @@ _effective_register)
             # namespaced sibling attribute (lutaml-model#758). An
             # XmlAttribute with a resolved namespace has namespaced_name
             # "URI:local", so this comparison is allocation-free.
-            if attr.namespace.nil?
+            if flexible_local
+              # Sole claimant: any qualification of the local name binds
+              # (element namespace, foreign extension namespace, none).
+              attr.unprefixed_name == local_name ||
+                ((colon = attr.name.rindex(":")) ? attr.name[(colon + 1)..] : attr.name) == local_name
+            elsif attr.namespace.nil?
               next false if attr.namespace_prefix.nil? &&
                 !attr.name.include?(":")
 
@@ -630,7 +661,14 @@ _effective_register)
         # return the same children again.
         rule_names = rule_names.concat(extra_rule_names).uniq if extra_rule_names
 
-        return value_for_xml_attribute(doc, rule, rule_names) if rule.attribute?
+        if rule.attribute?
+          return value_for_xml_attribute(
+            doc, rule, rule_names,
+            flexible_local: attribute_rule_sole_local_claimant?(
+              instance, rule, effective_register
+            )
+          )
+        end
 
         # Performance: Pre-compute type-related values used in the hot loop
         attr_type_is_serializable = attr_type && attr_type <= ::Lutaml::Model::Serialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.32
+  version: 0.8.33
 platform: ruby
 authors:
 - Ribose Inc.