lutaml-model 0.8.144 → 0.8.146

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4c24c792fe315c6798bf64b67dbc4924fc919fc447e4a0264467d169a80315
-  data.tar.gz: 15621c39ad1d06dddbca3c9b0ef809b1a87d13222ef850c0cdb557da3317ca1d
+  metadata.gz: 8c23c8811a30181e0ed6ca3987a23ab7fadf4c4354ca143d28e84114218f80af
+  data.tar.gz: aa89d32438cae623a9e0dd37bd8e614bcdd76bf53759e164b47f44eb957f7a96
 SHA512:
-  metadata.gz: 21de2545ba67ce8357cd0216e70a085648ea24153cff022a805005b677d7d90ab51af50869cfc6335d6aad5404f4bb4fde30ed9f6389a31ff9b7ac51580646b4
-  data.tar.gz: d46faf8a708c88622abb2d560bf2f533da86815553c81049b8d432f71d60cfad67a65e567858454a7ecad721b2d2e02c2c3d6bd8bc173416903dc5d4faab7065
+  metadata.gz: 3dd2402033dbecea612e3bb32903d041d466d71408cbda93159dedc5af884f24a0b49e6501874481bc92184b6179d996f388bcee0811f9b7758c9361a593f68c
+  data.tar.gz: 5109ea9359e823c2ace26967168222d01d0da81390e838b77c0445cc29ee295aa173fbdb938067eacd4353a457080e78df13c88df568cb0118e28da6ada77563

data/lib/lutaml/key_value/adapter/yamls/standard_adapter.rb

@@ -17,7 +17,7 @@ module Lutaml
 
               begin
                 results << YAML.safe_load(yaml, aliases: true)
-              rescue Psych::SyntaxError => e
+              rescue *Lutaml::Model::Utils.yaml_parse_errors => e
                 warn "Skipping invalid yaml: #{e.message}"
               end
             end

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

@@ -67,6 +67,21 @@ module Lutaml
           klass = Object.const_get(klass_name)
 
           propagated = options.slice(*Lutaml::Model::Attribute::CHILD_PROPAGATION_KEYS)
+
+          # A map entry that resolves to the deserializing class itself
+          # (a subclass inheriting its base's map, or an apply_mappings
+          # override delegating back to super for its own concrete class)
+          # must fall through to this class's real deserialization:
+          # re-dispatching apply_mappings would resolve the same entry
+          # again and never make progress.
+          if klass == model
+            transformer = Lutaml::Model::Config.transformer_for(format)
+            return transformer.data_to_model(
+              self, doc, format,
+              propagated.merge(register: instance.lutaml_register)
+            )
+          end
+
           klass.apply_mappings(doc, format,
                                propagated.merge(register: instance.lutaml_register))
         end

data/lib/lutaml/model/utils.rb

@@ -34,6 +34,17 @@ module Lutaml
           false
         end
 
+        # Parse-error classes of every YAML engine that may be answering
+        # ::YAML in this process. A host bundle can rebind ::YAML (a
+        # Psych drop-in), so the multi-document skip-rescues must cover
+        # each loaded engine's parse error, not only Psych's (#1053: a
+        # raw Yeptris::ParseError escaped from_yamls).
+        def yaml_parse_errors
+          errors = [Psych::SyntaxError]
+          errors << Yeptris::ParseError if defined?(Yeptris::ParseError)
+          errors
+        end
+
         # Convert string to camel case (cached)
         def camel_case(str)
           return "" if str.nil? || str.empty?

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.8.144"
+    VERSION = "0.8.146"
   end
 end

data/lib/lutaml/yamls/adapter/standard_adapter.rb

@@ -22,7 +22,7 @@ module Lutaml
           end
 
           results
-        rescue Psych::SyntaxError => e
+        rescue *Lutaml::Model::Utils.yaml_parse_errors => e
           warn "Skipping invalid yaml: #{e.message}"
           parse_with_split(yamls)
         end
@@ -36,7 +36,7 @@ module Lutaml
             begin
               doc = YAML.safe_load(yaml, aliases: true)
               results << doc unless doc.nil?
-            rescue Psych::SyntaxError => e
+            rescue *Lutaml::Model::Utils.yaml_parse_errors => e
               warn "Skipping invalid yaml: #{e.message}"
             end
           end

data/spec/lutaml/model/polymorphic_spec.rb

@@ -125,6 +125,21 @@ module PolymorphicSpec
         }
       end
     end
+
+    # A polymorphic map whose entry resolves to the class carrying it
+    # (e.g. a subclass inheriting its base's map, or an apply_mappings
+    # override delegating back to super for its own concrete class).
+    class SelfResolving < Lutaml::Model::Serializable
+      attribute :_type, :string
+      attribute :name, :string
+
+      key_value do
+        map "_type", to: :_type, polymorphic_map: {
+          "self_resolving" => "PolymorphicSpec::Base::SelfResolving",
+        }
+        map "name", to: :name
+      end
+    end
   end
 
   module Child
@@ -546,4 +561,17 @@ RSpec.describe "Polymorphic" do
       end
     end
   end
+
+  # A polymorphic map that resolves a document to the very class that is
+  # deserializing it must fall through to the model's own
+  # deserialization, not re-dispatch apply_mappings forever.
+  context "when the polymorphic map resolves to the deserializing class" do
+    it "deserializes without recursing" do
+      model = PolymorphicSpec::Base::SelfResolving.apply_mappings(
+        { "_type" => "self_resolving", "name" => "x" }, :hash
+      )
+      expect(model).to be_a(PolymorphicSpec::Base::SelfResolving)
+      expect(model.name).to eq("x")
+    end
+  end
 end

data/spec/lutaml/model/yamls_spec.rb

@@ -154,6 +154,38 @@ RSpec.describe "Yamls" do
     end.to output(/Skipping invalid yaml: /).to_stderr
   end
 
+  # #1053: a host bundle can rebind ::YAML to another engine (a Psych
+  # drop-in), so the multi-doc lane must treat every loaded engine's
+  # parse error as a skippable document error — never let a raw engine
+  # error escape.
+  describe "engine parse errors" do
+    it "rescues every loaded YAML engine's parse errors" do
+      errors = Lutaml::Model::Utils.yaml_parse_errors
+
+      expect(errors).to include(Psych::SyntaxError)
+      if defined?(Yeptris::ParseError)
+        expect(errors).to include(Yeptris::ParseError)
+      end
+    end
+
+    it "skips an invalid document when the active engine raises its own parse error" do
+      skip "yeptris not loadable in this process" unless Lutaml::Model::Utils.safe_load("yeptris", :Yeptris)
+
+      allow(YAML).to receive(:load_stream).and_raise(
+        Yeptris::ParseError.new("parse failed: unexpected parser state at line 11, column 26"),
+      )
+
+      expect do
+        expect(Lutaml::Yamls::Adapter::StandardAdapter.parse(invalid_yamls_content)).to eq(
+          [
+            { "full_name" => "John", "age" => 30, "address" => { "city" => "New York" } },
+            { "full_name" => "Bob", "age" => 35, "address" => { "city" => "Paris" } },
+          ],
+        )
+      end.to output(/Skipping invalid yaml: /).to_stderr
+    end
+  end
+
   describe "parsing" do
     it "handles empty documents" do
       yamls_with_empty_docs = <<~YAMLS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.144
+  version: 0.8.146
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-28 00:00:00.000000000 Z
+date: 2026-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64