lutaml-model 0.8.119 → 0.8.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df481bfb5303c05153a8bda8eaa4996157a6060d34d70dd8eb835e461aff9f5
-  data.tar.gz: a23f93de4f89b1a2b7925833786e9d0337ec5e94ec172723f5b2b70f78347d3c
+  metadata.gz: 6b4c137e1f669303a163bde341097dae39b9171b3f9c65b2a8dba97fff0ac6e5
+  data.tar.gz: a9c13e332f7228b0d45c1a2b24ce9cbe032c7d3b9a06b8585b54c30bd78fcfdc
 SHA512:
-  metadata.gz: adbc819876bf696f60009c53042dba835e5e557f32057f1aba4f58da56831c15f347d35dcf0160536a877f29f2d17ba59aadb8b1ac38b7fa9572b2d12d6c6dd2
-  data.tar.gz: 9af887394f9b2e241f299cb8eabcc3e0202ec51dba5129477a16cb85234105f51c7198fc44b9c20c916fa89a1356918c4752bbd73afa8f83a5a49ffd3032f08d
+  metadata.gz: 51cad246d238f97af6becc7e9f90409d21152e60ff136658832e3440656a13f02b18693f8683605e0831738a2fb707490d137a2a47769121a2139aa845c927f6
+  data.tar.gz: a7be0c13e87ac6d37a61044bdea091f7d49a21ad2bb75cd206424456c9d1a77a13ba895b9f2d5d7b6ae6c45fe64b71ae493cd4dab444486641ebbc7cc6294a08

data/.github/workflows/dependent-repos-tools.json

@@ -0,0 +1,9 @@
+{
+  "repo": [
+    "metanorma/docbook",
+    "metanorma/metanorma-cli",
+    "metanorma/rfcxml",
+    "metanorma/uniword",
+    "ukiryu/ukiryu"
+  ]
+}

data/.github/workflows/dependent-repos.json

@@ -14,22 +14,17 @@
     "lutaml/unibuf",
     "lutaml/xmi",
     "metanorma/atmospheric",
-    "metanorma/docbook",
-    "metanorma/metanorma-cli",
     "metanorma/modspec-ruby",
     "metanorma/niso-jats",
     "metanorma/prosereflect",
     "metanorma/revix",
-    "metanorma/rfcxml",
     "metanorma/sts-ruby",
-    "metanorma/uniword",
     "plurimath/mml",
     "plurimath/plurimath",
     "relaton/ieee-idams",
     "relaton/loc_mods",
     "relaton/w3c_api",
-    "ukiryu/ukiryu",
     "unitsml/unitsdb-ruby",
     "unitsml/unitsml-ruby"
   ]
-}
+}

data/.github/workflows/dependent-tests.yml

@@ -18,10 +18,29 @@ on:
     types: [ release-passed ]
 
 jobs:
+  # Most dependents are pure data/format gems: their suites invoke no
+  # external tools, so skipping the tool install removes the Windows
+  # Chocolatey flake surface (choco CDN 504s killed cells pre-rspec,
+  # e.g. the ukiryu Windows leg) for the majority of the matrix.
   rake:
     uses: metanorma/ci/.github/workflows/dependent-rake.yml@main
     with:
       command: bundle exec rspec
+      repos-json-file: .github/workflows/dependent-repos.json
+      after-setup-ruby: |
+        if [ -f frontend/package.json ]; then cd frontend && npm install && npm run build; fi
+    secrets:
+      pat_token: ${{ secrets.LUTAML_CI_PAT_TOKEN }}
+
+  # Dependents whose suites invoke the tools: ukiryu wraps
+  # inkscape/imagemagick/ghostscript and raises if absent, and its
+  # smoke suite exercises exiftool, yq and ffmpeg too; the metanorma
+  # renderers run full document renders.
+  rake-with-tools:
+    uses: metanorma/ci/.github/workflows/dependent-rake.yml@main
+    with:
+      command: bundle exec rspec
+      repos-json-file: .github/workflows/dependent-repos-tools.json
       setup-tools: 'inkscape,ghostscript,exiftool,ffmpeg,imagemagick,yq'
       after-setup-ruby: |
         if [ -f frontend/package.json ]; then cd frontend && npm install && npm run build; fi

data/lib/lutaml/json/adapter/yeptris_adapter.rb

@@ -32,9 +32,11 @@ module Lutaml
         # constant (the poison-process state the gem documents)
         # passes const_defined? and require while every parse fails,
         # and the native parse error then surfaces on valid input.
-        # Idempotent; a missing or broken install reports false
-        # instead of raising, so optional-engine callers (detection)
-        # can gate on it and fall back to the standard lane.
+        # Any failure — missing native, engine error, or a binding and
+        # native binary out of sync (NameError on a missing FFI surface,
+        # yeptris 0.6.34.2 x64-mingw-ucrt) — reports false instead of
+        # raising, so optional-engine callers (detection) gate on it and
+        # fall back to the standard lane.
         def self.available?
           require_engine
           native_ready?
@@ -48,7 +50,7 @@ module Lutaml
           @native_ready = begin
             ::Yeptris::JSON.load('{"native_probe": 1}')
             true
-          rescue ::Yeptris::Error, LoadError, NoMemoryError
+          rescue StandardError
             false
           end
         end

data/lib/lutaml/model/union.rb

@@ -154,12 +154,15 @@ module Lutaml
             member.is_a?(::Class) && member.include?(Serialize)
           end
 
-          # Structural (key-coverage) selection: every input key maps to one of
-          # the member's mapped fields, with no input key left unmapped. Once
-          # selected, field values cast leniently via the member's normal path.
-          # An existing member instance conforms as-is, keeping conformance
-          # idempotent — values can re-enter casting (e.g. a value transformer
-          # builds the member before the cast runs).
+          # Structural selection: at least one input key maps to one of the
+          # member's mapped fields. Keys no rule claims are ignored exactly
+          # as they are when the same hash reaches the model outside a
+          # union — extension keys (x-** vendor keywords, forward-compatible
+          # vocabularies) must not defeat dispatch (#987). Once selected,
+          # field values cast leniently via the member's normal path. An
+          # existing member instance conforms as-is, keeping conformance
+          # idempotent — values can re-enter casting (e.g. a value
+          # transformer builds the member before the cast runs).
           def conform_model(member, value, format, register)
             return value if value.is_a?(member)
 
@@ -167,7 +170,7 @@ module Lutaml
             return :no_match if keys.nil? || keys.empty?
 
             field_names = member_field_names(member, format, register)
-            return :no_match unless keys.all? do |key|
+            return :no_match unless keys.any? do |key|
               field_names.include?(key)
             end
 

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.8.119"
+    VERSION = "0.8.121"
   end
 end

data/lib/lutaml/xml/schema/xsd/keyref.rb

@@ -20,6 +20,7 @@ module Lutaml
 
             map_attribute :id, to: :id
             map_attribute :name, to: :name
+            map_attribute :refer, to: :refer
             map_element :field, to: :field
             map_element :selector, to: :selector
             map_element :annotation, to: :annotation

data/lib/lutaml/yaml/adapter/yeptris_adapter.rb

@@ -46,9 +46,11 @@ module Lutaml
         # constant (the poison-process state the gem documents)
         # passes const_defined? and require while every parse fails,
         # and the native parse error then surfaces on valid input.
-        # Idempotent; a missing or broken install reports false
-        # instead of raising, so optional-engine callers (detection)
-        # can gate on it and fall back to the standard lane.
+        # Any failure — missing native, engine error, or a binding and
+        # native binary out of sync (NameError on a missing FFI surface,
+        # yeptris 0.6.34.2 x64-mingw-ucrt) — reports false instead of
+        # raising, so optional-engine callers (detection) gate on it and
+        # fall back to the standard lane.
         def self.available?
           require_engine
           native_ready?
@@ -63,7 +65,7 @@ module Lutaml
             # rubocop:disable-next Naming/VariableNumber -- upstream schema literal
             ::Yeptris::YAML.load("native_probe: 1", schema: :compat_11)
             true
-          rescue ::Yeptris::Error, LoadError, NoMemoryError
+          rescue StandardError
             false
           end
         end

data/spec/lutaml/model/union_attribute_spec.rb

@@ -214,6 +214,25 @@ module UnionAttributeSpec
   end
 end
 
+# Union members for the #987 dispatch contract: an extension-carrying
+# model (keys no rule maps must not defeat dispatch) and a holder
+# mixing it with a scalar member.
+class ExtendedShape < Lutaml::Model::Serializable
+  attribute :type, :string
+
+  key_value do
+    map "type", to: :type
+  end
+end
+
+class ExtendedHolder < Lutaml::Model::Serializable
+  attribute :value, [ExtendedShape, :boolean]
+
+  key_value do
+    map "value", to: :value
+  end
+end
+
 RSpec.describe "Union-typed attributes (issue #190)" do
   describe "deserialization — member resolution by shape" do
     it "resolves a scalar string to the :string member" do
@@ -646,6 +665,38 @@ RSpec.describe "Union-typed attributes (issue #190)" do
     end
   end
 
+  describe "unmapped keys do not defeat model dispatch (#987)" do
+    # ExtendedShape / ExtendedHolder: extension-carrying objects (JSON
+    # Schema vocabularies, OpenAPI x-** keywords) carry keys no rule
+    # maps; the same hash reaches the model member fine outside a
+    # union, so it must inside one too.
+
+    it "selects the model member when mapped and unmapped keys mix" do
+      parsed = ExtendedHolder.from_json(
+        '{"value":{"type":"string","x-ext":1}}',
+      )
+
+      expect(parsed.value).to be_a(ExtendedShape)
+      expect(parsed.value.type).to eq("string")
+    end
+
+    it "still falls through when no key maps to any model member" do
+      parsed = ExtendedHolder.from_json('{"value":true}')
+
+      expect(parsed.value).to be(true)
+    end
+
+    it "returns nil only when no member conforms at all" do
+      holder = Class.new(Lutaml::Model::Serializable) do
+        attribute :value, [ExtendedShape, :boolean]
+        key_value { map "value", to: :value }
+      end
+      stub_const("ExtendedHolderNinetyEight", holder)
+
+      expect(holder.from_json('{"value":{"unrelated":1}}').value).to be_nil
+    end
+  end
+
   describe "value transformers (cast idempotence)" do
     it "keeps a model member built by transform: before the cast runs" do
       reading = UnionAttributeSpec::TransformedReading.from_yaml(<<~YAML)

data/spec/lutaml/model/yeptris_error_parity_spec.rb

@@ -70,7 +70,17 @@ RSpec.describe "yeptris adapter error parity" do
     RUBY
   end
 
-  before { skip "yeptris is not installed" unless yeptris_installed? }
+  # Installed is not enough: a binding/native desync (yeptris
+  # 0.6.34.2 x64-mingw-ucrt) leaves the gem resolvable while every
+  # parse raises. The parity contract only holds when the engines
+  # actually answer a probe — detection then selects them.
+  def yeptris_usable?
+    yeptris_installed? &&
+      Lutaml::Json::Adapter::YeptrisAdapter.available? &&
+      Lutaml::Yaml::Adapter::YeptrisAdapter.available?
+  end
+
+  before { skip "yeptris is not usable on this platform" unless yeptris_usable? }
 
   it "prefers the yeptris adapters when the engine is installed" do
     expect(outcomes).to include("yaml-adapter: Lutaml::Yaml::Adapter::YeptrisAdapter")

data/spec/lutaml/model/yeptris_native_detection_spec.rb

@@ -27,12 +27,16 @@ RSpec.describe Lutaml::Model::AdapterResolver, ".adapter_for yeptris native dete
     RUBY
   end
 
+  # The gem resolving is not enough: a binding/native desync leaves
+  # yeptris loadable while every parse raises. The healthy-lane spec
+  # is only meaningful where the native answers a probe.
   def subprocess_yeptris_capable?
     probe = <<~RUBY
       begin
         require "yeptris"
-        exit(0)
-      rescue LoadError
+        require "lutaml/json/adapter/yeptris_adapter"
+        exit(Lutaml::Json::Adapter::YeptrisAdapter.available? ? 0 : 1)
+      rescue LoadError, StandardError
         exit(1)
       end
     RUBY

data/spec/lutaml/xml/schema/xsd/keyref_refer_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "spec_helper"
+
+RSpec.describe Lutaml::Xml::Schema::Xsd::Keyref do
+  it "maps the refer attribute from the parsed XSD" do
+    xsd = <<~XSD
+      <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+        <xs:element name="catalog">
+          <xs:keyref name="refKey" refer="itemKey"/>
+        </xs:element>
+      </xs:schema>
+    XSD
+
+    schema = Lutaml::Xml::Schema::Xsd.parse(xsd)
+    keyref = Array(schema.element.first.keyref).first
+
+    expect(keyref).not_to be_nil
+    expect(keyref.refer).to eq("itemKey")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.119
+  version: 0.8.121
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-20 00:00:00.000000000 Z
+date: 2026-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -155,6 +155,7 @@ files:
 - ".envrc"
 - ".github/scripts/test_installed_gem.rb"
 - ".github/workflows/dependent-repos-todo.json"
+- ".github/workflows/dependent-repos-tools.json"
 - ".github/workflows/dependent-repos.json"
 - ".github/workflows/dependent-tests.yml"
 - ".github/workflows/docs.yml"
@@ -2021,6 +2022,7 @@ files:
 - spec/lutaml/xml/schema/xsd/errors/suggestion_spec.rb
 - spec/lutaml/xml/schema/xsd/file_validation_result_spec.rb
 - spec/lutaml/xml/schema/xsd/glob_spec.rb
+- spec/lutaml/xml/schema/xsd/keyref_refer_spec.rb
 - spec/lutaml/xml/schema/xsd/liquid_methods/attribute_and_group_spec.rb
 - spec/lutaml/xml/schema/xsd/liquid_methods/complex_type_spec.rb
 - spec/lutaml/xml/schema/xsd/liquid_methods/containers_spec.rb