glossarist 2.14.15 → 2.14.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 655f02b361ee905c65608800454cda81b99801df1abf0432527d81e0a664ee51
-  data.tar.gz: 2af428ac0c45bf6dacb03dd93c5c325dcfd04b63263f2704eeda13371319fd38
+  metadata.gz: a584d4edbe83762292055fa2a0e6af624d66a277b511a28ad34e01f03e4c05fc
+  data.tar.gz: d5e638432a0d281469f4531b4ded63047b68b8005cbdaeade9d09a32c75172dd
 SHA512:
-  metadata.gz: 98bec4dd3f9d1db11a79391ec081ca840ca1dd6c1b5b33a6cc0bfe066989c6d7f52b2ca3787fed77ef0e75e96bc0e999e6ced1965c0872c3debffbc316a6f365
-  data.tar.gz: 8430eebf7f31174bd40959db9826a0bb334452cc4ce8560853d42c936e2964de25a404094d1766bdbfef12325f81d05f77b514dea7c3a842f8fc0bd6fc943746
+  metadata.gz: c1804db5d0ea4deaf8e87a35545570856a42d66593d8cf07e93bf43a1e81b464a13bd875590f022c6f548c0438a595f5b74d1e98ab394eed22f7d478cc229903
+  data.tar.gz: 6d5db078479e2824d7dfd82baa39a127e86f04bcfd1eee56be26000d6b5f372a23a31f0a39e5bdd66cdb765d241f5c80981d748fe7883cb093c0c11bcb6ddbc3

data/docs/data-format.adoc

@@ -150,24 +150,38 @@ Both snake_case and camelCase keys are accepted on read; the writer emits snake_
 
 == Relations (relations/)
 
-One file per n-ary relation, named `<slug>.yaml` under the comprehensive concept's id:
+One file per n-ary relation (hyperedge), named `<criterion-slug>.yaml` under the comprehensive concept's id. The `type` field distinguishes the relation kind (`partitive_relation`, `generic_relation`, ...):
 
 [,yaml]
 ----
 ---
+type: partitive_relation
 comprehensive:
-  ref: urn:my-glossary:concept:3a75582e-...
-partitives:
-- ref: urn:my-glossary:concept:4b0e2358-...
-  multiplicity: compulsory      # or optional / compulsory_multiple / ...
+  source: VIM
+  id: '112-02-09'
+members:
+- ref:
+    source: VIM
+    id: '112-02-10'
+  presence: required          # or optional (ISO 704 line style)
+  count: exactly_one          # or at_least_one / multiple
   is_delimiting: false
-- ref: urn:my-glossary:concept:5c1f3469-...
+- ref:
+    source: VIM
+    id: '112-03-26'
 completeness: complete          # or partial
 criterion:
-  eng: physical structure
+  eng: measurement result composition
 ----
 
-ISO 704 requires at least two partitives; `Validation::Rules` enforces structural invariants (GLS-2xx series).
+ISO 704 requires at least two members per relation; `Validation::Rules` enforces structural invariants (GLS-2xx series).
+
+A single comprehensive concept can carry N hyperedges (one per criterion of subdivision), each in its own file under `relations/<comprehensive-id>/`. Legacy files with a `partitives:` key (member list with the `multiplicity` enum instead of the `presence`/`count` decomposition) are read for backward compatibility; the writer emits the `members` form above.
+
+[NOTE]
+--
+*Remaining transition step.* The concept-model shapes' property path still reads `hasPartitiveRelation`; the v3.3 shape bump renames it to `hasMember` (the native ontology property). The wire keys and semantics shown here are current.
+--
 
 == bibliography.yaml
 

data/lib/glossarist/managed_concept_collection.rb

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
 module Glossarist
+  # Deprecated: retained for ABI compatibility only. No internal callers
+  # remain — build concepts as a plain Array and persist through
+  # GlossaryStore. Removal is slated for the next major release.
   class ManagedConceptCollection
     include Enumerable
 
     attr_accessor :managed_concepts
 
     def initialize(file_key: nil)
+      warn "[glossarist] ManagedConceptCollection is deprecated; use a " \
+           "plain Array and GlossaryStore (removal slated for 3.0)"
       @managed_concepts = []
       @managed_concepts_ids = {}
       @file_key = file_key

data/lib/glossarist/resolution_adapter/bibliography.rb

@@ -15,7 +15,12 @@ module Glossarist
         return nil unless reference.is_a?(ConceptReference)
         return nil unless reference.source == @source_id
 
-        concepts.by_id_and(reference.concept_id, reference.version)
+        # concepts is any Enumerable of ManagedConcepts (Array or
+        # GlossaryStore); match the uuid or the data id, with version.
+        concepts.find do |c|
+          (c.uuid == reference.concept_id || c.data&.id == reference.concept_id) &&
+            (reference.version.nil? || c.version == reference.version)
+        end
       end
     end
   end

data/lib/glossarist/sts/importer.rb

@@ -58,7 +58,7 @@ module Glossarist
         save_to_path(existing, dataset_path)
 
         ImportResult.new(
-          concepts: existing.managed_concepts,
+          concepts: existing,
           conflicts: result_state.conflicts,
           source_files: xml_files,
           skipped_count: result_state.skipped,
@@ -78,7 +78,7 @@ module Glossarist
           existing_mc = index[key]
 
           if existing_mc.nil?
-            existing.store(mc)
+            existing << mc
             index[key] = mc
           else
             state.conflicts << DuplicateConflict.new(
@@ -179,26 +179,26 @@ module Glossarist
       end
 
       def replace_in_collection(collection, old_mc, new_mc)
-        collection.managed_concepts.delete(old_mc)
-        collection.store(new_mc)
+        collection.delete(old_mc)
+        collection << new_mc
       end
 
       def load_existing(path)
-        collection = ManagedConceptCollection.new
+        collection = []
         if path.end_with?(".gcr")
           package = GcrPackage.load(path)
-          package.concepts.each { |mc| collection.store(mc) }
+          package.concepts.each { |mc| collection << mc }
         else
           GlossaryStore.new.tap do |s|
             s.load(path)
-          end.each_concept { |mc| collection.store(mc) }
+          end.each_concept { |mc| collection << mc }
         end
         collection
       end
 
       def save_to_path(collection, path)
         if path.end_with?(".gcr")
-          tmpdir = build_temp_dataset(collection.managed_concepts)
+          tmpdir = build_temp_dataset(collection)
           begin
             GC.start
             tmp_gcr = "#{path}.tmp.#{Process.pid}"
@@ -215,7 +215,7 @@ module Glossarist
             FileUtils.rm_f(tmp_gcr)
           end
         else
-          save_dataset(collection.managed_concepts, path)
+          save_dataset(collection, path)
         end
       end
 

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.14.15"
+  VERSION = "2.14.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.14.15
+  version: 2.14.16
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-10 00:00:00.000000000 Z
+date: 2026-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model