glossarist 2.14.6 → 2.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91f798fb9a6e12290005776acd08323536fae75a0c0aca50244656dd9c37109
-  data.tar.gz: 1407eba14312a21c622ac581c16d65be60d757f92af4cc19a58eec7376d9d81c
+  metadata.gz: 13bd1c87738d03e366e25dbc60880fe99635a283802c4ff83a69cd3cb5e9f4d1
+  data.tar.gz: 3b8df358c448ec07470d016f81685162f766a52f53fce14a0433179fea3771c8
 SHA512:
-  metadata.gz: a4b2a249a197c62a304addd573c7a67243cb7c511f2f52838eb19cd9a660b4ca94ea43cd4512b8f284c7b0d77c1b5bb9888e07f2a3f94f472e2170fa0a51e996
-  data.tar.gz: aa50a0cd63c34064f5bc72cc90757e937af34ba98c2bea4f2604ca9bfe7b1808b329062893fb1b3cc9c355539a939dc1b4f8c635cd3446f4b87aa4ff0a424074
+  metadata.gz: 7bafbc7f728f1c9cf436a30ca0bd9b2b914cbd0ffefd8fb28cca845666d9758fb3ec485ecf2cc29ce4e207809238e503fe84f9c1e424893422174b40e9a849e3
+  data.tar.gz: 4c439063dd3bfdb0155603d919500f57366fd93ca2ede8313574fcd86724628db584cc4a28489406d16a1c86523b032f2c5721c6c88a735653dbb4469a8e6a12

data/exe/glossarist

@@ -1,4 +1,10 @@
 #!/usr/bin/env ruby
 
 require_relative "../lib/glossarist"
-Glossarist::CLI.start(ARGV)
+
+begin
+  Glossarist::CLI.start(ARGV)
+rescue Glossarist::Errors::CliError => e
+  warn "Error: #{e.message}"
+  exit 1
+end

data/lib/glossarist/cli/export_command.rb

@@ -45,8 +45,7 @@ module Glossarist
 
         validate_outputs!(formats, output_dir, name) if validate?
       rescue ArgumentError => e
-        warn "Error: #{e.message}"
-        exit 1
+        raise Errors::CliError, e.message
       end
 
       private
@@ -248,10 +247,10 @@ module Glossarist
         files << File.join(output_dir, "#{name}.ttl") if File.exist?(File.join(output_dir, "#{name}.ttl"))
         files.concat(Dir.glob(File.join(output_dir, "concepts", "*.ttl")))
         report = validator.validate_files(files)
-        unless report.conformant?
-          warn report.to_s
-          exit 1
-        end
+        return if report.conformant?
+
+        warn report.to_s
+        raise Errors::CliError, "emitted Turtle failed SHACL validation"
       end
     end
   end

data/lib/glossarist/cli/import_command.rb

@@ -21,8 +21,7 @@ module Glossarist
 
         print_summary(result)
       rescue ArgumentError => e
-        warn "Error: #{e.message}"
-        exit 1
+        raise Errors::CliError, e.message
       end
 
       private

data/lib/glossarist/cli/package_command.rb

@@ -26,8 +26,7 @@ module Glossarist
 
         puts "Created #{@options[:output]}"
       rescue ArgumentError => e
-        warn "Error: #{e.message}"
-        exit 1
+        raise Errors::CliError, e.message
       end
 
       private

data/lib/glossarist/cli/upgrade_command.rb

@@ -18,8 +18,7 @@ module Glossarist
         )
         report(result)
       rescue ArgumentError => e
-        warn "Error: #{e.message}"
-        exit 1
+        raise Errors::CliError, e.message
       end
 
       private

data/lib/glossarist/cli/validate_command.rb

@@ -22,7 +22,10 @@ module Glossarist
 
         $stderr.print "\r#{' ' * 60}\r" if text_output
         report(result)
-        exit(1) unless result.errors.empty? && !strict_failure?(result)
+        return if result.errors.empty? && !strict_failure?(result)
+
+        raise Errors::CliError,
+              "dataset invalid: #{result.errors.size} error(s)"
       end
 
       private

data/lib/glossarist/concept.rb

@@ -22,11 +22,27 @@ module Glossarist
 
       map %i[date_accepted dateAccepted],
           with: { from: :date_accepted_from_yaml, to: :date_accepted_to_yaml }
-      map :uuid, to: :uuid, with: { to: :uuid_to_yaml, from: :uuid_from_yaml }
-      map :id, to: :id, with: { to: :id_to_yaml, from: :id_from_yaml }
+      # The concept's UUID serializes to the YAML "id" key (uuid_to_yaml),
+      # so reading must map "id" back to #uuid — not just #id — or a
+      # round-tripped document lazily derives a different, content-based
+      # UUID (#247). ManagedConcept already maps both keys this way.
+      map %i[id uuid], to: :uuid, with: { to: :uuid_to_yaml, from: :uuid_from_yaml }
       map :identifier, to: :id, with: { to: :id_to_yaml, from: :id_from_yaml }
     end
 
+    def self.of_yaml(hash, options = {})
+      if hash.is_a?(Hash)
+        extensions = hash.select do |key, _value|
+          Config.extension_attributes.include?(key.to_s)
+        end
+        unless extensions.empty?
+          existing = hash["extension_attributes"] || hash["extensionAttributes"] || {}
+          hash = hash.merge("extension_attributes" => existing.merge(extensions))
+        end
+      end
+      super
+    end
+
     def designations
       data.terms
     end
@@ -75,6 +91,7 @@ module Glossarist
 
     def uuid_from_yaml(model, value)
       model.uuid = value
+      model.id = value
     end
 
     def id_to_yaml(model, doc); end

data/lib/glossarist/dataset_register.rb

@@ -136,16 +136,22 @@ module Glossarist
       concept_id = concept.is_a?(ManagedConcept) ? concept.data&.id : nil
       return [] unless concept_id
 
-      all_section_ids = collect_all_section_ids
-      all_section_ids.select { |sid| concept_id.start_with?("#{sid}-", "#{sid}.") }
+      all_section_ids
+        .select { |sid| concept_id.start_with?("#{sid}-", "#{sid}.") }
         .max_by(&:length)
         &.then { |sid| [sid] } || []
     end
 
-    def collect_all_section_ids
-      ids = []
-      walk_section_tree(sections, []) { |section, _| ids << section.id }
-      ids
+    # One flattened section-id list, computed once: derivation runs per
+    # concept without explicit section domains, and re-walking the whole
+    # section tree per concept is quadratic on large registers (ISO
+    # 10303-2: 7,363 concepts x 1,240 sections).
+    def all_section_ids
+      @all_section_ids ||= begin
+        ids = []
+        walk_section_tree(sections, []) { |section, _| ids << section.id }
+        ids
+      end
     end
   end
 end

data/lib/glossarist/errors/cli_error.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Glossarist
+  module Errors
+    # Raised by CLI command classes on invalid usage or failed runs.
+    # Library classes stay exception-only; exe/glossarist owns the
+    # process exit code. Calling exit from a command class would kill
+    # any host process exercising it in-process (glossarist-ruby#248).
+    class CliError < Base
+    end
+  end
+end

data/lib/glossarist/errors.rb

@@ -10,5 +10,6 @@ module Glossarist
              "glossarist/errors/invalid_language_code_error"
     autoload :CacheVersionMismatchError,
              "glossarist/errors/cache_version_mismatch_error"
+    autoload :CliError, "glossarist/errors/cli_error"
   end
 end

data/lib/glossarist/localized_concept.rb

@@ -5,6 +5,8 @@ module Glossarist
     attribute :entry_status, :string
 
     key_value do
+      map :status, to: :entry_status,
+                   with: { from: :status_from_yaml, to: :status_to_yaml }
       map :classification, to: :classification
       map %i[review_type reviewType], to: :review_type
     end
@@ -20,8 +22,6 @@ module Glossarist
       super
     end
 
-    alias_method :status=, :entry_status=
-
     def language_code
       data.language_code
     end
@@ -38,6 +38,16 @@ module Glossarist
       data.entry_status = value
     end
 
+    alias_method :status=, :entry_status=
+
+    # Legacy top-level `status` is read only: it fills entry_status when
+    # data.entry_status is absent, and is never written back out.
+    def status_from_yaml(model, value)
+      model.entry_status ||= value
+    end
+
+    def status_to_yaml(_model, _doc); end
+
     def all_sources
       data.all_sources
     end

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.14.6"
+  VERSION = "2.14.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.14.6
+  version: 2.14.8
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-10 00:00:00.000000000 Z
+date: 2026-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -259,6 +259,7 @@ files:
 - lib/glossarist/errors.rb
 - lib/glossarist/errors/base.rb
 - lib/glossarist/errors/cache_version_mismatch_error.rb
+- lib/glossarist/errors/cli_error.rb
 - lib/glossarist/errors/invalid_language_code_error.rb
 - lib/glossarist/errors/invalid_type_error.rb
 - lib/glossarist/errors/load_error.rb