jekyll-geolexica 1.8.14 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc7f723b3b345f54f510e69beeb32c3662f1f5a9bf72ca66febdd6934cb1b38b
-  data.tar.gz: d85912d07d50a600b9f8d16c803503bb8b3584f7ba0ae9571ef7de6322931285
+  metadata.gz: 7bf9198ece6031ea2db54e9a6f4f8d236dbcf253aba824e92db8a103a4f650f8
+  data.tar.gz: 7d03d364470f0a219cb98ca1832d7fb046dbe170808588861dc090d4af927c71
 SHA512:
-  metadata.gz: 9b45c994fde81794f5fef3be554fdecfb7c670119a91a2bd1d3de0155ad6c090e5be7ac355f0c1ccdd18d531a3bfd44c5626cf266cbc78b336291f9ae76e8f25
-  data.tar.gz: b4382194264a9234808eb4c259669b363ea6f821779a0ed676b79a2fb4a39832264900671f909893763f42a61825c8ce0c8a4dac600b92af598067ddcab0539e
+  metadata.gz: a3c019c8c9be5691fa0e836352d4973efdbb3ad0f8570fac50ff748562382042b645fd54f1ea6a0f77617d445464f2aed32a1f2cf4e4f111883a31b751144866
+  data.tar.gz: e0c1764ad91b3d49ed30fa235e1714af75571e1578f1d32872320d864bb92bb64e12a413752a96822eae21c428283f3a31605bac32520d36da7a7efc4f5461ba

data/jekyll-geolexica.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "glossarist", "~> 2.0"
   # Jekyll 4.1.0 adds some breaking changes which are reverted in 4.1.1.
   # I doubt we should be worried, but there is no good reason to allow them
   # either.
@@ -43,6 +44,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "jbuilder"
 
   spec.add_runtime_dependency "jekyll-asciidoc"
+  # Pin logger to <= 1.5.3 due to incompatibility of logger 1.6.0 with Jekyll 4.3.2
+  spec.add_runtime_dependency "logger", "<= 1.5.3"
   spec.add_runtime_dependency "relaton"
 
   # Zeitwerk::Loader#push_dir supports :namespace argument from v. 2.4.

data/lib/jekyll/geolexica/configuration.rb

@@ -16,6 +16,11 @@ module Jekyll
         File.expand_path(path, site.source)
       end
 
+      def glossary_path
+        glob_string = glossary_config["glossary_path"]
+        File.expand_path(glob_string, site.source)
+      end
+
       def glossary_format
         glossary_config["format"]
       end

data/lib/jekyll/geolexica/glossary.rb

@@ -13,11 +13,27 @@ module Jekyll
 
       def initialize(site)
         @site = site
+        @collection = Glossarist::ManagedConceptCollection.new
       end
 
       def load_glossary
         Jekyll.logger.info('Geolexica:', 'Loading concepts')
-        Dir.glob(concepts_glob).each { |path| load_concept(path) }
+        @collection.load_from_files(glossary_path)
+
+        @collection.each do |managed_concept|
+          concept_hash = {
+            "id" => managed_concept.uuid,
+            "term" => managed_concept.default_designation,
+            "termid" => managed_concept.id,
+          }.merge(managed_concept.to_h)
+
+          managed_concept.localizations.each do |lang, localization|
+            concept_hash[lang] = localization.to_h["data"]
+          end
+
+          preprocess_concept_hash(concept_hash)
+          store(Concept.new(concept_hash))
+        end
       end
 
       def store(concept)
@@ -37,70 +53,6 @@ module Jekyll
 
       protected
 
-      def load_concept(concept_file_path)
-        Jekyll.logger.debug('Geolexica:',
-                            "reading concept from file #{concept_file_path}")
-
-        concept_hash = if glossary_format == 'paneron'
-                         read_paneron_concept_file(concept_file_path)
-                       else
-                         read_concept_file(concept_file_path)
-                       end
-
-        preprocess_concept_hash(concept_hash)
-        store Concept.new(concept_hash)
-      rescue StandardError
-        Jekyll.logger.error('Geolexica:',
-                            "failed to read concept from file #{concept_file_path}")
-        raise
-      end
-
-      # Reads and parses concept file located at given path.
-      def read_concept_file(path)
-        YAML.safe_load(File.read(path), permitted_classes: [Time])
-      end
-
-      def read_paneron_concept_file(path)
-        safe_load_options = { permitted_classes: [Date, Time] }
-        concept = YAML.safe_load(File.read(path), **safe_load_options)
-        concept['termid'] = concept['data']['identifier']
-
-        (concept['data']['localizedConcepts'] || []).each do |lang, local_concept_id|
-          localized_concept_path = File.join(localized_concepts_path, "#{local_concept_id}.yaml")
-          concept[lang] = YAML.safe_load(File.read(localized_concept_path), **safe_load_options)['data']
-
-          next unless concept[lang]
-
-          normalize_sources(concept[lang])
-          concept['term'] = concept[lang]['terms'].first['designation'] if lang == 'eng'
-        end
-
-        concept
-      end
-
-      def normalize_sources(concept)
-        authoritative_sources = concept.delete('authoritativeSource') || []
-        concept['sources'] ||= []
-
-        authoritative_sources.each do |authoritative_source|
-          if authoritative_source['relationship']
-            status = authoritative_source['relationship']['type']
-            modification = authoritative_source['relationship']['modification']
-          end
-
-          concept['sources'] << {
-            "status" => status,
-            "modification" => modification,
-            "origin" => {
-              'ref' => authoritative_source['ref'],
-              'clause' => authoritative_source['clause'],
-              'link' => authoritative_source['link'],
-            }.compact,
-            'type' => 'authoritative'
-          }.compact
-        end
-      end
-
       # Does nothing, but some sites may replace this method.
       def preprocess_concept_hash(concept_hash); end
 

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.8.14".freeze
+    VERSION = "1.9.0".freeze
   end
 end

data/lib/jekyll/geolexica.rb

@@ -2,6 +2,7 @@
 #
 
 require "jekyll"
+require "glossarist"
 
 module Jekyll
   module Geolexica

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.8.14
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: glossarist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement