lutaml-model 0.8.108 → 0.8.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50f81556cebfd601f3ff6ede463ed9f20d31a0e2c12e8c1362c655b5dd9408e8
-  data.tar.gz: c9ec847109db4b87bbb4e4e46fde663eb83d7b9eae54d43f55e1c04024345013
+  metadata.gz: a49c2cdf5702fe7400d2cc4439632340cf8abe4ed214219d9d53a3bbacff6943
+  data.tar.gz: 887431c911fa16aff6372c9c7c7addb034d0722f1ba11b0dfd28fb71bb4fb982
 SHA512:
-  metadata.gz: cbce6698e13f0d52da843a92c4bae8ca69db7f11cdbd654f1dd924cd171f31ad227da0a610557a17de11856de2030460d5b497a248c3b37b7de76ca286398520
-  data.tar.gz: d4113a27b55316ad49f5a9263ac3b1d15616c3c7c65408faa1b0a4741ed1966fcd173a8519d85b19dec66a406ce168caf6439703b5e687318ae74dc586ee586d
+  metadata.gz: f9c79f442e8be909743b4ecd1eaca9537d61be0d5925336507aa1869907c6795d68aac1a66b67c3fb2cedc0dab86bcab798b7850c3c41d7393a1f9301b862104
+  data.tar.gz: d03289efc62a1b6c3cd9c66b6114879a3e68dc05883f20aab395264c2db7c7f0487da4baf2cce95d40493485f238e914b9acb88d974b7638e54efca43f678a30

data/lib/lutaml/model/attribute.rb

@@ -398,11 +398,27 @@ module Lutaml
         # cast_items already returns a fresh array, so the plain-Array
         # collection needs no re-wrap — build_collection's
         # collection_class.new would copy it again.
+        assert_flat_collection_items!(items)
         return items if !custom_collection? && collection_class == ::Array
 
         build_collection(items, register: register)
       end
 
+      # Fail loudly on nested arrays. A collection's declared element
+      # type never admits an Array as an item; the legacy
+      # build_collection flatten silently absorbed mis-spliced builder
+      # output (expressir#506 surfaced it three frames away in a
+      # formatter). The error must land at the assignment boundary.
+      def assert_flat_collection_items!(items)
+        return unless items.any?(::Array)
+
+        raise TypeError,
+              "collection '#{name}': item " \
+              "#{items.index { |item| item.is_a?(::Array) }} is an Array " \
+              "where the declared element type is expected; nested arrays " \
+              "are not flattened — splice list results before assignment"
+      end
+
       # Plain Arrays count as list input. On singular attributes
       # collection_instance? matches Arrays too (their collection class is
       # Array), preserving the Array so strict cardinality can flag it.

data/lib/lutaml/model/configuration.rb

@@ -37,11 +37,11 @@ module Lutaml
         @conversion_cache = nil
         @configured = false
         @xml_plan_fast_path = true
-# Opt-in until leptris#1743 lands: the native ordered lane
-# runs away (28+ CPU-min / 14GB RSS on sts-ruby's
-# ISO_13849-1 document) — flipping this on by default regressed
-# the sts bench cell from 4m41s to a 10-minute kill.
-@xml_plan_ordered_path = false
+        # Opt-in until leptris#1743 lands: the native ordered lane
+        # runs away (28+ CPU-min / 14GB RSS on sts-ruby's
+        # ISO_13849-1 document) — flipping this on by default regressed
+        # the sts bench cell from 4m41s to a 10-minute kill.
+        @xml_plan_ordered_path = false
         @element_order_tracking = true
       end
 

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

@@ -139,7 +139,13 @@ module Lutaml
           plan = Lutaml::Xml::Leptris::PlanCompiler.compile(self, register)
           return nil unless plan
 
-          root = ::Leptris::XML.parse(data.to_s).root
+          # strict: the from_xml contract raises on malformed input —
+          # the FFI lane parses leniently by default and would answer a
+          # best-effort tree where every other adapter raises. The
+          # kwarg spellings vary by engine vintage (strict: landed
+          # after 1.9.353, recover: on 1.9.344+), so probe the resolved
+          # parse method and pass the strictest spelling it accepts.
+          root = ::Leptris::XML.parse(data.to_s, **leptris_strict_kwargs).root
           return nil if root.nil?
           return nil unless root.name == plan[:tree][:name]
 
@@ -154,6 +160,15 @@ module Lutaml
           raise Lutaml::Model::InvalidFormatError.new(:xml, e.message)
         end
 
+        def leptris_strict_kwargs
+          params = ::Leptris::XML.method(:parse).parameters
+            .map { |_, key| key }
+          kwargs = {}
+          kwargs[:recover] = false if params.include?(:recover)
+          kwargs[:strict] = true if params.include?(:strict)
+          kwargs
+        end
+
         # Get list of error types that can be raised during format parsing.
         # Core errors are always included; format-specific errors come from
         # FormatRegistry registrations.

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.8.108"
+    VERSION = "0.8.110"
   end
 end

data/lib/lutaml/xml/adapter/leptris_adapter.rb

@@ -9,6 +9,7 @@ module Lutaml
         MOXML_ADAPTER = Moxml::Adapter::Leptris
         BUILDER_CLASS = Builder::Leptris
         PARSED_ELEMENT_CLASS = Lutaml::Xml::LeptrisElement
+        PARSE_ERROR_CLASS = Moxml::ParseError
       end
     end
   end

data/spec/lutaml/model/adapter_resolver_configured_spec.rb

@@ -49,13 +49,13 @@ RSpec.describe Lutaml::Model::AdapterResolver, ".adapter_for with a configured t
     _stdout, stderr, status = Open3.capture3(RbConfig.ruby, "-I", "lib", "-e", probe)
     expect(status).to be_success, stderr
   end
-end
 
-RSpec.describe "plan lane defaults" do
-  it "ships the ordered plan lane opt-in until leptris#1743 is fixed" do
-    # The native ordered lane runs away on sts-ruby's ISO_13849-1
-    # document (leptris#1743): 28+ CPU-min / 14 GB RSS vs 6.36s on the
-    # same parse with the lane off. Opt-in until the engine fix ships.
-    expect(Lutaml::Model::Config.instance.xml_plan_ordered_path).to be(false)
+  describe "plan lane defaults" do
+    it "ships the ordered plan lane opt-in until leptris#1743 is fixed" do
+      # The native ordered lane runs away on sts-ruby's ISO_13849-1
+      # document (leptris#1743): 28+ CPU-min / 14 GB RSS vs 6.36s on the
+      # same parse with the lane off. Opt-in until the engine fix ships.
+      expect(Lutaml::Model::Config.instance.xml_plan_ordered_path).to be(false)
+    end
   end
 end

data/spec/lutaml/model/collection_strict_assignment_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "strict collection assignment" do
+  let(:node_class) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :id, :string
+    end
+  end
+
+  let(:holder_class) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :items, "Node", collection: true
+    end
+  end
+
+  before do
+    stub_const("Node", node_class)
+    stub_const("Holder", holder_class)
+  end
+
+  it "raises at the constructor boundary" do
+    expect do
+      Holder.new(items: [[Node.new(id: "a")], Node.new(id: "b")])
+    end.to raise_error(Lutaml::Model::TypeError, /item 0 is an Array/)
+  end
+
+  it "raises at the writer boundary" do
+    holder = Holder.new
+    expect do
+      holder.items = [Node.new, [Node.new]]
+    end.to raise_error(Lutaml::Model::TypeError, /item 1 is an Array/)
+  end
+
+  it "raises for a custom collection class" do
+    custom = Class.new(Lutaml::Model::Collection) do
+      instances :node, "Node"
+    end
+    stub_const("NodeBag", custom)
+    wrapper = Class.new(Lutaml::Model::Serializable) do
+      attribute :bag, "NodeBag"
+    end
+    stub_const("BagHolder", wrapper)
+
+    expect do
+      BagHolder.new(bag: [[Node.new]])
+    end.to raise_error(Lutaml::Model::TypeError, /nested arrays are not flattened/)
+  end
+
+  it "keeps flat assignment untouched" do
+    holder = Holder.new(items: [Node.new(id: "x")])
+    expect(holder.items.map(&:id)).to eq(["x"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.108
+  version: 0.8.110
 platform: ruby
 authors:
 - Ribose Inc.
@@ -1724,6 +1724,7 @@ files:
 - spec/lutaml/model/collection_single_value_coercion_spec.rb
 - spec/lutaml/model/collection_spec.rb
 - spec/lutaml/model/collection_state_nesting_spec.rb
+- spec/lutaml/model/collection_strict_assignment_spec.rb
 - spec/lutaml/model/collection_validation_spec.rb
 - spec/lutaml/model/comparable_model_spec.rb
 - spec/lutaml/model/comparison_family_spec.rb