glossarist 2.8.10 → 2.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d52bb386f776f12beb9671c25c5f1ce8330ff8349df68d734c80fa3937cec6f
-  data.tar.gz: 43cab5da334046a266967ba590d9791ee56f1fe283110075c880ddb8f5ec8344
+  metadata.gz: 9c5365426551b5a43eb67d58bd80ec429cc27c7c2d374f45abb7911da3dde329
+  data.tar.gz: 86394c15f0f7c8db4101682aeb99f2c44aa89f79012c931a59365d3426488a39
 SHA512:
-  metadata.gz: 6364fe8da9e37fdf669b2064fa244ad7f97f745cc4059243e4d1a337e710aff0ad1f1a6034573504b6106708cc9ed153e8fd9a6f1396d504c5d8b45e917c6e15
-  data.tar.gz: 71ac705f2149e4995b1476a2802a3f5361e8d8733435d3fda15b7f2033d4ac62c72183b11770032bda22c6e6de8fadc8798f80c6f9af636b2e06828571d16d30
+  metadata.gz: 7434ab207294cbbf27f257a3368e7a7e588594d87fd6a3c896668625625c587dc135609664991e7ebd91077429a7d3bc6a7f2aee46d015666048be32a4f830ba
+  data.tar.gz: 745e77b7e667e43fd05d1b96ab44d44c808092f5c2547e95ffa8d84bca1115d21a0d8756d917eaefc024ba78cf51f2e4818e077b0a74492d2b1383304043a256

data/lib/glossarist/concept_data.rb

@@ -86,7 +86,7 @@ module Glossarist
     def all_sources
       list = sources.to_a
       self.class.detailed_definition_fields.each do |field|
-        send(field).each { |d| list.concat(d.sources.to_a) }
+        public_send(field).each { |d| list.concat(d.sources.to_a) }
       end
       Array(terms).each { |t| list.concat(Array(t.sources)) }
       list
@@ -95,7 +95,7 @@ module Glossarist
     def text_content
       texts = []
       self.class.detailed_definition_fields.each do |field|
-        send(field).each { |d| texts << d.content if d.content }
+        public_send(field).each { |d| texts << d.content if d.content }
       end
       texts
     end

data/lib/glossarist/concept_set.rb

@@ -67,7 +67,11 @@ module Glossarist
 
     def normalize_definition(definition)
       definition.gsub(/{{([^}]*)}}/) do |_match|
-        "\\textbf{\\gls{#{Regexp.last_match[1].tr('_', '-')}}}"
+        inner = Regexp.last_match[1]
+        # Mention syntax: {{identifier}} or {{identifier, render term}}
+        # Use the identifier (first part before comma) as the gloss label.
+        label = inner.split(",", 2).first.strip.tr("_", "-")
+        "\\textbf{\\gls{#{label}}}"
       end
     end
 

data/lib/glossarist/managed_concept.rb

@@ -13,19 +13,28 @@ module Glossarist
     attribute :status, :string,
               values: Glossarist::GlossaryDefinition::CONCEPT_STATUSES
 
-    attribute :identifier, :string
-    alias :id :identifier
-    alias :id= :identifier=
-
     attribute :uuid, :string
 
     attribute :version, :string
     attribute :schema_version, :string
 
+    # identifier and id are aliases for uuid — the concept's canonical
+    # identity. There is one source of truth: uuid, serialized to the
+    # YAML "id" key. Having separate identifier/uuid attributes that both
+    # map to the same key caused dual-mapping fragility.
+    def identifier
+      uuid
+    end
+
+    def identifier=(value)
+      self.uuid = value
+    end
+
+    alias :id :identifier
+    alias :id= :identifier=
+
     key_value do
       map :data, to: :data
-      map :identifier,
-          with: { to: :identifier_to_yaml, from: :identifier_from_yaml }
       map :related, to: :related
       map :dates, to: :dates
       map :sources, to: :sources
@@ -74,15 +83,6 @@ module Glossarist
       )
     end
 
-    def identifier_to_yaml(model, doc)
-      value = model.identifier || model.id
-      doc["id"] = value if value && !doc["id"]
-    end
-
-    def identifier_from_yaml(model, value)
-      model.identifier = value || model.identifier
-    end
-
     def localized_concepts=(localized_concepts_collection) # rubocop:disable Metrics/AbcSize
       return unless localized_concepts_collection
 

data/lib/glossarist/sts/term_extractor.rb

@@ -253,9 +253,10 @@ module Glossarist
       end
 
       def extract_ref_text(ref)
-        if ref.respond_to?(:content) && ref.content.is_a?(Array)
+        case ref
+        when ::Sts::IsoSts::StdRef
           normalize_whitespace(ref.content.join.to_s)
-        elsif ref.respond_to?(:value)
+        when ::Sts::NisoSts::StandardRef
           normalize_whitespace(ref.value.to_s)
         else
           ""

data/lib/glossarist/transforms/concept_to_gloss_transform.rb

@@ -122,7 +122,7 @@ module Glossarist
 
         dd_attrs = if data
                      data.class.detailed_definition_fields.to_h do |field|
-                       [field, build_gloss_definitions(data.send(field))]
+                       [field, build_gloss_definitions(data.public_send(field))]
                      end
                    else
                      { definition: [], notes: [], examples: [] }

data/lib/glossarist/v2/managed_concept.rb

@@ -9,15 +9,13 @@ module Glossarist
 
       key_value do
         map :data, to: :data
-        map :id, with: { to: :identifier_to_yaml, from: :identifier_from_yaml }
-        map :identifier,
-            with: { to: :identifier_to_yaml, from: :identifier_from_yaml }
         map :related, to: :related
         map :dates, to: :dates
         map %i[date_accepted dateAccepted],
             with: { from: :date_accepted_from_yaml, to: :date_accepted_to_yaml }
         map :status, to: :status
-        map :uuid, to: :uuid, with: { from: :uuid_from_yaml, to: :uuid_to_yaml }
+        map %i[id uuid], to: :uuid,
+                         with: { from: :uuid_from_yaml, to: :uuid_to_yaml }
         map :sources, to: :sources
       end
     end

data/lib/glossarist/v3/managed_concept.rb

@@ -9,15 +9,13 @@ module Glossarist
 
       key_value do
         map :data, to: :data
-        map :id, with: { to: :identifier_to_yaml, from: :identifier_from_yaml }
-        map :identifier,
-            with: { to: :identifier_to_yaml, from: :identifier_from_yaml }
         map :related, to: :related
         map :dates, to: :dates
         map %i[date_accepted dateAccepted],
             with: { from: :date_accepted_from_yaml, to: :date_accepted_to_yaml }
         map :status, to: :status
-        map :uuid, to: :uuid, with: { from: :uuid_from_yaml, to: :uuid_to_yaml }
+        map %i[id uuid], to: :uuid,
+                         with: { from: :uuid_from_yaml, to: :uuid_to_yaml }
         map :schema_version, to: :schema_version
         map :sources, to: :sources
       end

data/lib/glossarist/validation/rules/asciidoc_xref_rule.rb

@@ -14,30 +14,20 @@ module Glossarist
         end
 
         def check(context)
-          concept = context.concept
           fname = context.file_name
-          extractor = ReferenceExtractor.new
           issues = []
 
-          concept.localizations.each do |l10n|
-            lang = l10n.language_code || "unknown"
-
-            l10n.text_content.each do |text|
-              next unless text
-
-              extractor.extract_from_text(text).each do |ref|
-                next unless ref.is_a?(BibliographicReference)
-                next if context.bibliography_index.resolve?(ref.anchor)
-
-                issues << issue(
-                  "unresolved bibliography reference <<#{ref.anchor}>>",
-                  code: code, severity: severity,
-                  location: "#{fname}/#{lang}",
-                  suggestion: "add '#{ref.anchor}' as a source, " \
-                              "or verify it exists in bibliography.yaml"
-                )
-              end
-            end
+          context.references.each do |ref|
+            next unless ref.is_a?(BibliographicReference)
+            next if context.bibliography_index.resolve?(ref.anchor)
+
+            issues << issue(
+              "unresolved bibliography reference <<#{ref.anchor}>>",
+              code: code, severity: severity,
+              location: fname,
+              suggestion: "add '#{ref.anchor}' as a source, " \
+                          "or verify it exists in bibliography.yaml"
+            )
           end
 
           issues

data/lib/glossarist/validation/rules/cite_ref_integrity_rule.rb

@@ -19,7 +19,7 @@ module Glossarist
           issues = []
 
           check_unique_source_ids(concept, fname, issues)
-          check_unresolved_mentions(concept, fname, issues)
+          check_unresolved_mentions(context, concept, fname, issues)
 
           issues
         end
@@ -46,8 +46,8 @@ module Glossarist
           end
         end
 
-        def check_unresolved_mentions(concept, fname, issues)
-          keys = cite_mention_keys(concept)
+        def check_unresolved_mentions(context, concept, fname, issues)
+          keys = cite_mention_keys(context)
           return if keys.empty?
 
           known_ids = concept.all_sources.filter_map(&:id).to_set
@@ -63,9 +63,8 @@ module Glossarist
           end
         end
 
-        def cite_mention_keys(concept)
-          extractor = ReferenceExtractor.new
-          extractor.extract_from_managed_concept(concept)
+        def cite_mention_keys(context)
+          context.references
             .select(&:cite?)
             .filter_map(&:concept_id)
         end

data/lib/glossarist/validation/rules/concept_context.rb

@@ -3,6 +3,12 @@
 module Glossarist
   module Validation
     module Rules
+      # Shared context for concept-scoped validation rules.
+      #
+      # Provides lazy-memoized access to extracted references so that multiple
+      # rules examining the same concept share one extraction pass (DRY,
+      # single source of truth). Rules ask the context for references rather
+      # than instantiating their own ReferenceExtractor.
       class ConceptContext
         attr_reader :concept, :file_name, :collection_context
 
@@ -16,6 +22,24 @@ module Glossarist
           @concept.data&.id&.to_s
         end
 
+        # All references extracted from the concept's text fields
+        # (definitions, notes, examples) via {{...}} mentions, <<xrefs>>,
+        # and image::...[] references. Includes ConceptReference,
+        # BibliographicReference, and AssetReference objects.
+        # Memoized — extracted once per concept, shared across all rules.
+        def references
+          @references ||= ReferenceExtractor.new
+            .extract_from_managed_concept(@concept)
+        end
+
+        # All asset references (NonVerbRep, GraphicalSymbol) extracted
+        # from the concept's model attributes.
+        # Memoized — extracted once per concept, shared across all rules.
+        def asset_references
+          @asset_references ||= ReferenceExtractor.new
+            .extract_asset_refs_from_concept(@concept)
+        end
+
         def bibliography_index
           @collection_context.bibliography_index
         end

data/lib/glossarist/validation/rules/concept_mention_rule.rb

@@ -14,12 +14,10 @@ module Glossarist
         end
 
         def check(context)
-          concept = context.concept
           fname = context.file_name
-          extractor = ReferenceExtractor.new
           issues = []
 
-          refs = extractor.extract_from_managed_concept(concept)
+          refs = context.references
             .select { |r| r.is_a?(ConceptReference) && r.local? }
 
           refs.each do |ref|

data/lib/glossarist/validation/rules/image_reference_rule.rb

@@ -14,33 +14,22 @@ module Glossarist
         end
 
         def check(context)
-          concept = context.concept
           fname = context.file_name
-          extractor = ReferenceExtractor.new
           issues = []
 
-          concept.localizations.each do |l10n|
-            lang = l10n.language_code || "unknown"
-
-            l10n.text_content.each do |text|
-              next unless text
-
-              extractor.extract_from_text(text).each do |ref|
-                next unless ref.is_a?(AssetReference)
-                next if context.asset_index.resolve?(ref.path)
+          context.references.each do |ref|
+            next unless ref.is_a?(AssetReference)
+            next if context.asset_index.resolve?(ref.path)
 
-                issues << issue(
-                  "unresolved image reference #{ref.path}",
-                  code: "GLS-103", severity: severity,
-                  location: "#{fname}/#{lang}",
-                  suggestion: "add '#{ref.path}' to the dataset's images/ directory"
-                )
-              end
-            end
+            issues << issue(
+              "unresolved image reference #{ref.path}",
+              code: "GLS-103", severity: severity,
+              location: fname,
+              suggestion: "add '#{ref.path}' to the dataset's images/ directory"
+            )
           end
 
-          asset_refs = extractor.extract_asset_refs_from_concept(concept)
-          asset_refs.each do |ref|
+          context.asset_references.each do |ref|
             next if context.asset_index.resolve?(ref.path)
 
             issues << issue(

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.8.10"
+  VERSION = "2.8.11"
 end

metadata

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