glossarist 2.8.16 → 2.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dff1f025f20e6cfad5028acb99816984ddef4cd4a231991345a633c42ae5794
-  data.tar.gz: 7eed6c0df552c7206225460f212500fac6e4c7f3bc47d04bf75bb11acd53af7d
+  metadata.gz: 329df9970677060f9f81cac4f093d384da792884955b4ee26335339a6df0d36f
+  data.tar.gz: 1b94ff574c689ecd72123cb7d879b69bfca401f027dfece4c4ade72ca02b9a4a
 SHA512:
-  metadata.gz: 01bda07bdfcff32b5526b33e19bd38074f0eeeab585bdf739593c95f9edacdd85cff549ce7430b53a027b18b1cd011a99a33454f71fdb2163c57be6bb1a1affb
-  data.tar.gz: f9e036c52fa7fa63dab55c8623bd47bc46af544d1fa3660368c8f41ef9c9155373ca92ac91116c8f8d7ff18b1ca9e093fde4f6e25ce0ca7b8194c9724b2df75d
+  metadata.gz: f4edbf8bf5b20ca8054e3f1fb678b60b19ead2dd0585d2c71b8bafd648b0553b8c917a918f4be97be2bbb535611504d73a5b98c9383a278938a18dee74942c88
+  data.tar.gz: 3d83adb27ae450854727c7345dd6d2219ea9abc3449fcb092321093fc0a42aaf709e59c85607dff8c1e36e8c2483bbcfefb48c21cb3673574509c9f108703eec

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-06-13 04:17:12 UTC using RuboCop version 1.86.1.
+# on 2026-07-02 16:08:41 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,101 +11,13 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'glossarist.gemspec'
 
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'lib/glossarist/errors.rb'
-    - 'lib/glossarist/reference_resolver.rb'
-    - 'lib/glossarist/schema_migration/v0_to_v1.rb'
-    - 'lib/glossarist/schema_migration/v2_to_v3.rb'
-    - 'spec/unit/reference_resolver_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth.
-Layout/AssignmentIndentation:
-  Exclude:
-    - 'lib/glossarist/schema_migration/v0_to_v1.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'lib/glossarist/sts/importer.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/BlockEndNewline:
-  Exclude:
-    - 'lib/glossarist/sts/importer.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ClosingParenthesisIndentation:
-  Exclude:
-    - 'spec/unit/concept_source_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Layout/FirstArgumentIndentation:
-  Exclude:
-    - 'spec/unit/concept_source_spec.rb'
-
-# Offense count: 3
-# 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:
-    - 'lib/glossarist/managed_concept.rb'
-    - 'lib/glossarist/schema_migration/v0_to_v1.rb'
-    - 'spec/unit/validation/rules/cite_ref_integrity_rule_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
-# SupportedStylesAlignWith: start_of_line, relative_to_receiver
-Layout/IndentationWidth:
-  Exclude:
-    - 'lib/glossarist/sts/importer.rb'
-
-# Offense count: 449
+# Offense count: 469
 # 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/MultilineMethodCallBraceLayout:
-  Exclude:
-    - 'spec/unit/concept_source_spec.rb'
-
-# Offense count: 11
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'lib/glossarist/errors.rb'
-    - 'lib/glossarist/managed_concept.rb'
-    - 'lib/glossarist/reference_resolver.rb'
-    - 'lib/glossarist/schema_migration/v0_to_v1.rb'
-    - 'lib/glossarist/schema_migration/v2_to_v3.rb'
-    - 'spec/unit/reference_resolver_spec.rb'
-    - 'spec/unit/validation/rules/cite_ref_integrity_rule_spec.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
@@ -132,7 +44,7 @@ Lint/UselessConstantScoping:
   Exclude:
     - 'lib/glossarist/sts/term_extractor.rb'
 
-# Offense count: 89
+# Offense count: 91
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
@@ -143,12 +55,12 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 41
 
-# Offense count: 58
+# Offense count: 59
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 109
+# Offense count: 108
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 47
@@ -163,17 +75,6 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-# Offense count: 1
-# 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:
-    - 'lib/glossarist/sts/importer.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.
@@ -187,18 +88,6 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - 'scripts/migrate_dataset.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineIfModifier:
-  Exclude:
-    - 'lib/glossarist/schema_migration/v0_to_v1.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpCharacterClass:
-  Exclude:
-    - 'lib/glossarist/sts/term_extractor.rb'
-
 # Offense count: 3
 # Configuration parameters: Max.
 Style/SafeNavigationChainLength:
@@ -206,11 +95,3 @@ Style/SafeNavigationChainLength:
     - 'lib/glossarist/managed_concept.rb'
     - 'lib/glossarist/transforms/concept_to_tbx_transform.rb'
     - 'lib/glossarist/validation/rules/source_urn_format_rule.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'spec/unit/concept_source_spec.rb'

data/lib/glossarist/concept.rb

@@ -84,9 +84,9 @@ module Glossarist
     end
 
     def date_accepted_to_yaml(model, doc)
-      if model.date_accepted
-        doc["date_accepted"] = model.date_accepted.date.iso8601
-      end
+      return unless model.date_accepted
+
+      doc["date_accepted"] = model.date_accepted.to_yaml_date
     end
 
     def date_accepted_from_yaml(model, value)
@@ -96,10 +96,6 @@ module Glossarist
       model.data.dates << ConceptDate.of_yaml(
         { "date" => value, "type" => "accepted" },
       )
-
-      model.date_accepted = model.data.dates.find do |d|
-        d.type == "accepted"
-      end
     end
 
     def uuid

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|
-        public_send(field).each { |d| list.concat(d.sources.to_a) }
+        public_send(field).each { |d| list.concat(d.all_sources) }
       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|
-        public_send(field).each { |d| texts << d.content if d.content }
+        public_send(field).each { |d| texts.concat(d.text_content) }
       end
       texts
     end

data/lib/glossarist/concept_date.rb

@@ -12,5 +12,12 @@ module Glossarist
       map :date, to: :date
       map :type, to: :type
     end
+
+    # Returns the date as a string for flat YAML fields such as
+    # ManagedConcept#date_accepted. Subclasses whose `date` is not a
+    # DateTime override this so callers do not need to type-check.
+    def to_yaml_date
+      date&.iso8601
+    end
   end
 end

data/lib/glossarist/detailed_definition.rb

@@ -4,10 +4,26 @@ module Glossarist
   class DetailedDefinition < Lutaml::Model::Serializable
     attribute :content, :string
     attribute :sources, ConceptSource, collection: true
+    attribute :examples, DetailedDefinition, collection: true,
+                                             initialize_empty: true
 
     key_value do
       map :content, to: :content
       map :sources, to: :sources
+      map :examples, to: :examples
+    end
+
+    def all_sources
+      list = sources.to_a
+      examples.each { |example| list.concat(example.all_sources) }
+      list
+    end
+
+    def text_content
+      texts = []
+      texts << content if content
+      examples.each { |example| texts.concat(example.text_content) }
+      texts
     end
   end
 end

data/lib/glossarist/managed_concept.rb

@@ -63,9 +63,9 @@ module Glossarist
     end
 
     def date_accepted_to_yaml(model, doc)
-      if model.date_accepted
-        doc["date_accepted"] = model.date_accepted.date.iso8601
-      end
+      return unless model.date_accepted
+
+      doc["date_accepted"] = model.date_accepted.to_yaml_date
     end
 
     def uuid_to_yaml(model, doc)

data/lib/glossarist/rdf/gloss_detailed_definition.rb

@@ -7,6 +7,7 @@ module Glossarist
     class GlossDetailedDefinition < Lutaml::Model::Serializable
       attribute :content, :string
       attribute :sources, GlossConceptSource, collection: true
+      attribute :examples, GlossDetailedDefinition, collection: true
 
       rdf do
         namespace Namespaces::GlossaristNamespace, Namespaces::RdfNamespace
@@ -18,6 +19,7 @@ module Glossarist
         predicate :value, namespace: Namespaces::RdfNamespace, to: :content
 
         members :sources
+        members :examples, link: "gloss:hasExample"
       end
     end
   end

data/lib/glossarist/transforms/concept_to_gloss_transform.rb

@@ -232,6 +232,7 @@ module Glossarist
           Rdf::GlossDetailedDefinition.new(
             content: dd.content,
             sources: build_gloss_sources(dd.sources),
+            examples: build_gloss_definitions(dd.examples),
           )
         end
       end

data/lib/glossarist/v2/detailed_definition.rb

@@ -4,10 +4,13 @@ module Glossarist
   module V2
     class DetailedDefinition < Glossarist::DetailedDefinition
       attribute :sources, V2::ConceptSource, collection: true
+      attribute :examples, V2::DetailedDefinition, collection: true,
+                                                   initialize_empty: true
 
       key_value do
         map :content, to: :content
         map :sources, to: :sources
+        map :examples, to: :examples
       end
     end
   end

data/lib/glossarist/v3/concept_data.rb

@@ -6,6 +6,7 @@ module Glossarist
       attribute :sources, V3::ConceptSource,
                 collection: Collections::ConceptSourceCollection,
                 initialize_empty: true
+      attribute :dates, V3::ConceptDate, collection: true
       attribute :definition, V3::DetailedDefinition,
                 collection: Collections::DetailedDefinitionCollection,
                 initialize_empty: true

data/lib/glossarist/v3/concept_date.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Glossarist
+  module V3
+    # V3 variant of ConceptDate. The base {Glossarist::ConceptDate} types
+    # `date` as `:date_time` (ISO 8601 datetime only), but the v3 schema
+    # (`concept-model/schemas/v3/concept.yaml`) declares
+    #
+    #   concept_date:
+    #     properties:
+    #       date:
+    #         type: string
+    #         format: date
+    #
+    # which accepts any date string — full ISO 8601 datetime ("2023-01-01T00:00:00+00:00"),
+    # calendar date ("2023-01-01"), or year-only ("2023"). Datasets such as
+    # the IALA Dictionary (datasets/iala-*/concepts/*.yaml) use year-only
+    # strings for accepted/retired lifecycle markers, so the v3 model needs
+    # to round-trip those without losing the value.
+    #
+    # See BUG_REPORT.md for the full investigation.
+    class ConceptDate < Glossarist::ConceptDate
+      attribute :date, :string
+
+      key_value do
+        map :date, to: :date
+        map :type, to: :type
+      end
+
+      # The `date` is already a free-form string in V3, so the wire form
+      # is the value itself — no iso8601 coercion.
+      def to_yaml_date
+        date
+      end
+    end
+  end
+end

data/lib/glossarist/v3/detailed_definition.rb

@@ -4,10 +4,13 @@ module Glossarist
   module V3
     class DetailedDefinition < Glossarist::DetailedDefinition
       attribute :sources, V3::ConceptSource, collection: true
+      attribute :examples, V3::DetailedDefinition, collection: true,
+                                                   initialize_empty: true
 
       key_value do
         map :content, to: :content
         map :sources, to: :sources
+        map :examples, to: :examples
       end
     end
   end

data/lib/glossarist/v3/localized_concept.rb

@@ -4,6 +4,15 @@ module Glossarist
   module V3
     class LocalizedConcept < Glossarist::LocalizedConcept
       attribute :data, V3::ConceptData, default: -> { V3::ConceptData.new }
+
+      def date_accepted_from_yaml(model, value)
+        return if model.date_accepted
+
+        model.data.dates ||= []
+        model.data.dates << V3::ConceptDate.of_yaml(
+          { "date" => value, "type" => "accepted" },
+        )
+      end
     end
   end
 end

data/lib/glossarist/v3/managed_concept.rb

@@ -5,6 +5,8 @@ module Glossarist
     class ManagedConcept < Glossarist::ManagedConcept
       attribute :data, V3::ManagedConceptData, default: -> { V3::ManagedConceptData.new }
       attribute :related, V3::RelatedConcept, collection: true
+      attribute :dates, V3::ConceptDate, collection: true
+      attribute :date_accepted, V3::ConceptDate
       attribute :sources, V3::ConceptSource, collection: true
 
       key_value do
@@ -19,6 +21,12 @@ module Glossarist
         map :schema_version, to: :schema_version
         map :sources, to: :sources
       end
+
+      def date_accepted_from_yaml(model, value)
+        model.date_accepted = V3::ConceptDate.of_yaml(
+          { "date" => value, "type" => "accepted" },
+        )
+      end
     end
   end
 end

data/lib/glossarist/v3.rb

@@ -4,6 +4,7 @@ module Glossarist
   module V3
     autoload :Configuration, "glossarist/v3/configuration"
     autoload :Citation, "glossarist/v3/citation"
+    autoload :ConceptDate, "glossarist/v3/concept_date"
     autoload :ConceptSource, "glossarist/v3/concept_source"
     autoload :DetailedDefinition, "glossarist/v3/detailed_definition"
     autoload :ConceptRef, "glossarist/v3/concept_ref"
@@ -15,6 +16,7 @@ module Glossarist
     autoload :ConceptDocument, "glossarist/v3/concept_document"
 
     Configuration.register_model(Citation, id: :citation)
+    Configuration.register_model(ConceptDate, id: :concept_date)
     Configuration.register_model(ConceptSource, id: :concept_source)
     Configuration.register_model(DetailedDefinition, id: :detailed_definition)
     Configuration.register_model(ConceptData, id: :concept_data)

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.8.16"
+  VERSION = "2.8.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.8.16
+  version: 2.8.18
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-18 00:00:00.000000000 Z
+date: 2026-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -339,6 +339,7 @@ files:
 - lib/glossarist/v3.rb
 - lib/glossarist/v3/citation.rb
 - lib/glossarist/v3/concept_data.rb
+- lib/glossarist/v3/concept_date.rb
 - lib/glossarist/v3/concept_document.rb
 - lib/glossarist/v3/concept_ref.rb
 - lib/glossarist/v3/concept_source.rb