glossarist 2.3.8 → 2.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 455c768825abe3d31abeb221718eb6d9385478fe1a32645ebaae67b82b7bda14
-  data.tar.gz: 9fe994e3a6f2cc3b306c533e620f5faf432f1f4b48a888f059a4ecbeba5fc323
+  metadata.gz: 92a374af660211342e4f275381d50abb770cd2db1dc13a605d41d1e688ef75d2
+  data.tar.gz: 6971b2ac8948034157b07adfbe81d805fffe12b90989f4cad628368a57cc1abb
 SHA512:
-  metadata.gz: 26e205c1940c3aa3eabeef7553b0e334d63d6365e10f4e97e0fd59acc3c37cfc7f7c19d707dac98c61d021b3b689d86074af3bad2f37a19aa95328703557fe19
-  data.tar.gz: ba10c0a69e804726607bed7ca36563ecf20b849a5c100a57bbd9409313b2eea0946ebbbdea048aede5c6596bd7babd72c49c125e58d096ce7c44561afa8eee4c
+  metadata.gz: e748889d5afa2a7be0091e4a4d65937e7f2dbbfcf40fbcaa0bb186a16c7283b0d7150a573c7a02d969a5ad2623eef13b5f57a2acf912db6810717d7666b0fd94
+  data.tar.gz: b866f37821ea3ed8964ae2fe7942082e4f8a98c41766ca0f948ab0a3b1956ecb61c232a8cbb377d7759d0e08c02c9336c6d722fdd2c4d3cb951e4e6c183def98

data/README.adoc

@@ -33,7 +33,18 @@ gem install glossarist
 
 === Reading a Glossarist model V2 from files
 
-To load the glossarist model V2 dataset
+Glossarist model V2 dataset is a collection of concepts and their localized
+concepts in the form of YAML files.
+
+The storage structure of the dataset has 2 forms:
+
+1. Each concept is stored in a concept YAML file and its localized concepts are
+stored in separate YAML files. The concept files are stored in the `concepts`
+folder and its localized concepts are stored in the `localized_concepts` folder.
+2. Each concept and its related localized concepts are stored in a single YAML
+file. The concept files are stored in the `concepts` folder.
+
+To load the glossarist model V2 dataset:
 
 [,ruby]
 ----
@@ -43,10 +54,11 @@ collection.load_from_files("path/to/glossarist-v2-dataset")
 
 === Writing a Glossarist model V2 to files
 
-To wite the glossarist model V2 dataset to files
+To write the glossarist model V2 dataset to files:
 
 [,ruby]
 ----
+# load the collection from files
 collection = Glossarist::ManagedConceptCollection.new
 collection.load_from_files("path/to/glossarist-v2-dataset")
 
@@ -55,6 +67,20 @@ collection.load_from_files("path/to/glossarist-v2-dataset")
 collection.save_to_files("path/to/glossarist-v2-dataset")
 ----
 
+To write the glossarist model V2 dataset with concepts and their
+localized concepts grouped into single files:
+
+[,ruby]
+----
+# load the collection from files
+collection = Glossarist::ManagedConceptCollection.new
+collection.load_from_files("path/to/glossarist-v2-dataset")
+
+# ... Update the collection ...
+
+collection.save_grouped_concepts_to_files("path/to/glossarist-v2-dataset")
+----
+
 === ManagedConceptCollection
 
 This is a collection for <<managed-concept,managed concepts>>. It includes the ruby 'Enumerable' module.

data/lib/glossarist/citation.rb

@@ -112,7 +112,7 @@ module Glossarist
       end
     end
 
-    def clause_from_yaml(model, value)
+    def clause_from_yaml(model, value) # rubocop:disable Metrics/AbcSize
       # accepts old format like
       # clause: "11"
       # or new format like
@@ -123,12 +123,11 @@ module Glossarist
         locality.type = value["type"] || "clause"
         locality.reference_from = value["reference_from"] || value
         locality.reference_to = value["reference_to"] if value["reference_to"]
-        locality.validate!
       else
         locality.type = "clause"
         locality.reference_from = value
-        locality.validate!
       end
+      locality.validate!
 
       model.locality = locality
     end

data/lib/glossarist/collection.rb

@@ -77,7 +77,7 @@ module Glossarist
     end
 
     def concepts_glob
-      File.join(path, "concept-*.{yaml,yml}")
+      File.file?(path) ? path : File.join(path, "concept-*.{yaml,yml}")
     end
   end
 end

data/lib/glossarist/concept.rb

@@ -85,8 +85,7 @@ module Glossarist
 
     def date_accepted_to_yaml(model, doc)
       if model.date_accepted
-        doc["date_accepted"] =
-          model.date_accepted.date.iso8601
+        doc["date_accepted"] = model.date_accepted.date.iso8601
       end
     end
 
@@ -94,8 +93,13 @@ module Glossarist
       return if model.date_accepted
 
       model.data.dates ||= []
-      model.data.dates << ConceptDate.of_yaml({ "date" => value,
-                                                "type" => "accepted" })
+      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_manager.rb

@@ -12,9 +12,11 @@ module Glossarist
       collection ||= ManagedConceptCollection.new
 
       Dir.glob(concepts_glob) do |filename|
-        concept = load_concept_from_file(filename)
+        concepts = load_concept_from_file(filename)
 
-        collection.store(concept)
+        concepts.each do |concept|
+          collection.store(concept)
+        end
       end
     end
 
@@ -24,30 +26,67 @@ module Glossarist
       end
     end
 
+    def save_grouped_concepts_to_files(managed_concepts)
+      managed_concepts.each do |concept|
+        save_grouped_concepts_to_file(concept)
+      end
+    end
+
+    def group_concept_hashes(mixed_hashes)
+      concept_hashes = mixed_hashes.select do |concept_hash|
+        !concept_hash["data"]["localized_concepts"].nil? ||
+          !concept_hash["data"]["localizedConcepts"].nil?
+      end
+
+      localized_concept_hashes = mixed_hashes.select do |concept_hash|
+        concept_hash["data"]["localized_concepts"].nil? &&
+          concept_hash["data"]["localizedConcepts"].nil?
+      end
+
+      [concept_hashes, localized_concept_hashes]
+    end
+
     def load_concept_from_file(filename)
-      concept_hash = Psych.safe_load(File.read(filename),
-                                     permitted_classes: [Date, Time])
-      concept_hash["uuid"] = concept_hash["id"] || File.basename(filename, ".*")
+      mixed_hashes = YAML.load_stream(File.read(filename))
+      concepts = []
+
+      concept_hashes, localized_concept_hashes =
+        group_concept_hashes(mixed_hashes)
 
-      concept = Config.class_for(:managed_concept).of_yaml(concept_hash)
+      concept_hashes.each do |concept_hash|
+        concept_hash["uuid"] = concept_hash["id"] ||
+          File.basename(filename, ".*")
+        concept = Config.class_for(:managed_concept).of_yaml(concept_hash)
 
-      concept.data.localized_concepts.each_value do |id|
-        localized_concept = load_localized_concept(id)
-        concept.add_l10n(localized_concept)
+        concept.data.localized_concepts.each_value do |id|
+          localized_concept =
+            load_localized_concept(id, localized_concept_hashes)
+          concept.add_l10n(localized_concept)
+        end
+
+        concepts << concept
       end
 
-      concept
+      concepts
     rescue Psych::SyntaxError => e
       raise Glossarist::ParseError.new(filename: filename, line: e.line)
     end
 
-    def load_localized_concept(id)
-      concept_hash = Psych.safe_load(
-        File.read(localized_concept_path(id)),
-        permitted_classes: [Date, Time],
-      )
-      concept_hash["uuid"] = id
+    def load_localized_concept(id, localized_concept_hashes = [])
+      {}
+
+      concept_hash = if localized_concept_hashes.empty?
+                       Psych.safe_load(
+                         File.read(localized_concept_path(id)),
+                         permitted_classes: [Date, Time],
+                       )
+                     else
+                       localized_concept_hashes.find do |hash|
+                         hash["id"] == id
+                       end
+                     end
 
+      concept_hash["uuid"] = id
       Config.class_for(:localized_concept).of_yaml(concept_hash)
     rescue Psych::SyntaxError => e
       raise Glossarist::ParseError.new(filename: filename, line: e.line)
@@ -71,7 +110,27 @@ module Glossarist
       end
     end
 
+    def save_grouped_concepts_to_file(concept)
+      @localized_concepts_path ||= "localized_concept"
+      concept_dir = File.join(path, "concept")
+
+      Dir.mkdir(concept_dir) unless Dir.exist?(concept_dir)
+
+      content = []
+
+      filename = File.join(concept_dir, "#{concept.uuid}.yaml")
+      content << concept.to_yaml
+
+      concept.localized_concepts.each_key do |lang|
+        content << concept.localization(lang).to_yaml
+      end
+
+      File.write(filename, content.join("\n"))
+    end
+
     def concepts_glob
+      return path if File.file?(path)
+
       if v1_collection?
         File.join(path, "concept-*.{yaml,yml}")
       else
@@ -102,8 +161,6 @@ module Glossarist
           return actual_path
         end
       end
-
-      actual_path
     end
 
     def v1_collection?

data/lib/glossarist/managed_concept.rb

@@ -52,13 +52,15 @@ module Glossarist
     alias :l10n :localization
 
     def date_accepted_from_yaml(model, value)
-      model.dates ||= []
-      model.dates << ConceptDate.of_yaml({ "date" => value,
-                                           "type" => "accepted" })
+      model.date_accepted = ConceptDate.of_yaml(
+        { "date" => value, "type" => "accepted" },
+      )
     end
 
     def date_accepted_to_yaml(model, doc)
-      doc["date_accepted"] = model.date_accepted.date if model.date_accepted
+      if model.date_accepted
+        doc["date_accepted"] = model.date_accepted.date.iso8601
+      end
     end
 
     def uuid_to_yaml(model, doc)

data/lib/glossarist/managed_concept_collection.rb

@@ -70,5 +70,10 @@ module Glossarist
       @concept_manager.path = path
       @concept_manager.save_to_files(@managed_concepts)
     end
+
+    def save_grouped_concepts_to_files(path)
+      @concept_manager.path = path
+      @concept_manager.save_grouped_concepts_to_files(@managed_concepts)
+    end
   end
 end

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.3.8"
+  VERSION = "2.3.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.3.10
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-09 00:00:00.000000000 Z
+date: 2025-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model