jekyll-geolexica 1.8.6 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 953781d4af25bb0fddf2369620b0eb6f80dbe78b5ed0513a2ccb936cb4766fcd
-  data.tar.gz: 92a2f81efd01b51138ad95e3c2a3821688684ec2bc544f188b558999b35d91d8
+  metadata.gz: 28a92c6437e168d14b81c6230871e51b864ad78ca6e8a465c2361553d5273f10
+  data.tar.gz: 0f42f094620da7d67a4b744020e4f6063996f661281afb05488ccfdd422f9896
 SHA512:
-  metadata.gz: 9eb581e4730853549c2560c406370a849638db0019f3da67d3893a14e9e356bf44d4ce9e0253cf87ffaac85b4edf523ee639c0129236010c284bd952a695ebeb
-  data.tar.gz: 17c3fabebc23db2294405d7ee8914dd0bd895759fc33c582345ade2807a5c85660fa6c4af44abda90642d0154b0f3789d0784d3c6f8f94bed966a4ddfc3ee881
+  metadata.gz: 05c3892fd357900d2c6793b2725fcb43ec9cb2b24c3ca2e8ad536c266046c7fc1b6a0e3d88b6b1d18fd85694d09a99675cc5bfb7060da2c4e07a333530c52efa
+  data.tar.gz: e09f1a3c68284ac5a859cca8ac4dd8357f3c1b5212a8ae0e8ccc55afb4824127f28383245132342a95abcfde8ba8d96a72c313b80387d0ed50e44cdb93eb51bd

data/README.adoc

@@ -0,0 +1,15 @@
+= jekyll-geolexica
+
+image:https://github.com/geolexica/jekyll-geolexica/actions/workflows/test.yaml/badge.svg[Build Status,link=https://github.com/geolexica/jekyll-geolexica/actions/workflows/test.yaml]
+image:https://img.shields.io/gem/v/jekyll-geolexica.svg[Gem Version,link=https://rubygems.org/gems/jekyll-geolexica]
+image:https://img.shields.io/github/issues-pr-raw/geolexica/jekyll-geolexica.svg[Pull Requests,link=https://github.com/geolexica/jekyll-geolexica/pulls]
+image:https://img.shields.io/github/commits-since/geolexica/jekyll-geolexica/latest.svg[Commits since latest,link=https://github.com/geolexica/jekyll-geolexica/releases]
+
+Jekyll plugin for Geolexica by the Geolexica Team.
+
+== Releasing
+
+=== New approach
+
+Do `+git tag ${version-tag}+` or, start release manually with the
+https://github.com/geolexica/jekyll-geolexica/actions/workflows/release.yml[`release.yml` workflow]

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,17 +31,17 @@ 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}")
+        Jekyll.logger.debug('Geolexica:',
+                            "reading concept from file #{concept_file_path}")
 
-        concept_hash = if glossary_format == "paneron"
+        concept_hash = if glossary_format == 'paneron'
                          read_paneron_concept_file(concept_file_path)
                        else
                          read_concept_file(concept_file_path)
@@ -49,9 +49,9 @@ module Jekyll
 
         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
 
@@ -63,14 +63,19 @@ module Jekyll
       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['termid'] = concept['data']['identifier']
 
-        concept["data"]["localizedConcepts"].each do |lang, local_concept_id|
+        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"]
+          concept[lang] = YAML.safe_load(File.read(localized_concept_path), **safe_load_options)['data']
 
-          if lang == "eng" && concept[lang]
-            concept["term"] = concept[lang]["terms"].first["designation"]
+          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[lang]['entry_status'] = concept[lang]['status']
           end
         end
 
@@ -78,14 +83,13 @@ module Jekyll
       end
 
       # Does nothing, but some sites may replace this method.
-      def preprocess_concept_hash(concept_hash)
-      end
+      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.
@@ -95,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)
@@ -104,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.6".freeze
+    VERSION = "1.8.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -156,6 +156,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- README.adoc
 - Rakefile
 - _config.yml
 - _data/lang.yaml