lutaml-model 0.8.16 → 0.8.17

data/spec/lutaml/xml/enhanced_mapping_spec.rb

@@ -187,6 +187,235 @@ RSpec.describe "Enhanced XML Mapping Features" do
         expect(name_rule.form).to eq(:unqualified)
       end
     end
+
+    context "with Serializable child and form: :qualified" do
+      # Regression: form option on the parent's map_element rule must be
+      # propagated to the child XmlElement when the child is a Serializable
+      # (which goes through create_transformed_nested_element). Otherwise the
+      # ElementFormOptionRule cannot fire and the element is serialized
+      # without the namespace prefix.
+      let(:child_class) do
+        ns = namespace_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :label, :string
+
+          xml do
+            element "child"
+            namespace ns
+            map_element "label", to: :label
+          end
+        end
+      end
+
+      let(:model_class) do
+        ns = namespace_class
+        child = child_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :child, child
+
+          xml do
+            element "item"
+            namespace ns
+            map_element "child", to: :child, form: :qualified
+          end
+        end
+      end
+
+      it "stores form: :qualified on the parent rule" do
+        mapping = model_class.mappings_for(:xml)
+        child_rule = mapping.find_element(:child)
+        expect(child_rule.form).to eq(:qualified)
+      end
+
+      it "serializes the nested Serializable with a namespace prefix" do
+        instance = model_class.new(child: child_class.new(label: "x"))
+        doc = Nokogiri::XML(instance.to_xml)
+        qualified = doc.at_xpath("//*[name()='ex:child']")
+        expect(qualified).not_to be_nil
+        expect(qualified.at_xpath("./xmlns:label").text).to eq("x")
+      end
+
+      it "round-trips the qualified Serializable child" do
+        original = model_class.new(child: child_class.new(label: "round-trip"))
+        restored = model_class.from_xml(original.to_xml)
+        expect(restored.child.label).to eq("round-trip")
+      end
+    end
+
+    context "with Serializable child and form: :unqualified" do
+      # Symmetric to the :qualified case: form: :unqualified must propagate
+      # to the child XmlElement so ElementFormOptionRule can force the
+      # default (unprefixed) form.
+      let(:child_class) do
+        ns = namespace_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :label, :string
+
+          xml do
+            element "child"
+            namespace ns
+            map_element "label", to: :label
+          end
+        end
+      end
+
+      let(:model_class) do
+        ns = namespace_class
+        child = child_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :child, child
+
+          xml do
+            element "item"
+            namespace ns
+            map_element "child", to: :child, form: :unqualified
+          end
+        end
+      end
+
+      it "propagates form: :unqualified and emits an unprefixed child" do
+        instance = model_class.new(child: child_class.new(label: "x"))
+        doc = Nokogiri::XML(instance.to_xml)
+        expect(doc.xpath("//*[name()='ex:child']")).to be_empty
+        expect(doc.at_xpath("//*[local-name()='child']")).not_to be_nil
+      end
+    end
+
+    context "with a collection of Serializable children" do
+      # The form option must propagate to every element produced for a
+      # collection attribute, not just the first.
+      let(:child_class) do
+        ns = namespace_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :label, :string
+
+          xml do
+            element "child"
+            namespace ns
+            map_element "label", to: :label
+          end
+        end
+      end
+
+      let(:model_class) do
+        ns = namespace_class
+        child = child_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :children, child, collection: true
+
+          xml do
+            element "item"
+            namespace ns
+            map_element "child", to: :children, form: :qualified
+          end
+        end
+      end
+
+      it "qualifies every child in the collection" do
+        instance = model_class.new(
+          children: [child_class.new(label: "a"), child_class.new(label: "b")],
+        )
+        doc = Nokogiri::XML(instance.to_xml)
+        qualified = doc.xpath("//*[name()='ex:child']")
+        labels = qualified.map { |c| c.at_xpath("./xmlns:label").text }
+        expect(labels).to contain_exactly("a", "b")
+      end
+    end
+
+    context "with a Serializable child containing a Serializable grandchild" do
+      # form: :qualified is a per-rule override; it must NOT propagate
+      # transitively to grandchildren. Each level applies its own rule and
+      # its own parent_element_form_default.
+      let(:grandchild_class) do
+        ns = namespace_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :value, :string
+
+          xml do
+            element "grandchild"
+            namespace ns
+            map_element "value", to: :value
+          end
+        end
+      end
+
+      let(:child_class) do
+        ns = namespace_class
+        grandchild = grandchild_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :inner, grandchild
+
+          xml do
+            element "child"
+            namespace ns
+            map_element "grandchild", to: :inner
+          end
+        end
+      end
+
+      let(:model_class) do
+        ns = namespace_class
+        child = child_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :child, child
+
+          xml do
+            element "item"
+            namespace ns
+            map_element "child", to: :child, form: :qualified
+          end
+        end
+      end
+
+      it "qualifies the child but leaves the grandchild unprefixed" do
+        instance = model_class.new(
+          child: child_class.new(inner: grandchild_class.new(value: "x")),
+        )
+        doc = Nokogiri::XML(instance.to_xml)
+        expect(doc.at_xpath("//*[name()='ex:child']")).not_to be_nil
+        expect(doc.xpath("//*[name()='ex:grandchild']")).to be_empty
+        expect(doc.at_xpath("//*[local-name()='grandchild']")).not_to be_nil
+      end
+    end
+
+    context "with Serializable child but no form override" do
+      # Sanity: when no form: :qualified is set on the rule, the W3C
+      # element_form_default :unqualified override should still kick in and
+      # the nested Serializable should serialize unprefixed.
+      let(:child_class) do
+        ns = namespace_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :label, :string
+
+          xml do
+            element "child"
+            namespace ns
+            map_element "label", to: :label
+          end
+        end
+      end
+
+      let(:model_class) do
+        ns = namespace_class
+        child = child_class
+        Class.new(Lutaml::Model::Serializable) do
+          attribute :child, child
+
+          xml do
+            element "item"
+            namespace ns
+            map_element "child", to: :child
+          end
+        end
+      end
+
+      it "honors element_form_default :unqualified by leaving the child unprefixed" do
+        instance = model_class.new(child: child_class.new(label: "x"))
+        doc = Nokogiri::XML(instance.to_xml)
+        expect(doc.xpath("//*[name()='ex:child']")).to be_empty
+        expect(doc.at_xpath("//*[local-name()='child']")).not_to be_nil
+      end
+    end
   end
 
   describe "form option on map_attribute" do
@@ -222,7 +451,7 @@ RSpec.describe "Enhanced XML Mapping Features" do
         instance = model_class.new(id: "ABC123")
         xml = instance.to_xml
         # Form affects qualification but implementation varies by adapter
-        expect(xml).to match(/id="ABC123"/)
+        expect(xml).to include('id="ABC123"')
       end
     end
 

data/spec/lutaml/xml/mapping_spec.rb

@@ -86,16 +86,16 @@ module XmlMappingSpec
   end
 
   class Address < Lutaml::Model::Serializable
-    attribute :street, ::Lutaml::Model::Type::String, raw: true
-    attribute :city, :string, raw: true
+    attribute :street, ::Lutaml::Model::Type::String
+    attribute :city, :string
     attribute :text, :string
     attribute :address, Address
 
     xml do
       element "address"
 
-      map_element "street", to: :street
-      map_element "city", to: :city
+      map_element "street", to: :street, raw: :content
+      map_element "city", to: :city, raw: :content
       map_element "text", to: :text
     end
   end

data/spec/lutaml/xml/namespace_placement_spec.rb

@@ -91,18 +91,21 @@ RSpec.describe "XML Namespace Placement" do
       end
 
       # This is the INCORRECT pattern - namespace at class level for Models
-      broken_model = Class.new do
-        include Lutaml::Model::Serialize
+      broken_model = nil
+      expect do
+        broken_model = Class.new do
+          include Lutaml::Model::Serialize
 
-        namespace ns # ❌ This doesn't work for Serializable classes!
+          namespace ns # ❌ This doesn't work for Serializable classes!
 
-        attribute :value, :string
+          attribute :value, :string
 
-        xml do
-          element "broken"
-          map_content to: :value
+          xml do
+            element "broken"
+            map_content to: :value
+          end
         end
-      end
+      end.to output(/DEPRECATION WARNING.*Class-level.*namespace/).to_stderr
 
       parent_ns = Class.new(Lutaml::Xml::W3c::XmlNamespace) do
         uri "http://example.com/parent"

data/spec/lutaml/xml/namespace_three_phase_spec.rb

@@ -251,7 +251,7 @@ RSpec.describe "Three-phase namespace algorithm" do
         expect(xml).to include("<version>4.0</version>")
 
         # Should NOT add redundant prefix
-        expect(xml).not_to match(/<vcard:version>/)
+        expect(xml).not_to include("<vcard:version>")
       end
     end
   end

data/spec/lutaml/xml/prefix_control_spec.rb

@@ -100,8 +100,8 @@ RSpec.describe "XML Prefix Control" do
           expect(xml).to include('<custom:Properties xmlns:custom="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties">')
           expect(xml).to include("<custom:Template>Normal.dotm</custom:Template>")
           # Should not have redundant declarations
-          expect(xml).not_to match(/xmlns="/)
-          expect(xml).not_to match(/xmlns:app=/)
+          expect(xml).not_to include('xmlns="')
+          expect(xml).not_to include("xmlns:app=")
         end
       end
 
@@ -208,8 +208,8 @@ RSpec.describe "XML Prefix Control" do
           expect(xml).to include('<custom:Properties xmlns:custom="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties">')
           expect(xml).to include("<custom:Template>Normal.dotm</custom:Template>")
           # Should not have redundant declarations
-          expect(xml).not_to match(/xmlns="/)
-          expect(xml).not_to match(/xmlns:app=/)
+          expect(xml).not_to include('xmlns="')
+          expect(xml).not_to include("xmlns:app=")
         end
       end
 

data/spec/lutaml/xml/serializable_namespace_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Lutaml::Model::Serializable, "namespace directive" do
       model_class = Class.new do
         include Lutaml::Model::Serialize
       end
-      model_class.namespace(test_namespace)
+      expect { model_class.namespace(test_namespace) }.to output.to_stderr
 
       expect(model_class.namespace).to eq(test_namespace)
     end
@@ -49,7 +49,7 @@ RSpec.describe Lutaml::Model::Serializable, "namespace directive" do
       model_class = Class.new do
         include Lutaml::Model::Serialize
       end
-      model_class.namespace(test_namespace)
+      expect { model_class.namespace(test_namespace) }.to output.to_stderr
       model_class.namespace(other_namespace)
 
       expect(model_class.namespace).to eq(other_namespace)
@@ -61,7 +61,7 @@ RSpec.describe Lutaml::Model::Serializable, "namespace directive" do
       model_class = Class.new do
         include Lutaml::Model::Serialize
       end
-      model_class.namespace(test_namespace)
+      expect { model_class.namespace(test_namespace) }.to output.to_stderr
 
       expect(model_class.namespace_uri).to eq("https://example.com/model")
     end
@@ -80,7 +80,7 @@ RSpec.describe Lutaml::Model::Serializable, "namespace directive" do
       model_class = Class.new do
         include Lutaml::Model::Serialize
       end
-      model_class.namespace(test_namespace)
+      expect { model_class.namespace(test_namespace) }.to output.to_stderr
 
       expect(model_class.namespace_prefix).to eq("model")
     end
@@ -103,7 +103,7 @@ RSpec.describe Lutaml::Model::Serializable, "namespace directive" do
         attribute :value, :integer
       end
 
-      model_class.namespace(test_namespace)
+      expect { model_class.namespace(test_namespace) }.to output.to_stderr
 
       expect(model_class.namespace).to eq(test_namespace)
       expect(model_class.attributes.keys).to include(:name, :value)
@@ -113,7 +113,7 @@ RSpec.describe Lutaml::Model::Serializable, "namespace directive" do
       parent_class = Class.new do
         include Lutaml::Model::Serialize
       end
-      parent_class.namespace(test_namespace)
+      expect { parent_class.namespace(test_namespace) }.to output.to_stderr
 
       child_class = Class.new(parent_class)
 

data/spec/lutaml/xml/type_namespace_examples_spec.rb

@@ -453,7 +453,7 @@ RSpec.describe "Type Namespace Examples" do
       serialized = props.to_xml
 
       # xsi:type attribute should use xsi: namespace from XsiTypeType
-      expect(serialized).to match(/xsi:type="dcterms:W3CDTF"/)
+      expect(serialized).to include('xsi:type="dcterms:W3CDTF"')
     end
 
     it "handles multiple Type namespaces in single document" do

data/spec/lutaml/xml/type_namespace_integration_spec.rb

@@ -189,8 +189,8 @@ RSpec.describe "Type-level namespace integration" do
       expect(xml).to include('id="doc1"')
       expect(xml).to include('title="Test"')
       # Should not have any namespace prefix
-      expect(xml).not_to match(/:id=/)
-      expect(xml).not_to match(/:title=/)
+      expect(xml).not_to include(":id=")
+      expect(xml).not_to include(":title=")
     end
   end
 
@@ -268,11 +268,11 @@ RSpec.describe "Type-level namespace integration" do
       document_class = Class.new do
         include Lutaml::Model::Serialize
 
-        namespace model_namespace
         attribute :special_field, special_type
 
         xml do
           element "document"
+          namespace model_namespace
           map_element "special_field", to: :special_field
         end
 

data/spec/lutaml/yamlld/adapter_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "lutaml/yamlld"
+
+RSpec.describe Lutaml::YamlLd::Adapter do
+  let(:yamlld_hash) do
+    {
+      "@context" => { "name" => "http://example.org/name" },
+      "@type" => "Thing",
+      "name" => "test",
+    }
+  end
+
+  describe ".parse" do
+    it "parses valid YAML-LD string to hash" do
+      yaml = YAML.dump(yamlld_hash)
+      result = described_class.parse(yaml)
+      expect(result).to eq(yamlld_hash)
+    end
+  end
+
+  describe "#to_yamlld" do
+    it "generates YAML-LD string from hash" do
+      adapter = described_class.new(yamlld_hash)
+      result = adapter.to_yamlld
+      parsed = YAML.safe_load(result)
+      expect(parsed["@context"]).to eq({ "name" => "http://example.org/name" })
+    end
+  end
+
+  it "round-trips parse → generate" do
+    yaml = YAML.dump(yamlld_hash)
+    parsed = described_class.parse(yaml)
+    adapter = described_class.new(parsed)
+    result = adapter.to_yamlld
+    round_tripped = YAML.safe_load(result)
+    expect(round_tripped).to eq(yamlld_hash)
+  end
+
+  describe "safe_load enforcement" do
+    it "rejects YAML with disallowed class tags" do
+      unsafe = "--- !ruby/object:Object {}\n"
+      expect do
+        described_class.parse(unsafe)
+      end.to raise_error(Psych::DisallowedClass)
+    end
+
+    it "rejects malformed YAML with Psych::SyntaxError" do
+      malformed = "@context: [unterminated"
+      expect do
+        described_class.parse(malformed)
+      end.to raise_error(Psych::SyntaxError)
+    end
+  end
+end

data/spec/lutaml/yamlld/registration_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "lutaml/jsonld"
+require "lutaml/yamlld"
+
+RSpec.describe ":yamlld format registration" do
+  it "is registered with FormatRegistry as an RDF format" do
+    expect(Lutaml::Model::FormatRegistry.rdf_formats).to include(:yamlld)
+  end
+
+  it "uses Rdf::Mapping as the mapping class" do
+    expect(Lutaml::Model::FormatRegistry.mappings_class_for(:yamlld))
+      .to eq(Lutaml::Rdf::Mapping)
+  end
+
+  it "uses YamlLd::Adapter as the adapter class" do
+    expect(Lutaml::Model::FormatRegistry.adapter_class_for(:yamlld))
+      .to eq(Lutaml::YamlLd::Adapter)
+  end
+
+  it "shares LinkedDataTransform with :jsonld" do
+    expect(Lutaml::Model::FormatRegistry.transformer_for(:yamlld))
+      .to eq(Lutaml::Rdf::LinkedDataTransform)
+    expect(Lutaml::Model::FormatRegistry.transformer_for(:yamlld))
+      .to eq(Lutaml::Model::FormatRegistry.transformer_for(:jsonld))
+  end
+
+  it "declares Psych::SyntaxError as a parse error type" do
+    expect(Lutaml::Model::FormatRegistry.error_types_for(:yamlld))
+      .to include("Psych::SyntaxError")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.16
+  version: 0.8.17
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-05 00:00:00.000000000 Z
+date: 2026-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -322,9 +322,6 @@ files:
 - lib/lutaml/jsonl/adapter/transform.rb
 - lib/lutaml/jsonld.rb
 - lib/lutaml/jsonld/adapter.rb
-- lib/lutaml/jsonld/context.rb
-- lib/lutaml/jsonld/term_definition.rb
-- lib/lutaml/jsonld/transform.rb
 - lib/lutaml/key_value.rb
 - lib/lutaml/key_value/adapter.rb
 - lib/lutaml/key_value/adapter/hash.rb
@@ -607,9 +604,11 @@ files:
 - lib/lutaml/model/yaml.rb
 - lib/lutaml/model/yamls.rb
 - lib/lutaml/rdf.rb
+- lib/lutaml/rdf/context.rb
 - lib/lutaml/rdf/error.rb
 - lib/lutaml/rdf/iri.rb
 - lib/lutaml/rdf/language_tagged.rb
+- lib/lutaml/rdf/linked_data_transform.rb
 - lib/lutaml/rdf/literal.rb
 - lib/lutaml/rdf/mapping.rb
 - lib/lutaml/rdf/mapping_rule.rb
@@ -623,6 +622,7 @@ files:
 - lib/lutaml/rdf/namespaces/rdfs_namespace.rb
 - lib/lutaml/rdf/namespaces/skos_namespace.rb
 - lib/lutaml/rdf/namespaces/xsd_namespace.rb
+- lib/lutaml/rdf/term_definition.rb
 - lib/lutaml/rdf/transform.rb
 - lib/lutaml/toml.rb
 - lib/lutaml/toml/adapter.rb
@@ -853,6 +853,8 @@ files:
 - lib/lutaml/yaml/schema.rb
 - lib/lutaml/yaml/schema/yaml_schema.rb
 - lib/lutaml/yaml/type/serializers.rb
+- lib/lutaml/yamlld.rb
+- lib/lutaml/yamlld/adapter.rb
 - lib/lutaml/yamls.rb
 - lib/lutaml/yamls/adapter.rb
 - lib/lutaml/yamls/adapter/document.rb
@@ -1560,9 +1562,6 @@ files:
 - spec/lutaml/integration/multi_format_spec.rb
 - spec/lutaml/integration/round_trip_spec.rb
 - spec/lutaml/jsonld/adapter_spec.rb
-- spec/lutaml/jsonld/context_spec.rb
-- spec/lutaml/jsonld/term_definition_spec.rb
-- spec/lutaml/jsonld/transform_spec.rb
 - spec/lutaml/key_value/transformation/collection_serializer_spec.rb
 - spec/lutaml/key_value/transformation/rule_compiler_spec.rb
 - spec/lutaml/key_value/transformation/value_serializer_spec.rb
@@ -1573,6 +1572,7 @@ files:
 - spec/lutaml/model/attribute_spec.rb
 - spec/lutaml/model/cached_type_resolver_spec.rb
 - spec/lutaml/model/cdata_spec.rb
+- spec/lutaml/model/choice_restrict_spec.rb
 - spec/lutaml/model/choice_spec.rb
 - spec/lutaml/model/cli_spec.rb
 - spec/lutaml/model/collection_index_spec.rb
@@ -1714,8 +1714,10 @@ files:
 - spec/lutaml/model/yamls_sequence_spec.rb
 - spec/lutaml/model/yamls_spec.rb
 - spec/lutaml/model_spec.rb
+- spec/lutaml/rdf/context_spec.rb
 - spec/lutaml/rdf/graph_serialization_spec.rb
 - spec/lutaml/rdf/iri_spec.rb
+- spec/lutaml/rdf/linked_data_transform_spec.rb
 - spec/lutaml/rdf/literal_spec.rb
 - spec/lutaml/rdf/mapping_rule_spec.rb
 - spec/lutaml/rdf/mapping_spec.rb
@@ -1723,6 +1725,7 @@ files:
 - spec/lutaml/rdf/namespace_set_spec.rb
 - spec/lutaml/rdf/namespace_spec.rb
 - spec/lutaml/rdf/rdf_transform_spec.rb
+- spec/lutaml/rdf/term_definition_spec.rb
 - spec/lutaml/turtle/adapter_spec.rb
 - spec/lutaml/turtle/mapping_spec.rb
 - spec/lutaml/turtle/transform_spec.rb
@@ -1849,6 +1852,8 @@ files:
 - spec/lutaml/xml/xml_space_spec.rb
 - spec/lutaml/xml/xml_space_type_spec.rb
 - spec/lutaml/xml/xml_spec.rb
+- spec/lutaml/yamlld/adapter_spec.rb
+- spec/lutaml/yamlld/registration_spec.rb
 - spec/parent_root_spec.rb
 - spec/person_spec.rb
 - spec/sample_model_spec.rb