glossarist 2.8.5 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb636339e439da216185715fcfe387842aabd1b38147dd49b5e4fdb5909b6d2d
-  data.tar.gz: 2704b81c1f4d179d8909bc1d245b9caee83d2e54fa56a6148699892f021e9d6f
+  metadata.gz: b6de74f1a2e3c9d3379f35ccf94a46a0d407149329e27fa95521e40e8a22c883
+  data.tar.gz: 2159f19a3d6c355b7bafba1f76d3f673fe3a0813af919479c1835dbcd609dbd7
 SHA512:
-  metadata.gz: 5e39df7a02295426fb6463f93189cf6e3d457e60457b9bb5cde1881eeb549fe1afd4730e3ac280030be8de60734dbc2e0532b14030890e107b9df35dabbd1ede
-  data.tar.gz: 5e4ef4cf71118c020f29b105bb81bb19d753dcb9484f367d0a2caab0b51927e7bcf69e325549bb4e7f44f9f1ec571ffb4223710ca8cc7987dd10eb4750148514
+  metadata.gz: 9c46b4f37c08ce6d40158098c5b39006b319a3dab247660a43aa4ebb82ba7527ee9898ccf1513e960abf56a6987dea8b083d9b11b4cff2306d66e5e0b054af03
+  data.tar.gz: 4bb9c91a99347f353bcabb17702d13e295f50323173c8fd25fde164af7ac0ea117d38542b9e03449fd386e253f31cd003832310ce5cc5b3f85e4c34978a33fdd

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-06-04 14:04:56 UTC using RuboCop version 1.86.1.
+# on 2026-06-09 09:29:01 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,90 +11,13 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'glossarist.gemspec'
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'spec/unit/section_spec.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'spec/unit/section_spec.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Layout/BlockEndNewline:
-  Exclude:
-    - 'spec/unit/section_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/glossarist/section.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLines:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/FirstHashElementIndentation:
-  Exclude:
-    - 'spec/unit/section_spec.rb'
-
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'spec/unit/dataset_register_spec.rb'
-    - 'spec/unit/section_spec.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
-# SupportedStylesAlignWith: start_of_line, relative_to_receiver
-Layout/IndentationWidth:
-  Exclude:
-    - 'spec/unit/section_spec.rb'
-
-# Offense count: 424
+# Offense count: 419
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineHashBraceLayout:
-  Exclude:
-    - 'spec/unit/section_spec.rb'
-
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'spec/unit/dataset_register_spec.rb'
-    - 'spec/unit/section_spec.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
@@ -116,12 +39,12 @@ Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/glossarist/dataset_validator.rb'
 
-# Offense count: 85
+# Offense count: 84
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 8
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
@@ -142,7 +65,7 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 38
+# Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Enabled: false
@@ -154,17 +77,6 @@ Naming/MethodParameterName:
   Exclude:
     - 'lib/glossarist/schema_migration.rb'
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/unit/section_spec.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.

data/lib/glossarist/citation.rb

@@ -15,6 +15,7 @@ module Glossarist
     end
 
     attribute :ref, Ref
+    attribute :text, :string
     attribute :locality, Locality
     attribute :link, :string
     attribute :original, :string
@@ -35,6 +36,10 @@ module Glossarist
       parts.empty? ? nil : parts.join(" ")
     end
 
+    def text
+      @text || label
+    end
+
     def locality_from_yaml(model, value)
       locality = Locality.new
 

data/lib/glossarist/concept_data.rb

@@ -67,6 +67,10 @@ module Glossarist
       doc["terms"] = model.terms&.map(&:to_yaml_hash)
     end
 
+    def self.detailed_definition_fields
+      %i[definition notes examples]
+    end
+
     def date_accepted
       return nil unless dates
 
@@ -81,18 +85,22 @@ module Glossarist
 
     def all_sources
       list = sources.to_a
-      definition.each { |d| list.concat(d.sources.to_a) }
-      notes.each { |n| list.concat(n.sources.to_a) }
-      examples.each { |e| list.concat(e.sources.to_a) }
+      self.class.detailed_definition_fields.each do |field|
+        send(field).each { |d| list.concat(d.sources.to_a) }
+      end
       list
     end
 
     def text_content
       texts = []
-      definition.each { |d| texts << d.content if d.content }
-      notes.each { |n| texts << n.content if n.content }
-      examples.each { |e| texts << e.content if e.content }
+      self.class.detailed_definition_fields.each do |field|
+        send(field).each { |d| texts << d.content if d.content }
+      end
       texts
     end
+
+    def annotations
+      @annotations ||= Collections::DetailedDefinitionCollection.new
+    end
   end
 end

data/lib/glossarist/concept_manager.rb

@@ -50,6 +50,7 @@ module Glossarist
 
     def load_concept_from_file(filename) # rubocop:disable Metrics/CyclomaticComplexity
       raw = File.read(filename, encoding: "utf-8")
+      self.version = detect_version(raw)
       doc = concept_document_class.from_yamls(raw)
       concept = doc.concept
       unless concept
@@ -166,6 +167,14 @@ module Glossarist
       end
     end
 
+    def detect_version(raw)
+      if (m = raw.match(/^schema_version:\s*v?(\d)/))
+        m[1]
+      else
+        version
+      end
+    end
+
     def v1_collection?
       @v1_collection ||= !Dir.glob(File.join(path,
                                              "concept-*.{yaml,yml}")).empty?

data/lib/glossarist/concept_ref.rb

@@ -4,10 +4,12 @@ module Glossarist
   class ConceptRef < Lutaml::Model::Serializable
     attribute :source, :string
     attribute :id, :string
+    attribute :text, :string
 
     key_value do
       map :source, to: :source
       map :id, to: :id
+      map :text, to: :text
     end
   end
 end

data/lib/glossarist/designation/base.rb

@@ -14,7 +14,7 @@ module Glossarist
       attribute :pronunciation, Pronunciation, collection: true
       attribute :sources, ConceptSource, collection: true
       attribute :term_type, :string
-      attribute :related, RelatedConcept, collection: true
+      attribute :related, DesignationRelationship, collection: true
 
       key_value do
         map :type, to: :type

data/lib/glossarist/designation/designation_relationship.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Glossarist
+  module Designation
+    class DesignationRelationship < Lutaml::Model::Serializable
+      attribute :content, :string
+      attribute :type, :string,
+                values: Glossarist::GlossaryDefinition::DESIGNATION_RELATIONSHIP_TYPES
+      attribute :target, :string
+
+      key_value do
+        map :content, to: :content
+        map :type, to: :type
+        map :target, to: :target
+      end
+    end
+  end
+end

data/lib/glossarist/designation.rb

@@ -2,7 +2,9 @@
 
 module Glossarist
   module Designation
-    autoload :Base,              "glossarist/designation/base"
+    autoload :Base, "glossarist/designation/base"
+    autoload :DesignationRelationship,
+             "glossarist/designation/designation_relationship"
     autoload :Expression,        "glossarist/designation/expression"
     autoload :Abbreviation,      "glossarist/designation/abbreviation"
     autoload :GrammarInfo,       "glossarist/designation/grammar_info"

data/lib/glossarist/rdf/gloss_designation.rb

@@ -26,10 +26,19 @@ module Glossarist
       dsl.members :pronunciations, link: "gloss:hasPronunciation"
       dsl.members :sources
 
-      RelationshipPredicates::DESIGNATION_REL_PREDICATES.each do |type, (ns, name)|
-        dsl.predicate name, namespace: ns, to: :"#{type}_targets",
+      # Concept-level lexical relationships mapped to designation RDF predicates (URI refs)
+      {
+        homograph: RelationshipPredicates::DESIGNATION_REL_PREDICATES[:homograph],
+        false_friend: RelationshipPredicates::DESIGNATION_REL_PREDICATES[:false_friend],
+      }.each do |_type, (ns, name)|
+        dsl.predicate name, namespace: ns, to: :"#{_type}_targets",
                             uri_reference: true
       end
+
+      # Designation-level relationships (literal target text)
+      RelationshipPredicates::DESIGNATION_ONLY_PREDICATES.each do |_type, (ns, name)|
+        dsl.predicate name, namespace: ns, to: :"#{_type}_targets"
+      end
     }.freeze
 
     DESIGNATION_NAMESPACES = [

data/lib/glossarist/rdf/gloss_localized_concept.rb

@@ -17,6 +17,7 @@ module Glossarist
       attribute :definitions, GlossDetailedDefinition, collection: true
       attribute :notes, GlossDetailedDefinition, collection: true
       attribute :examples, GlossDetailedDefinition, collection: true
+      attribute :annotations, GlossDetailedDefinition, collection: true
       attribute :sources, GlossConceptSource, collection: true
       attribute :non_verb_reps, GlossNonVerbalRep, collection: true
 
@@ -55,6 +56,8 @@ module Glossarist
                 link: "gloss:hasNote"
         members :examples,
                 link: "gloss:hasExample"
+        members :annotations,
+                link: "gloss:hasAnnotation"
         members :sources,
                 link: "gloss:hasSource"
         members :non_verb_reps,

data/lib/glossarist/rdf/relationship_predicates.rb

@@ -53,6 +53,10 @@ module Glossarist
 
       ALL_REL_PREDICATES = CONCEPT_REL_PREDICATES.merge(DESIGNATION_REL_PREDICATES).freeze
 
+      DESIGNATION_ONLY_PREDICATES = DESIGNATION_REL_PREDICATES.slice(
+        :abbreviated_form_for, :short_form_for
+      ).freeze
+
       def self.related_targets_by_type(related_concepts, predicate_map)
         targets = group_targets(related_concepts, predicate_map)
         predicate_map.each_key.to_h do |type|
@@ -60,6 +64,19 @@ module Glossarist
         end
       end
 
+      def self.designation_targets_by_type(relationships, predicate_map)
+        valid = Array(relationships).select do |r|
+          r.target && predicate_map.key?(r.type.to_sym)
+        end
+        targets = valid
+          .group_by { |r| r.type.to_sym }
+          .transform_values { |rs| rs.map(&:target) }
+          .transform_keys { |type| :"#{type}_targets" }
+        predicate_map.each_key.to_h do |type|
+          [:"#{type}_targets", targets[:"#{type}_targets"] || []]
+        end
+      end
+
       def self.group_targets(related_concepts, predicate_map)
         valid = valid_related(related_concepts, predicate_map)
         valid

data/lib/glossarist/transforms/concept_to_gloss_transform.rb

@@ -120,9 +120,14 @@ module Glossarist
           build_gloss_designation(desig, concept_id, lang, idx)
         end
 
-        definitions = build_gloss_definitions(data&.definition)
-        notes = build_gloss_definitions(data&.notes)
-        examples = build_gloss_definitions(data&.examples)
+        dd_attrs = if data
+                     data.class.detailed_definition_fields.to_h do |field|
+                       [field, build_gloss_definitions(data.send(field))]
+                     end
+                   else
+                     { definition: [], notes: [], examples: [] }
+                   end
+
         sources = build_gloss_sources(data&.sources)
         non_verb_reps = build_gloss_non_verbal_reps(l10n.non_verb_rep,
                                                     concept_id, lang)
@@ -137,9 +142,7 @@ module Glossarist
           script: data&.script,
           system: data&.system,
           designations: designations,
-          definitions: definitions,
-          notes: notes,
-          examples: examples,
+          **dd_attrs,
           sources: sources,
           non_verb_reps: non_verb_reps,
         )
@@ -150,9 +153,9 @@ module Glossarist
         instance = designation_instance_for(desig, common_attrs, concept_id,
                                             lang, index)
 
-        rel_targets = Rdf::RelationshipPredicates.related_targets_by_type(
+        rel_targets = Rdf::RelationshipPredicates.designation_targets_by_type(
           desig.related,
-          Rdf::RelationshipPredicates::DESIGNATION_REL_PREDICATES,
+          Rdf::RelationshipPredicates::DESIGNATION_ONLY_PREDICATES,
         )
         rel_targets.each do |attr_name, targets|
           instance.public_send(:"#{attr_name}=", targets) unless targets.empty?

data/lib/glossarist/v3/citation.rb

@@ -7,6 +7,8 @@ module Glossarist
         map :ref, to: :ref, with: { from: :ref_from_yaml, to: :ref_to_yaml }
       end
 
+      alias_method :text, :label
+
       def ref_from_yaml(model, value)
         case value
         when Hash

data/lib/glossarist/v3/concept_data.rb

@@ -15,8 +15,15 @@ module Glossarist
       attribute :notes, V3::DetailedDefinition,
                 collection: Collections::DetailedDefinitionCollection,
                 initialize_empty: true
+      attribute :annotations, V3::DetailedDefinition,
+                collection: Collections::DetailedDefinitionCollection,
+                initialize_empty: true
       attribute :related, V3::RelatedConcept, collection: true
 
+      def self.detailed_definition_fields
+        super + %i[annotations]
+      end
+
       key_value do
         map :dates, to: :dates
         map :definition, to: :definition
@@ -25,6 +32,7 @@ module Glossarist
         map %i[lineage_source_similarity lineageSourceSimilarity],
             to: :lineage_source_similarity
         map :notes, to: :notes
+        map :annotations, to: :annotations
         map :release, to: :release
         map :sources, to: :sources
         map :terms, to: :terms,

data/lib/glossarist/v3/managed_concept_data.rb

@@ -17,6 +17,7 @@ module Glossarist
                                 with: { from: :domains_from_yaml, to: :domains_to_yaml }
         map :tags, to: :tags
         map :sources, to: :sources
+        map :related, to: :related
         map :localizations, to: :localizations,
                             with: { from: :localizations_from_yaml, to: :localizations_to_yaml }
       end

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.8.5"
+  VERSION = "2.8.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.7
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-04 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -221,6 +221,7 @@ files:
 - lib/glossarist/designation.rb
 - lib/glossarist/designation/abbreviation.rb
 - lib/glossarist/designation/base.rb
+- lib/glossarist/designation/designation_relationship.rb
 - lib/glossarist/designation/expression.rb
 - lib/glossarist/designation/grammar_info.rb
 - lib/glossarist/designation/graphical_symbol.rb