lutaml-model 0.8.14 → 0.8.16

data/spec/lutaml/rdf/member_rule_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require_relative "../../../lib/lutaml/rdf"
 
 RSpec.describe Lutaml::Rdf::MemberRule do
   describe ".new" do
@@ -26,10 +27,19 @@ RSpec.describe Lutaml::Rdf::MemberRule do
                                  namespace: Lutaml::Rdf::Namespaces::SkosNamespace)
       expect(rule.predicate_name).to eq(:member)
     end
+
+    it "raises ArgumentError when predicate_name and link both given" do
+      expect do
+        described_class.new(:items,
+                            predicate_name: :member,
+                            namespace: Lutaml::Rdf::Namespaces::SkosNamespace,
+                            link: "skos:member")
+      end.to raise_error(ArgumentError, /mutually exclusive/)
+    end
   end
 
   describe "#linked?" do
-    it "returns false when no predicate_name" do
+    it "returns false when no linking option" do
       rule = described_class.new(:items)
       expect(rule.linked?).to be(false)
     end
@@ -40,6 +50,16 @@ RSpec.describe Lutaml::Rdf::MemberRule do
                                  namespace: Lutaml::Rdf::Namespaces::SkosNamespace)
       expect(rule.linked?).to be(true)
     end
+
+    it "returns true when link is a String" do
+      rule = described_class.new(:items, link: "skos:member")
+      expect(rule.linked?).to be(true)
+    end
+
+    it "returns true when link is a Proc" do
+      rule = described_class.new(:items, link: ->(m) { "skos:#{m}" })
+      expect(rule.linked?).to be(true)
+    end
   end
 
   describe "#linked_predicate_uri" do
@@ -54,5 +74,87 @@ RSpec.describe Lutaml::Rdf::MemberRule do
                                  namespace: Lutaml::Rdf::Namespaces::SkosNamespace)
       expect(rule.linked_predicate_uri).to eq("http://www.w3.org/2004/02/skos/core#member")
     end
+
+    it "returns nil when link is a String (not static)" do
+      rule = described_class.new(:items, link: "skos:member")
+      expect(rule.linked_predicate_uri).to be_nil
+    end
+  end
+
+  describe "#link_predicate_for" do
+    let(:mapping) do
+      instance = Lutaml::Rdf::Mapping.new
+      instance.namespace(
+        Lutaml::Rdf::Namespaces::SkosNamespace,
+        Lutaml::Rdf::Namespaces::DctermsNamespace,
+      )
+      instance
+    end
+
+    let(:resolver) { mapping.namespace_set.method(:resolve_compact_iri) }
+
+    it "resolves String link via resolver" do
+      rule = described_class.new(:items, link: "skos:member")
+      expect(rule.link_predicate_for(nil, resolver))
+        .to eq("http://www.w3.org/2004/02/skos/core#member")
+    end
+
+    it "resolves Proc link by calling with member" do
+      rule = described_class.new(:items,
+                                 link: ->(m) { "skos:#{m.type}" })
+      member = Struct.new(:type).new("Concept")
+      expect(rule.link_predicate_for(member, resolver))
+        .to eq("http://www.w3.org/2004/02/skos/core#Concept")
+    end
+
+    it "returns URI as-is from Proc when prefix not found" do
+      rule = described_class.new(:items,
+                                 link: ->(m) { "http://example.org/#{m.id}" })
+      member = Struct.new(:id).new("42")
+      expect(rule.link_predicate_for(member, resolver))
+        .to eq("http://example.org/42")
+    end
+
+    it "returns nil when no link" do
+      rule = described_class.new(:items)
+      expect(rule.link_predicate_for(nil, resolver)).to be_nil
+    end
+  end
+
+  describe "#resolve_link_uri" do
+    let(:mapping) do
+      instance = Lutaml::Rdf::Mapping.new
+      instance.namespace(Lutaml::Rdf::Namespaces::SkosNamespace)
+      instance
+    end
+
+    let(:resolver) { mapping.namespace_set.method(:resolve_compact_iri) }
+
+    it "uses linked_predicate_uri for static links" do
+      rule = described_class.new(:items,
+                                 predicate_name: :member,
+                                 namespace: Lutaml::Rdf::Namespaces::SkosNamespace)
+      expect(rule.resolve_link_uri(nil, resolver))
+        .to eq("http://www.w3.org/2004/02/skos/core#member")
+    end
+
+    it "uses link_predicate_for for String links" do
+      rule = described_class.new(:items, link: "skos:member")
+      expect(rule.resolve_link_uri(nil, resolver))
+        .to eq("http://www.w3.org/2004/02/skos/core#member")
+    end
+
+    it "uses link_predicate_for for Proc links" do
+      rule = described_class.new(:items,
+                                 link: ->(m) { "skos:#{m.type}" })
+      member = Struct.new(:type).new("Concept")
+      expect(rule.resolve_link_uri(member, resolver))
+        .to eq("http://www.w3.org/2004/02/skos/core#Concept")
+    end
+
+    it "returns nil when not linked" do
+      rule = described_class.new(:items)
+      expect(rule.resolve_link_uri(nil, resolver)).to be_nil
+    end
   end
 end

data/spec/lutaml/turtle/transform_spec.rb

@@ -585,4 +585,148 @@ RSpec.describe Lutaml::Turtle::Transform do
       skip "Heterogeneous collection requires union-typed attribute (not yet supported)"
     end
   end
+
+  describe "dynamic link predicates" do
+    before do
+      stub_const("DynChild", Class.new(Lutaml::Model::Serializable) do
+        attribute :label, :string
+        attribute :cid, :string
+
+        turtle do
+          namespace Lutaml::Rdf::Namespaces::SkosNamespace
+
+          subject { |m| "http://example.org/child/#{m.cid}" } # rubocop:disable RSpec/NamedSubject, RSpec/MultipleSubjects
+
+          type "skos:Concept"
+
+          predicate :prefLabel,
+                    namespace: Lutaml::Rdf::Namespaces::SkosNamespace,
+                    to: :label
+        end
+      end)
+
+      stub_const("DynParent", Class.new(Lutaml::Model::Serializable) do
+        attribute :name, :string
+        attribute :children, DynChild, collection: true
+
+        turtle do
+          namespace Lutaml::Rdf::Namespaces::SkosNamespace
+
+          subject { |m| "http://example.org/parent/#{m.name}" }
+
+          type "skos:Collection"
+
+          predicate :prefLabel,
+                    namespace: Lutaml::Rdf::Namespaces::SkosNamespace,
+                    to: :name
+
+          members :children, link: "skos:member"
+        end
+      end)
+    end
+
+    it "generates linking triples from String link" do
+      parent = DynParent.new(
+        name: "p1",
+        children: [DynChild.new(label: "c1", cid: "a")],
+      )
+      result = parent.to_turtle
+      expect(result).to include("skos:member <http://example.org/child/a>")
+    end
+
+    it "includes child subgraph data" do
+      parent = DynParent.new(
+        name: "p1",
+        children: [DynChild.new(label: "c1", cid: "a")],
+      )
+      result = parent.to_turtle
+      expect(result).to include("skos:prefLabel \"c1\"")
+    end
+  end
+
+  describe "recursive prefix collection" do
+    before do
+      stub_const("SkosNs", Lutaml::Rdf::Namespaces::SkosNamespace)
+      stub_const("DctermsNs", Lutaml::Rdf::Namespaces::DctermsNamespace)
+
+      stub_const("LeafModel", Class.new(Lutaml::Model::Serializable) do
+        attribute :value, :string
+        attribute :lid, :string
+
+        turtle do
+          namespace DctermsNs
+
+          subject { |m| "http://example.org/leaf/#{m.lid}" } # rubocop:disable RSpec/NamedSubject, RSpec/MultipleSubjects
+
+          type "dcterms:Agent"
+
+          predicate :title, namespace: DctermsNs, to: :value
+        end
+      end)
+
+      stub_const("MidModel", Class.new(Lutaml::Model::Serializable) do
+        attribute :name, :string
+        attribute :mid, :string
+        attribute :leaves, LeafModel, collection: true
+
+        turtle do
+          namespace SkosNs, DctermsNs
+
+          subject { |m| "http://example.org/mid/#{m.mid}" } # rubocop:disable RSpec/NamedSubject, RSpec/MultipleSubjects
+
+          type "skos:Concept"
+
+          predicate :prefLabel, namespace: SkosNs, to: :name
+
+          members :leaves, link: "skos:member"
+        end
+      end)
+
+      stub_const("RootModel", Class.new(Lutaml::Model::Serializable) do
+        attribute :title, :string
+        attribute :mids, MidModel, collection: true
+
+        turtle do
+          namespace SkosNs
+
+          subject { |m| "http://example.org/root/#{m.title}" }
+
+          type "skos:Collection"
+
+          predicate :prefLabel, namespace: SkosNs, to: :title
+
+          members :mids, link: "skos:member"
+        end
+      end)
+    end
+
+    it "collects prefixes from all nesting levels" do
+      root = RootModel.new(
+        title: "r1",
+        mids: [MidModel.new(
+          name: "m1",
+          mid: "a",
+          leaves: [LeafModel.new(value: "l1", lid: "x")],
+        )],
+      )
+      result = root.to_turtle
+      expect(result).to include("@prefix skos:")
+      expect(result).to include("@prefix dcterms:")
+    end
+
+    it "emits triples from all nesting levels" do
+      root = RootModel.new(
+        title: "r1",
+        mids: [MidModel.new(
+          name: "m1",
+          mid: "a",
+          leaves: [LeafModel.new(value: "l1", lid: "x")],
+        )],
+      )
+      result = root.to_turtle
+      expect(result).to include("skos:prefLabel \"r1\"")
+      expect(result).to include("skos:prefLabel \"m1\"")
+      expect(result).to include("dcterms:title \"l1\"")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-31 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -90,16 +90,16 @@ dependencies:
   name: moxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -476,6 +476,7 @@ files:
 - lib/lutaml/model/jsonl.rb
 - lib/lutaml/model/liquefiable.rb
 - lib/lutaml/model/liquid.rb
+- lib/lutaml/model/liquid/indexed_access.rb
 - lib/lutaml/model/liquid/mapping.rb
 - lib/lutaml/model/mapping/listener.rb
 - lib/lutaml/model/mapping/mapping.rb
@@ -1611,6 +1612,7 @@ files:
 - spec/lutaml/model/key_value_mapping_spec.rb
 - spec/lutaml/model/lazy_collection_spec.rb
 - spec/lutaml/model/liquefiable_spec.rb
+- spec/lutaml/model/liquid/indexed_access_spec.rb
 - spec/lutaml/model/liquid_compatibility_spec.rb
 - spec/lutaml/model/logger_spec.rb
 - spec/lutaml/model/map_all_spec.rb
@@ -1626,6 +1628,7 @@ files:
 - spec/lutaml/model/ordered_content_spec.rb
 - spec/lutaml/model/polymorphic_spec.rb
 - spec/lutaml/model/processing_instruction_spec.rb
+- spec/lutaml/model/raw_element_spec.rb
 - spec/lutaml/model/register_key_value_spec.rb
 - spec/lutaml/model/register_methods_spec.rb
 - spec/lutaml/model/register_spec.rb