lutaml-model 0.8.36 → 0.8.38

data/spec/lutaml/model/sequence_choice_compositor_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# lutaml-model#687: an xs:sequence remembers a nested xs:choice
+# compositor. Element rules inside `choice` take their position in the
+# sequence and carry the choice on their model attributes, so validation
+# applies order and exclusivity.
+RSpec.describe "Sequence with nested choice" do
+  let(:model) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :title, :string
+      attribute :hardcover, :string
+      attribute :paperback, :string
+      attribute :author, :string, collection: true
+
+      xml do
+        element "book"
+        sequence do
+          map_element "title", to: :title
+          choice do
+            map_element "hardcover", to: :hardcover
+            map_element "papercover", to: :paperback
+            map_element "paperback", to: :paperback
+          end
+          map_element "author", to: :author
+        end
+      end
+    end
+  end
+
+  it "records the choice as a compositor alongside the flat order" do
+    sequence = model.mappings_for(:xml).element_sequence.first
+    expect(sequence.compositors).to contain_exactly(
+      an_instance_of(Lutaml::Model::Choice),
+    )
+    choice = sequence.compositors.first
+    # After finalize the choice carries the model attributes its rules
+    # target — the shape validation machinery expects.
+    expect(choice.attributes.map(&:name)).to eq(%i[hardcover paperback])
+  end
+
+  it "keeps the model attributes tagged with the nested choice" do
+    choice = model.mappings_for(:xml).element_sequence.first.compositors.first
+    expect(model.attributes[:hardcover].options[:choice]).to equal(choice)
+    expect(model.attributes[:paperback].options[:choice]).to equal(choice)
+  end
+
+  it "validates order and exclusivity" do
+    valid = model.from_xml(
+      "<book><title>T</title><paperback>PB</paperback><author>A</author></book>",
+    )
+    expect(valid.validate).to be_empty
+
+    out_of_order = model.from_xml(
+      "<book><author>A</author><title>T</title><hardcover>HB</hardcover></book>",
+    )
+    expect(out_of_order.validate).not_to be_empty
+
+    both_branches = model.from_xml(
+      "<book><title>T</title><hardcover>HB</hardcover>" \
+      "<paperback>PB</paperback><author>A</author></book>",
+    )
+    expect(both_branches.validate).not_to be_empty
+  end
+end

data/spec/lutaml/model/store_spec.rb

@@ -202,12 +202,10 @@ RSpec.describe Lutaml::Model::Store do
       # After compaction, the refs array should be smaller than before
       # (some dead refs removed). Exact count depends on GC timing,
       # but the live refs must still be present.
-      live = instance.refs_for(model_class.to_s)
-      alive_count = live.count do |ref|
-        ref.weakref_alive?
-      rescue WeakRef::RefError
-        false
-      end
+      # refs_for yields live objects directly under the WeakMap buckets
+      # (dead keys never surface), so the live count is bounded by the
+      # post-GC population regardless of compaction timing.
+      alive_count = instance.refs_for(model_class.to_s).count
       expect(alive_count).to be < (threshold + 1 + interval)
     end
 
@@ -225,14 +223,18 @@ RSpec.describe Lutaml::Model::Store do
       expect(counters[other_class.to_s]).to eq(3)
     end
 
-    it "does not compact when exactly at threshold" do
-      threshold = Lutaml::Model::Store::COMPACTION_THRESHOLD
+    it "compacts only on interval multiples" do
+      interval = Lutaml::Model::Store::COMPACTION_INTERVAL
       instance = described_class.instance
 
-      _objects = Array.new(threshold) { |i| model_class.new(id: "edge-#{i}") }
-
-      # refs.size == threshold, which does not satisfy size > threshold
+      # WeakMap buckets shed dead keys without help, so compaction is
+      # purely index maintenance on a fixed cadence: the counter fires
+      # exactly at each interval boundary, never between.
+      (interval - 1).times { |i| model_class.new(id: "edge-#{i}") }
       expect(instance.compaction_count).to eq(0)
+
+      model_class.new(id: "edge-trigger")
+      expect(instance.compaction_count).to eq(1)
     end
   end
 

data/spec/lutaml/model/yaml_stream_spec.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# lutaml-model#436: multi-document YAML streams with per-document model
+# dispatch (the glossarist-ruby#132 / ISO 5843-6 shape).
+RSpec.describe "YAML streams" do
+  let(:concept_class) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :id, :string
+      attribute :language_code, :string
+
+      key_value do
+        map "id", to: :id
+        map "language_code", to: :language_code
+      end
+    end
+  end
+
+  let(:localized_class) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :id, :string
+      attribute :status, :string
+
+      key_value do
+        map "id", to: :id
+        map "status", to: :status
+      end
+    end
+  end
+
+  let(:stream) do
+    <<~YAML
+      ---
+      id: 1-EN
+      language_code: eng
+      ---
+      id: 3a75
+      status: accepted
+      ---
+      id: 1-FR
+      language_code: fra
+    YAML
+  end
+
+  it "parses every document in the stream" do
+    models = concept_class.from_yaml_stream(stream)
+    expect(models.map(&:id)).to eq(%w[1-EN 3a75 1-FR])
+  end
+
+  it "dispatches documents polymorphically via discriminator" do
+    models = concept_class.from_yaml_stream(
+      stream,
+      discriminator: lambda { |doc|
+        doc.key?("language_code") ? concept_class : localized_class
+      },
+    )
+    expect(models.map(&:class)).to eq([concept_class, localized_class,
+                                       concept_class])
+    expect(models[1].status).to eq("accepted")
+  end
+
+  it "round-trips through to_yaml_stream" do
+    models = concept_class.from_yaml_stream(stream)
+    out = concept_class.to_yaml_stream(models)
+    reparsed = concept_class.from_yaml_stream(out)
+    expect(reparsed.map(&:id)).to eq(models.map(&:id))
+    expect(out).to include("---")
+  end
+end

data/spec/lutaml/xml/html_entities_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# lutaml-model#154: HTML named/numeric entities decode only for
+# mappings that opt in via `html_entities` — XML otherwise keeps
+# undefined entities literal.
+RSpec.describe "Opt-in HTML entity decoding" do
+  context "when the mapping opts in" do
+    let(:model_class) do
+      Class.new(Lutaml::Model::Serializable) do
+        attribute :t, :string
+
+        xml do
+          element "doc"
+          map_element "t", to: :t
+          html_entities
+        end
+      end
+    end
+
+    it "decodes named and numeric entities in element text" do
+      parsed = model_class.from_xml("<doc><t>a &amp; b &#8212; c &copy; d</t></doc>")
+      expect(parsed.t).to eq("a & b — c © d")
+    end
+  end
+
+  context "when the mapping does not opt in" do
+    let(:model_class) do
+      Class.new(Lutaml::Model::Serializable) do
+        attribute :t, :string
+
+        xml do
+          element "doc"
+          map_element "t", to: :t
+        end
+      end
+    end
+
+    it "keeps undefined entities literal" do
+      parsed = model_class.from_xml("<doc><t>a &amp; b &copy; d</t></doc>")
+      expect(parsed.t).to eq("a & b &copy; d")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.36
+  version: 0.8.38
 platform: ruby
 authors:
 - Ribose Inc.
@@ -776,6 +776,7 @@ files:
 - lib/lutaml/xml/format.rb
 - lib/lutaml/xml/format_chooser.rb
 - lib/lutaml/xml/hoisting_algorithm.rb
+- lib/lutaml/xml/html_entities.rb
 - lib/lutaml/xml/leptris/element.rb
 - lib/lutaml/xml/listener.rb
 - lib/lutaml/xml/mapping.rb
@@ -1686,6 +1687,7 @@ files:
 - spec/lutaml/key_value/transformation/value_serializer_spec.rb
 - spec/lutaml/key_value/transformation_spec.rb
 - spec/lutaml/model/absent_value_contracts_spec.rb
+- spec/lutaml/model/adapter_resolver_configured_spec.rb
 - spec/lutaml/model/attribute_apply_value_map_spec.rb
 - spec/lutaml/model/attribute_collection_spec.rb
 - spec/lutaml/model/attribute_default_cache_spec.rb
@@ -1715,6 +1717,7 @@ files:
 - 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_method_context_spec.rb
 - spec/lutaml/model/custom_model_spec.rb
 - spec/lutaml/model/custom_serialization_spec.rb
 - spec/lutaml/model/custom_vobject_adapter_spec.rb
@@ -1743,6 +1746,7 @@ files:
 - spec/lutaml/model/key_value_data_model/key_value_element_spec.rb
 - spec/lutaml/model/key_value_mapping_spec.rb
 - spec/lutaml/model/lazy_collection_spec.rb
+- spec/lutaml/model/liquefiable_lazy_spec.rb
 - spec/lutaml/model/liquefiable_spec.rb
 - spec/lutaml/model/liquid/indexed_access_spec.rb
 - spec/lutaml/model/liquid_compatibility_spec.rb
@@ -1750,6 +1754,7 @@ files:
 - spec/lutaml/model/map_all_spec.rb
 - spec/lutaml/model/map_content_spec.rb
 - spec/lutaml/model/mapping_rule_perf_guard_spec.rb
+- spec/lutaml/model/mapping_type_validation_spec.rb
 - spec/lutaml/model/mixed_content_spec.rb
 - spec/lutaml/model/model_transformer_spec.rb
 - spec/lutaml/model/multiple_mapping_spec.rb
@@ -1783,6 +1788,7 @@ files:
 - spec/lutaml/model/schema/renderers/union_spec.rb
 - spec/lutaml/model/schema/xsd_schema_spec.rb
 - spec/lutaml/model/schema/yaml_schema_spec.rb
+- spec/lutaml/model/sequence_choice_compositor_spec.rb
 - spec/lutaml/model/sequence_spec.rb
 - spec/lutaml/model/serializable_spec.rb
 - spec/lutaml/model/serializable_validation_spec.rb
@@ -1855,6 +1861,7 @@ files:
 - spec/lutaml/model/xsd_type_spec.rb
 - spec/lutaml/model/xsd_type_validation_spec.rb
 - spec/lutaml/model/yaml_adapter_spec.rb
+- spec/lutaml/model/yaml_stream_spec.rb
 - spec/lutaml/model/yamls/standard_adapter_spec.rb
 - spec/lutaml/model/yamls_range_spec.rb
 - spec/lutaml/model/yamls_sequence_spec.rb
@@ -1909,6 +1916,7 @@ files:
 - spec/lutaml/xml/format_chooser_spec.rb
 - spec/lutaml/xml/fpi_namespace_spec.rb
 - spec/lutaml/xml/general_namespace_spec.rb
+- spec/lutaml/xml/html_entities_spec.rb
 - spec/lutaml/xml/indent_spec.rb
 - spec/lutaml/xml/line_ending_spec.rb
 - spec/lutaml/xml/mapping_finalization_guard_spec.rb