lutaml-model 0.8.19 → 0.9.1

data/spec/lutaml/xml/attribute_namespace_disjointness_spec.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# Two map_attribute rules that share a local name but are distinguished by
+# their type classes' bound namespaces must parse disjointly, mirroring
+# serialization (lutaml-model#744).
+#
+# The coexisting-spelling cases under nokogiri/rexml additionally require the
+# moxml adapter fixes (lutaml/moxml#94, lutaml/moxml#95); oga and ox already
+# preserve same-local-name attributes across namespaces.
+module AttributeNamespaceDisjointnessSpec
+  class XmiNs < Lutaml::Xml::Namespace
+    uri "http://www.example.com/xmi"
+    prefix_default "xmi"
+  end
+
+  class XmiNsType < Lutaml::Model::Type::String
+    xml do
+      namespace XmiNs
+    end
+  end
+
+  class Probe < Lutaml::Model::Serializable
+    attribute :xmi_type, XmiNsType
+    attribute :plain_type, Lutaml::Model::Type::String
+
+    xml do
+      element "probe"
+      map_attribute "type", to: :xmi_type
+      map_attribute "type", to: :plain_type
+    end
+  end
+
+  def self.parse(xml, adapter)
+    Lutaml::Model::Config.with_adapter(xml: adapter) { Probe.from_xml(xml) }
+  end
+end
+
+RSpec.describe "Attribute namespace-disjoint parsing" do
+  let(:namespaced_xmi) do
+    %(<probe xmlns:xmi="http://www.example.com/xmi" xmi:type="uml:Parameter"/>)
+  end
+
+  let(:namespaced_foo) do
+    %(<probe xmlns:foo="http://www.example.com/xmi" foo:type="uml:Parameter"/>)
+  end
+
+  let(:plain) { %(<probe type="EAnone_void"/>) }
+
+  let(:both_spellings) do
+    %(<probe xmlns:xmi="http://www.example.com/xmi" xmi:type="uml:Parameter" type="EAnone_void"/>)
+  end
+
+  let(:both_spellings_plain_first) do
+    %(<probe type="EAnone_void" xmlns:xmi="http://www.example.com/xmi" xmi:type="uml:Parameter"/>)
+  end
+
+  %i[oga ox nokogiri].each do |adapter|
+    context "with the #{adapter} adapter" do
+      it "routes a namespaced rule to the attribute bound to its URI" do
+        probe = AttributeNamespaceDisjointnessSpec.parse(namespaced_xmi,
+                                                         adapter)
+
+        expect(probe.xmi_type).to eq("uml:Parameter")
+        expect(probe.plain_type).to be_nil
+      end
+
+      it "accepts any prefix bound to the namespace URI" do
+        probe = AttributeNamespaceDisjointnessSpec.parse(namespaced_foo,
+                                                         adapter)
+
+        expect(probe.xmi_type).to eq("uml:Parameter")
+        expect(probe.plain_type).to be_nil
+      end
+
+      it "does not let a namespace-less attribute satisfy the namespaced rule" do
+        probe = AttributeNamespaceDisjointnessSpec.parse(plain, adapter)
+
+        expect(probe.xmi_type).to be_nil
+        expect(probe.plain_type).to eq("EAnone_void")
+      end
+    end
+  end
+
+  # Same-local-name attributes coexisting on one element require the moxml
+  # fixes (lutaml/moxml#94 drops one under nokogiri; lutaml/moxml#95 crashes
+  # under rexml), so these cases run on the adapters that preserve both.
+  %i[oga ox].each do |adapter|
+    context "with the #{adapter} adapter" do
+      it "keeps both spellings disjoint regardless of document order" do
+        [both_spellings, both_spellings_plain_first].each do |xml|
+          probe = AttributeNamespaceDisjointnessSpec.parse(xml, adapter)
+
+          expect(probe.xmi_type).to eq("uml:Parameter")
+          expect(probe.plain_type).to eq("EAnone_void")
+        end
+      end
+    end
+  end
+
+  describe "serialization" do
+    it "writes each rule in its own namespace" do
+      probe = AttributeNamespaceDisjointnessSpec::Probe.new(
+        xmi_type: "uml:Parameter",
+        plain_type: "EAnone_void",
+      )
+
+      expect(probe.to_xml.strip).to be_xml_equivalent_to(
+        %(<probe xmlns:xmi="http://www.example.com/xmi" xmi:type="uml:Parameter" type="EAnone_void"/>),
+      )
+    end
+
+    it "round-trips both spellings through parsing" do
+      probe = AttributeNamespaceDisjointnessSpec::Probe.new(
+        xmi_type: "uml:Parameter",
+        plain_type: "EAnone_void",
+      )
+      reparsed = AttributeNamespaceDisjointnessSpec.parse(probe.to_xml, :oga)
+
+      expect(reparsed.xmi_type).to eq("uml:Parameter")
+      expect(reparsed.plain_type).to eq("EAnone_void")
+    end
+  end
+end

data/spec/lutaml/xml/schema/rnc_compiler_spec.rb

@@ -14,7 +14,9 @@ RSpec.describe Lutaml::Model::Schema::RncCompiler do
 
   describe ".to_models" do
     context "with an RNC schema using named patterns and start |=" do
-      let(:schema) { File.read("spec/fixtures/xml/schema/rnc/address_book.rnc") }
+      let(:schema) do
+        File.read("spec/fixtures/xml/schema/rnc/address_book.rnc")
+      end
       let(:sources) { described_class.to_models(schema) }
 
       it "compiles RNC through the RNG compiler" do
@@ -65,7 +67,9 @@ RSpec.describe Lutaml::Model::Schema::RncCompiler do
 
     context "with create_files output" do
       let(:dir) { Dir.mktmpdir }
-      let(:schema) { File.read("spec/fixtures/xml/schema/rnc/address_book.rnc") }
+      let(:schema) do
+        File.read("spec/fixtures/xml/schema/rnc/address_book.rnc")
+      end
 
       before do
         stub_const("RncAddressBookSpec", Module.new)
@@ -206,7 +210,8 @@ RSpec.describe Lutaml::Model::Schema::RncCompiler do
           "spec/fixtures/xml/schema/rnc/includes/circular_a.rnc"
 
         expect do
-          described_class.to_models(File.read(circular_path), location: circular_path)
+          described_class.to_models(File.read(circular_path),
+                                    location: circular_path)
         end.to raise_error(/circular_a\.rnc/)
       end
     end
@@ -308,7 +313,9 @@ RSpec.describe Lutaml::Model::Schema::RncCompiler do
         # The inline restricted type is subclassed (not mutated) so a fresh
         # namespaced type inherits its constraints and carries the namespace.
         expect(sources["CodeType"]).not_to match(/namespace \w+Namespace/)
-        subclass = sources.keys.find { |k| sources[k].match?(/class \w+ < CodeType/) }
+        subclass = sources.keys.find do |k|
+          sources[k].match?(/class \w+ < CodeType/)
+        end
         expect(subclass).not_to be_nil
         expect(sources[subclass]).to match(/namespace \w+Namespace/)
       end
@@ -323,7 +330,9 @@ RSpec.describe Lutaml::Model::Schema::RncCompiler do
         namespaces = sources.select { |_, v| v.include?("Lutaml::Xml::W3c::XmlNamespace") }
         expect(namespaces.size).to eq(2)
         uris = namespaces.values.map { |v| v[/uri "([^"]+)"/, 1] }
-        prefixes = namespaces.values.map { |v| v[/prefix_default "([^"]+)"/, 1] }
+        prefixes = namespaces.values.map do |v|
+          v[/prefix_default "([^"]+)"/, 1]
+        end
         expect(uris).to contain_exactly("urn:a", "urn:b")
         expect(prefixes.uniq.size).to eq(2)
       end
@@ -341,7 +350,9 @@ RSpec.describe Lutaml::Model::Schema::RncCompiler do
           }
         RNC
 
-        wrapper = sources.keys.find { |k| sources[k].match?(/namespace \w+Namespace/) && !k.include?("Namespace") }
+        wrapper = sources.keys.find do |k|
+          sources[k].match?(/namespace \w+Namespace/) && !k.include?("Namespace")
+        end
         expect(sources[wrapper]).to include("< Lutaml::Model::Type::DateTime")
       end
     end

data/spec/lutaml/xml/schema/rng_compiler_spec.rb

@@ -33,7 +33,9 @@ RSpec.describe Lutaml::Model::Schema::RngCompiler do
       end
 
       let(:dir) { Dir.mktmpdir }
-      let(:schema) { File.read("spec/fixtures/xml/schema/rng/address_book.rng") }
+      let(:schema) do
+        File.read("spec/fixtures/xml/schema/rng/address_book.rng")
+      end
 
       let(:valid_xml) do
         <<~XML
@@ -220,10 +222,13 @@ RSpec.describe Lutaml::Model::Schema::RngCompiler do
       end
 
       let(:dir) { Dir.mktmpdir }
-      let(:schema) { File.read("spec/fixtures/xml/schema/rng/integer_range.rng") }
+      let(:schema) do
+        File.read("spec/fixtures/xml/schema/rng/integer_range.rng")
+      end
 
       it "generates a SimpleType subclass for <data> with restrictions" do
-        src = File.read(File.join(dir, "rngrestrictionspec", "st_integer_range.rb"))
+        src = File.read(File.join(dir, "rngrestrictionspec",
+                                  "st_integer_range.rb"))
         expect(src).to include("class StIntegerRange < Lutaml::Model::Type::Integer")
         expect(src).to include("options[:min] = 1")
         expect(src).to include("options[:max] = 255")
@@ -507,7 +512,9 @@ RSpec.describe Lutaml::Model::Schema::RngCompiler do
         expect(classes_hash.keys).to contain_exactly(
           "AddressBook", "Card", "CardContent"
         )
-        classes_hash.each_value { |src| expect(src).to start_with("# frozen_string_literal: true") }
+        classes_hash.each_value do |src|
+          expect(src).to start_with("# frozen_string_literal: true")
+        end
       end
     end
 
@@ -821,7 +828,8 @@ RSpec.describe Lutaml::Model::Schema::RngCompiler do
 
       it "returns generated source per class" do
         expect(result).to be_a(Hash)
-        expect(result.keys).to contain_exactly("AddressBook", "Card", "CardContent")
+        expect(result.keys).to contain_exactly("AddressBook", "Card",
+                                               "CardContent")
       end
 
       it "loads the namespaced module and registers classes" do
@@ -886,7 +894,8 @@ RSpec.describe Lutaml::Model::Schema::RngCompiler do
           File.read("spec/fixtures/xml/schema/rng/address_book.rng"),
         )
         expect(result).to be_a(Hash)
-        expect(result.keys).to contain_exactly("AddressBook", "Card", "CardContent")
+        expect(result.keys).to contain_exactly("AddressBook", "Card",
+                                               "CardContent")
       end
     end
   end

data/spec/lutaml/xml/w3c_types_spec.rb

@@ -307,9 +307,8 @@ RSpec.describe Lutaml::Xml::W3c do
         RUBY
         temp_script.close
 
-        # rubocop:disable Style/CommandLiteral
+        # rubocop:disable-next Style/CommandLiteral
         result = `#{RbConfig.ruby} -I#{lib_path} #{temp_script.path} 2>&1`
-        # rubocop:enable Style/CommandLiteral
 
         expect($?.success?).to be(true),
                                "W3C types not registered after require 'lutaml/xml'. " \
@@ -335,9 +334,8 @@ RSpec.describe Lutaml::Xml::W3c do
         RUBY
         temp_script.close
 
-        # rubocop:disable Style/CommandLiteral
+        # rubocop:disable-next Style/CommandLiteral
         result = `#{RbConfig.ruby} -I#{lib_path} #{temp_script.path} 2>&1`
-        # rubocop:enable Style/CommandLiteral
 
         expect($?.success?).to be(true),
                                "Type.lookup failed for W3C symbols after require 'lutaml/xml'. " \
@@ -361,9 +359,8 @@ RSpec.describe Lutaml::Xml::W3c do
         RUBY
         temp_script.close
 
-        # rubocop:disable Style/CommandLiteral
+        # rubocop:disable-next Style/CommandLiteral
         result = `#{RbConfig.ruby} -I#{lib_path} #{temp_script.path} 2>&1`
-        # rubocop:enable Style/CommandLiteral
 
         expect($?.success?).to be(true),
                                "Symbol-based attribute definition failed after require 'lutaml/xml'. " \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.19
+  version: 0.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-27 00:00:00.000000000 Z
+date: 2026-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -1654,6 +1654,7 @@ files:
 - spec/lutaml/model/context_registry_spec.rb
 - spec/lutaml/model/custom_bibtex_adapter_spec.rb
 - spec/lutaml/model/custom_collection_spec.rb
+- spec/lutaml/model/custom_from_empty_values_spec.rb
 - spec/lutaml/model/custom_model_spec.rb
 - spec/lutaml/model/custom_serialization_spec.rb
 - spec/lutaml/model/custom_vobject_adapter_spec.rb
@@ -1812,6 +1813,7 @@ files:
 - spec/lutaml/xml/adapter/ox_adapter_spec.rb
 - spec/lutaml/xml/adapter/rexml_adapter_spec.rb
 - spec/lutaml/xml/adapter/xml_namespace_spec.rb
+- spec/lutaml/xml/attribute_namespace_disjointness_spec.rb
 - spec/lutaml/xml/builder/builder_spec.rb
 - spec/lutaml/xml/clear_parse_state_spec.rb
 - spec/lutaml/xml/compiled_rule_namespace_spec.rb
@@ -1946,7 +1948,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="