glossarist 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2545436241f3fc01daf4879682439d3f4650a44a45af855cc5260ad445caca0b
-  data.tar.gz: c62fb0db9a7d1dc9ec4ad4ea9015a53a413bfbc922be77db276e4739926615a6
+  metadata.gz: c0462402c995f5b7e9fb01a4ee0d8e1f9ee3c5633c18fa071d9db6aa9f21f99f
+  data.tar.gz: 444e2d92467c4101edc81bc1af65fb6aeecaa0e138f63a49076f2283802baf17
 SHA512:
-  metadata.gz: d611e1a09d99e64b7ad5e745d729fba2fe59d707f7f0469aa43fa3def04286c91128f5a65088f28943df550ef7eb6099d3354cadbafa7c68a93b08873512e2c1
-  data.tar.gz: c1e0ec90c6a41c9a4c26f8db587d0cfbb986fb3c2086494554fbde8dfc829abf0406d2bf4e123d85710c2e23c699ac82b0db9c5328f3498f3c378bd509617c81
+  metadata.gz: ab7f0f87234df6fcd73286969c53e1186fcd247b4d8972a8d305b74cc995a4200785db43215a0d5aae719bc164123035f87a1756c104aa3d36b38775585f2019
+  data.tar.gz: d5f4a8834eb1d8bbb19d8352c13159e4626c8ff65233b5269658b77c4ee753bbcd8dcaf4502981b1ae2556a13e8af8deb45661e86f485cf7df25cf0f9d1cbb57

data/glossarist.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "relaton", "~> 1.16.0"
+  spec.add_dependency "relaton", "~> 1.16"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "pry", "~> 0.14.0"

data/lib/glossarist/concept_manager.rb

@@ -17,11 +17,11 @@ module Glossarist
       collection ||= ManagedConceptCollection.new
 
       Dir.glob(concepts_glob) do |filename|
-        concept = load_concept_from_file(filename)
-        concept.localized_concepts.each do |_lang, id|
-          localized_concept = load_localized_concept(id)
-          concept.add_l10n(localized_concept)
-        end
+        concept = if v1_collection?
+                    Glossarist::V1Reader.load_concept_from_file(filename)
+                  else
+                    load_concept_from_file(filename)
+                  end
 
         collection.store(concept)
       end
@@ -35,7 +35,14 @@ module Glossarist
     def load_concept_from_file(filename)
       concept_hash = Psych.safe_load(File.read(filename), permitted_classes: [Date])
       concept_hash["uuid"] = concept_hash["id"] || File.basename(filename, ".*")
-      ManagedConcept.new(concept_hash)
+
+      concept = ManagedConcept.new(concept_hash)
+      concept.localized_concepts.each do |_lang, id|
+        localized_concept = load_localized_concept(id)
+        concept.add_l10n(localized_concept)
+      end
+
+      concept
     rescue Psych::SyntaxError => e
       raise Glossarist::ParseError.new(filename: filename, line: e.line)
     end
@@ -71,11 +78,19 @@ module Glossarist
     private
 
     def concepts_glob
-      File.join(path, "concept", "*.{yaml,yml}")
+      if v1_collection?
+        File.join(path, "concept-*.{yaml,yml}")
+      else
+        File.join(path, "concept", "*.{yaml,yml}")
+      end
     end
 
     def localized_concept_path(id)
       Dir.glob(File.join(path, "localized_concept", "#{id}.{yaml,yml}"))&.first
     end
+
+    def v1_collection?
+      @v1_collection ||= !Dir.glob(File.join(path, "concept-*.{yaml,yml}")).empty?
+    end
   end
 end

data/lib/glossarist/v1_reader.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Glossarist
+  # An adapter to read concepts in V1 format, converts them to v2 format and
+  # load into glossarist concept model.
+  class V1Reader
+    def self.load_concept_from_file(filename)
+      new.load_concept_from_file(filename)
+    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))
+    end
+
+    private
+
+    def generate_v2_concept_hash(concept_hash)
+      v2_concept = { "groups" => concept_hash["groups"] }
+      v2_concept["data"] = {
+        "identifier" => concept_hash["termid"],
+        "localized_concepts" => concept_hash.values.grep(Hash),
+      }
+
+      v2_concept
+    end
+  end
+end

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/glossarist.rb

@@ -26,6 +26,7 @@ require_relative "glossarist/managed_concept_collection"
 require_relative "glossarist/concept_manager"
 require_relative "glossarist/managed_concept"
 require_relative "glossarist/non_verb_rep"
+require_relative "glossarist/v1_reader"
 
 require_relative "glossarist/collections"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - lib/glossarist/utilities/enum/enum_collection.rb
 - lib/glossarist/utilities/enum/instance_methods.rb
 - lib/glossarist/utilities/uuid.rb
+- lib/glossarist/v1_reader.rb
 - lib/glossarist/version.rb
 homepage: https://github.com/glossarist/glossarist-ruby
 licenses: