glossarist 2.3.5 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49a6e0ff48ff126c32d77d0d455e5c26e9182416c55d258ab4a115282f32476
-  data.tar.gz: 3642c9cdd60fb8ed81575a92b3622c711cac6382c0f6f4b0b5b9a2f063f243da
+  metadata.gz: c0af35cdd40da6ea573d2dd4424a70c97016427ae9027b959f4235b322f8fcb5
+  data.tar.gz: b0e28310c983727e41ca6f35ddb1099a58dddead5fa30aa0a204851d0b8dc85f
 SHA512:
-  metadata.gz: 449d9b34b2d01404f4e47716e803e6cd3195a70ac4be9aee20e00a2c776ffebc9c37e3170477898107b01401e3aec17f20e9af3f057d749a95a53c106299c935
-  data.tar.gz: 5f01ab6a96f4d1e7805ece97c00d4b179b6ab01a9b2636d76d707842d68d15d3d2c576cab81fe71f0d4119e399f72890d104424c98e50b2189a477e157bc84f0
+  metadata.gz: ac19ff4ea8fdb5a81b4acaabade8b77879a0be14edef108af43cce863a9caa00dc8df4574634e3f58e697b6fd7ec7b05af001ccdbfbc37b01f9e05dff5b40927
+  data.tar.gz: fbd2b877dd317ed884c694917e1828886a8d6939fa887c86a410027c155f3baca5bfa2497921c0cf2decd66527da544c52a0ee1ce3426cf4919962d605de2c10

data/Gemfile

@@ -5,6 +5,5 @@ source "https://rubygems.org"
 gem "pry"
 gem "rake"
 gem "rspec"
-gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
 
 gemspec

data/lib/glossarist/citation.rb

@@ -17,8 +17,8 @@ module Glossarist
     attribute :version, :string
 
     # @return [String]
-    # Referred clause of the document.
-    attribute :clause, :string
+    # Referred locality of the document.
+    attribute :locality, Locality
 
     # Link to document.
     # @return [String]
@@ -32,6 +32,8 @@ module Glossarist
 
     attribute :ref, :string
 
+    attribute :custom_locality, CustomLocality, collection: true
+
     yaml do
       map :id, to: :id, with: { from: :id_from_yaml, to: :id_to_yaml }
       map :text, to: :text, with: { from: :text_from_yaml, to: :text_to_yaml }
@@ -40,10 +42,12 @@ module Glossarist
       map :version, to: :version,
                     with: { from: :version_from_yaml, to: :version_to_yaml }
       map :ref, to: :ref, with: { from: :ref_from_yaml, to: :ref_to_yaml }
-
-      map :clause, to: :clause
+      map %i[clause locality],
+          to: :locality,
+          with: { from: :clause_from_yaml, to: :clause_to_yaml }
       map :link, to: :link
       map :original, to: :original
+      map %i[custom_locality customLocality], to: :custom_locality
     end
 
     def ref_from_yaml(model, value)
@@ -108,6 +112,35 @@ module Glossarist
       end
     end
 
+    def clause_from_yaml(model, value)
+      # accepts old format like
+      # clause: "11"
+      # or new format like
+      # locality: { type: "clause", reference_from: "11", reference_to: "12" }
+      locality = Locality.new
+      locality.type = value["type"] || "clause"
+      locality.reference_from = value["reference_from"] || value
+      locality.reference_to = value["reference_to"] if value["reference_to"]
+      locality.validate!
+
+      model.locality = locality
+    end
+
+    def clause_to_yaml(model, doc) # rubocop:disable Metrics/AbcSize
+      if model.locality
+        doc["locality"] = {}
+        doc["locality"]["type"] = model.locality.type
+
+        if model.locality.reference_from
+          doc["locality"]["reference_from"] = model.locality.reference_from
+        end
+
+        if model.locality.reference_to
+          doc["locality"]["reference_to"] = model.locality.reference_to
+        end
+      end
+    end
+
     def plain?
       (source && id && version).nil?
     end

data/lib/glossarist/collection.rb

@@ -60,7 +60,9 @@ module Glossarist
 
     # Writes all concepts to files.
     def save_concepts
-      @index.each_value &method(:save_concept_to_file)
+      @index.each_value do |concept|
+        save_concept_to_file(concept)
+      end
     end
 
     def load_concept_from_file(filename)

data/lib/glossarist/concept_manager.rb

@@ -19,7 +19,9 @@ module Glossarist
     end
 
     def save_to_files(managed_concepts)
-      managed_concepts.each &method(:save_concept_to_file)
+      managed_concepts.each do |concept|
+        save_concept_to_file(concept)
+      end
     end
 
     def load_concept_from_file(filename)

data/lib/glossarist/custom_locality.rb

@@ -0,0 +1,16 @@
+module Glossarist
+  class CustomLocality < Lutaml::Model::Serializable
+    # The name of the custom locality.
+    # @return [String]
+    attribute :name, :string
+
+    # The value of the custom locality, which can be any string.
+    # @return [String]
+    attribute :value, :string
+
+    yaml do
+      map :name, to: :name
+      map :value, to: :value
+    end
+  end
+end

data/lib/glossarist/locality.rb

@@ -0,0 +1,22 @@
+module Glossarist
+  class Locality < Lutaml::Model::Serializable
+    # @return [String]
+    attribute :type, :string, pattern: %r{
+      section|clause|part|paragraph|chapter|page|title|line|
+      whole|table|annex|figure|note|list|example|volume|issue|time|anchor|
+      locality:[a-zA-Z0-9_]+
+    }x
+
+    # @return [String]
+    attribute :reference_from, :string
+
+    # @return [String]
+    attribute :reference_to, :string
+
+    yaml do
+      map :type, to: :type
+      map :reference_from, to: :reference_from
+      map :reference_to, to: :reference_to
+    end
+  end
+end

data/lib/glossarist/managed_concept.rb

@@ -85,11 +85,11 @@ module Glossarist
       model.identifier = value || model.identifier
     end
 
-    def localized_concepts=(localized_concepts_collection)
+    def localized_concepts=(localized_concepts_collection) # rubocop:disable Metrics/AbcSize
       return unless localized_concepts_collection
 
       if localized_concepts_collection.is_a?(Hash)
-        @localized_concepts = stringify_keys(localized_concepts_collection)
+        data.localized_concepts = stringify_keys(localized_concepts_collection)
       else
         localized_concepts_collection.each do |localized_concept_hash|
           lang = localized_concept_hash.dig("data", "language_code").to_s
@@ -98,21 +98,24 @@ module Glossarist
             Config.class_for(:localized_concept).of_yaml(localized_concept_hash),
           )
 
-          @localized_concepts[lang] = localization(lang).uuid
+          data.localized_concepts[lang] = localization(lang).uuid
 
           localized_concept
         end
       end
     end
-    attr_reader :localized_concepts
+
+    def localized_concepts
+      data.localized_concepts
+    end
 
     # Adds concept localization.
     # @param localized_concept [LocalizedConcept]
     def add_localization(localized_concept)
       lang = localized_concept.language_code
-      @localized_concepts ||= {}
-      @localized_concepts[lang] =
-        @localized_concepts[lang] || localized_concept.uuid
+      data.localized_concepts ||= {}
+      data.localized_concepts[lang] =
+        data.localized_concepts[lang] || localized_concept.uuid
       localizations.store(lang, localized_concept)
     end
     alias :add_l10n :add_localization

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.3.5"
+  VERSION = "2.3.7"
 end

data/lib/glossarist.rb

@@ -13,6 +13,8 @@ require_relative "glossarist/glossary_definition"
 
 require_relative "glossarist/designation"
 require_relative "glossarist/asset"
+require_relative "glossarist/locality"
+require_relative "glossarist/custom_locality"
 require_relative "glossarist/citation"
 require_relative "glossarist/collection"
 require_relative "glossarist/concept_date"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.7
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -91,6 +91,7 @@ files:
 - lib/glossarist/concept_set.rb
 - lib/glossarist/concept_source.rb
 - lib/glossarist/config.rb
+- lib/glossarist/custom_locality.rb
 - lib/glossarist/designation.rb
 - lib/glossarist/designation/abbreviation.rb
 - lib/glossarist/designation/base.rb
@@ -105,6 +106,7 @@ files:
 - lib/glossarist/error/invalid_type_error.rb
 - lib/glossarist/error/parse_error.rb
 - lib/glossarist/glossary_definition.rb
+- lib/glossarist/locality.rb
 - lib/glossarist/localized_concept.rb
 - lib/glossarist/managed_concept.rb
 - lib/glossarist/managed_concept_collection.rb