jekyll-geolexica 1.8.5 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f2e4bcbfbbc858dab343b69a8ca6e6f9bffc7614e351edd4912d5b634f2b753
-  data.tar.gz: e594f95d15905ba550ba28dc9406fea89275c72a83698991b6cf059f8c8ebf73
+  metadata.gz: 16891afbfd31bfa320715e20de559a8ae6b96eecc2cfc53b38ab1654f5c1e156
+  data.tar.gz: 1fb4b721b4029abaa5d1c6fdb5f4026ef1eca64fc4f29288bc81f8edfb6be7b2
 SHA512:
-  metadata.gz: b8f4388e91b95498f5bb9c149442a4f80838934e85abe00dadc76db098c77d1c20cc94d7774f25c85c726747bc92b447fc5bebf544b417e02597713636cc54ad
-  data.tar.gz: 4edf86b932528075fa07fb67a6fe93d222e31367b42a6461054eed9773859362b37bb80f7ce98a31822bdf76f0a8c15fd7a70ef76f0b2ed104201ee6a2c74a68
+  metadata.gz: e5b2fcbcebd7174d974e5579caf37f921f245f47bd68c824c6bce4ebe70db6c5356ee769fd7a3998a7b80080fe8b38c97c42af8333a0ae221acf05159fd90a1d
+  data.tar.gz: 2f6a10a96391e6384f1c4a2b3e97d6ea62ba2eccbdcff936adf199c3dc4412625f7d9ca2b0bf4a87ee9acae804ec11e70b670ab29b199fd62d0ad2cd033eb9c7

data/lib/jekyll/geolexica/configuration.rb

@@ -9,6 +9,17 @@ module Jekyll
         File.expand_path(glob_string, site.source)
       end
 
+      def localized_concepts_path
+        path = glossary_config["localized_concepts_path"]
+        return nil if path.nil? || path.empty?
+
+        File.expand_path(path, site.source)
+      end
+
+      def glossary_format
+        glossary_config["format"]
+      end
+
       def images_path
         glossary_path = glossary_config["glossary_path"]
         return nil if glossary_path.nil? || glossary_path.empty?

data/lib/jekyll/geolexica/glossary.rb

@@ -8,20 +8,20 @@ module Jekyll
 
       attr_reader :site
 
-      alias_method :each_concept, :each_value
-      alias_method :each_termid, :each_key
+      alias each_concept each_value
+      alias each_termid each_key
 
       def initialize(site)
         @site = site
       end
 
       def load_glossary
-        Jekyll.logger.info("Geolexica:", "Loading concepts")
+        Jekyll.logger.info('Geolexica:', 'Loading concepts')
         Dir.glob(concepts_glob).each { |path| load_concept(path) }
       end
 
       def store(concept)
-        super(concept.data["termid"], concept)
+        super(concept.data['termid'], concept)
       end
 
       def language_statistics
@@ -31,21 +31,27 @@ module Jekyll
       # Defines how Glossary is exposed in Liquid templates.
       def to_liquid
         {
-          "language_statistics" => language_statistics,
+          'language_statistics' => language_statistics
         }
       end
 
       protected
 
       def load_concept(concept_file_path)
-        Jekyll.logger.debug("Geolexica:",
-          "reading concept from file #{concept_file_path}")
-        concept_hash = read_concept_file(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
-        Jekyll.logger.error("Geolexica:",
-          "failed to read concept from file #{concept_file_path}")
+      rescue StandardError
+        Jekyll.logger.error('Geolexica:',
+                            "failed to read concept from file #{concept_file_path}")
         raise
       end
 
@@ -54,15 +60,36 @@ module Jekyll
         YAML.safe_load(File.read(path), permitted_classes: [Time])
       end
 
-      # Does nothing, but some sites may replace this method.
-      def preprocess_concept_hash(concept_hash)
+      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]
+
+          concept['term'] = concept[lang]['terms'].first['designation'] if lang == 'eng'
+
+          if concept[lang]['status'] && !concept[lang]['status'].empty? &&
+             (concept[lang]['entry_status'].nil? || concept[lang]['entry_status'].empty?)
+            concept['entry_status'] = concept[lang]['status']
+          end
+        end
+
+        concept
       end
 
+      # Does nothing, but some sites may replace this method.
+      def preprocess_concept_hash(concept_hash); end
+
       def calculate_language_statistics
-        unsorted = each_value.lazy.
-          flat_map{ |concept| term_languages & concept.data.keys }.
-          group_by(&:itself).
-          transform_values(&:count)
+        unsorted = each_value.lazy
+                             .flat_map { |concept| term_languages & concept.data.keys }
+                             .group_by(&:itself)
+                             .transform_values(&:count)
 
         # This is not crucial, but gives nicer output, and ensures that
         # all +term_languages+ are present.
@@ -72,7 +99,7 @@ module Jekyll
       class Concept
         attr_reader :data
 
-        # TODO Maybe some kind of Struct instead of Hash.
+        # TODO: Maybe some kind of Struct instead of Hash.
         attr_reader :pages
 
         def initialize(data)
@@ -81,7 +108,7 @@ module Jekyll
         end
 
         def termid
-          data["termid"]
+          data['termid']
         end
 
         class LiquidCompatibleHash < Hash

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.8.5".freeze
+    VERSION = "1.8.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll