glossarist 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a350e5e964f972f6b37865cf7cb7d452b0e8281429718b7f8121feceaccd2d
-  data.tar.gz: a474d840ee6d35ee6781f252f678b45fc05835b9915588b151715fe8ef8d5874
+  metadata.gz: f22479e4e171b68688f2be4ac4e43826a644d106ecaac478c91d7f05afe19271
+  data.tar.gz: e0bcd25c609656d4ed5eec57b82e10c7a33a56f9a78513c93394bc26dc69abe5
 SHA512:
-  metadata.gz: 75e5f037aa510ad73388b255039c6256d38a057387eb9584f2d3412635f9701719ac8fb1a91be476a8091543cd2366598e4831a84ee066e85fa24173e361117a
-  data.tar.gz: 073b9bd4562d657d7ccfe8adde06de7727e5bd14c51e8cbcbdeef7924619dcee2b23f51538e67e6a859e00f4b15933b631c2d315abaad4e8a20d5fb200842efb
+  metadata.gz: 34333ae5aeecddb918c973a708b921684ae459b9e4980c4b8718bd49c8283a1ec50a0a74a785791eabb1ed32d4537b665f79607fc0b6b3722dfa861d4b04fa81
+  data.tar.gz: 2f616084f0bbad3643907bff900828590c834e8dbf27bb72e12b248c427afddcbbd52fac67736624dd7712c5f7fcc01163170e9e376ea69b453803c75c149c3a

data/lib/glossarist/concept_manager.rb

@@ -5,6 +5,7 @@ module Glossarist
     # Path to concepts directory.
     # @return [String]
     attr_accessor :path
+    attr_accessor :localized_concepts_path
 
     # @param path [String]
     #   concepts directory path, either absolute or relative to CWD
@@ -36,7 +37,7 @@ module Glossarist
       concept_hash = Psych.safe_load(File.read(filename), permitted_classes: [Date, Time])
       concept_hash["uuid"] = concept_hash["id"] || File.basename(filename, ".*")
 
-      concept = ManagedConcept.new(concept_hash)
+      concept = Config.class_for(:managed_concept).new(concept_hash)
       concept.localized_concepts.each do |_lang, id|
         localized_concept = load_localized_concept(id)
         concept.add_l10n(localized_concept)
@@ -60,8 +61,10 @@ module Glossarist
     end
 
     def save_concept_to_file(concept)
+      @localized_concepts_path ||= "localized_concept"
       concept_dir = File.join(path, "concept")
-      localized_concept_dir = File.join(path, "localized_concept")
+
+      localized_concept_dir = File.join(path, @localized_concepts_path)
 
       Dir.mkdir(concept_dir) unless Dir.exist?(concept_dir)
       Dir.mkdir(localized_concept_dir) unless Dir.exist?(localized_concept_dir)
@@ -86,7 +89,30 @@ module Glossarist
     end
 
     def localized_concept_path(id)
-      Dir.glob(File.join(path, "localized_concept", "#{id}.{yaml,yml}"))&.first
+      localized_concept_possible_dir = {
+        "localized_concept" => File.join(
+          path,
+          "localized_concept",
+          "#{id}.{yaml,yml}",
+        ),
+
+        "localized-concept" => File.join(
+          path,
+          "localized-concept",
+          "#{id}.{yaml,yml}",
+        ),
+      }
+
+      localized_concept_possible_dir.each do |dir_name, file_path|
+        actual_path = Dir.glob(file_path)&.first
+
+        if actual_path
+          @localized_concepts_path = dir_name
+          return actual_path
+        end
+      end
+
+      actual_path
     end
 
     def v1_collection?

data/lib/glossarist/config.rb

@@ -8,6 +8,7 @@ module Glossarist
 
     DEFAULT_CLASSES = {
       localized_concept: Glossarist::LocalizedConcept,
+      managed_concept: Glossarist::ManagedConcept,
     }.freeze
 
     attr_reader :registered_classes

data/lib/glossarist/managed_concept_collection.rb

@@ -17,7 +17,7 @@ module Glossarist
 
     def managed_concepts=(managed_concepts = [])
       managed_concepts.each do |managed_concept|
-        store(ManagedConcept.new(managed_concept))
+        store(Config.class_for(:managed_concept).new(managed_concept))
       end
 
       @managed_concepts.values
@@ -53,7 +53,7 @@ module Glossarist
     #    ManagedConcept ID
     # @return [ManagedConcept]
     def fetch_or_initialize(id)
-      fetch(id) or store(ManagedConcept.new(data: { id: id }))
+      fetch(id) or store(Config.class_for(:managed_concept).new(data: { id: id }))
     end
 
     # Adds concept to the collection. If collection contains a concept with

data/lib/glossarist/v1_reader.rb

@@ -9,8 +9,8 @@ module Glossarist
     end
 
     def load_concept_from_file(filename)
-      concept_hash = Psych.safe_load(File.read(filename), permitted_classes: [Date])
-      ManagedConcept.new(generate_v2_concept_hash(concept_hash))
+      concept_hash = Psych.safe_load(File.read(filename), permitted_classes: [Date, Time])
+      Config.class_for(:managed_concept).new(generate_v2_concept_hash(concept_hash))
     end
 
     private

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.0.4"
+  VERSION = "2.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Ribose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton