jekyll-geolexica 1.9.6 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a8652cdfc6bbcee18f8c154c6949b3e3b6bef735276441ccabe1d0f1b4bee6c
-  data.tar.gz: b9e9667dca0ecef269670c849395b6e1718fd7ca971a0f6f8017f9bfbf1c06ea
+  metadata.gz: 87780c0abd7530643394cac28becce105659a827acd9d64907402ccee1fa818f
+  data.tar.gz: a6b9c3a236d6f37d9f8f2fca755ede239ca999e68d2c470f678c5027d2335027
 SHA512:
-  metadata.gz: 568648536d09d2e9213f68f77a1fa2781cfb43470c4d24444481f2e9491e690e9e2664dbbe20a09e7fd84f1cce3d91c29434f82b81a19cdc8e0e9afa51cb1146
-  data.tar.gz: e549817d5fca3123cdbd7f552399344adbccde18a14d2b19baf0968bcf7ba60df8ce2685884ed0c26e2b7957d9c4c8c3ad7edf563f227a7491a3c94928c7bed3
+  metadata.gz: 328897babe8fa43ae29c3046733698fa880ae441173baab02b7069d1bbabd78b2e17e1bc412a788f265e7cb6b283b0eeba3912a4fd69f2cf673e65fdec31ec25
+  data.tar.gz: d2ceb20e24e7e179a3df10b8cf58564a811c856427105ba61b9932d584d634c57d24878bf50dd022b08d7bc8c86fb85e74f969563a424d5be60da01b222441a7

data/jekyll-geolexica.gemspec

@@ -19,15 +19,15 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.metadata      = {
-    "bug_tracker_uri"   => (github_url + "/issues"),
-    "homepage_uri"      => ribose_url,
-    "source_code_uri"   => github_url,
+    "bug_tracker_uri" => "#{github_url}/issues",
+    "homepage_uri" => ribose_url,
+    "source_code_uri" => github_url,
   }
 
-  spec.files         = all_files_in_git.reject do |f|
+  spec.files = all_files_in_git.reject do |f|
     [
       f.match(%r{^(test|spec|features|.github)/}),
-      f.match(%r{^\.}),
+      f.match(/^\./),
     ].any?
   end
 
@@ -35,20 +35,18 @@ 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.7"
+  spec.add_runtime_dependency "glossarist", "~> 2.3"
+  spec.add_runtime_dependency "jbuilder"
   # 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.
   # See: https://jekyllrb.com/news/2020/06/24/jekyll-4-1-1-released/
   spec.add_runtime_dependency "jekyll", ">= 3.8.5", "< 4.3", "!= 4.1.0"
-  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 "plurimath"
   spec.add_runtime_dependency "relaton"
   spec.add_runtime_dependency "unitsml"
-  spec.add_runtime_dependency "plurimath"
 
   # Zeitwerk::Loader#push_dir supports :namespace argument from v. 2.4.
   spec.add_runtime_dependency "zeitwerk", "~> 2.4"

data/lib/jekyll/geolexica/concept_page.rb

@@ -18,7 +18,7 @@ module Jekyll
       end
 
       def type
-        self.collection_name.to_sym
+        collection_name.to_sym
       end
 
       protected
@@ -171,7 +171,6 @@ module Jekyll
           "/api/concepts/#{termid}.yaml"
         end
       end
-
     end
   end
 end

data/lib/jekyll/geolexica/concept_serializer.rb

@@ -8,7 +8,7 @@ module Jekyll
     class ConceptSerializer < SimpleDelegator
       include Configuration
 
-      NON_LANGUAGE_KEYS = %w[term termid]
+      NON_LANGUAGE_KEYS = %w[term termid].freeze
 
       # A Jekyll::Site instance.
       attr_reader :site

data/lib/jekyll/geolexica/concepts_generator.rb

@@ -30,21 +30,39 @@ module Jekyll
       def make_pages
         site.glossary.each_concept do |concept|
           Jekyll.logger.debug("Geolexica:",
-            "building pages for concept #{concept.termid}")
+                              "building pages for concept #{concept.termid}")
           concept.pages.replace({
-            html: (ConceptPage::HTML.new(site, concept) if output_html?),
-            json: (ConceptPage::JSON.new(site, concept) if output_json?),
-            jsonld: (ConceptPage::JSONLD.new(site, concept) if output_jsonld?),
-            tbx: (ConceptPage::TBX.new(site, concept) if output_tbx?),
-            turtle: (ConceptPage::Turtle.new(site, concept) if output_turtle?),
-            yaml: (ConceptPage::YAML.new(site, concept) if output_yaml?),
-          })
+                                  html: (if output_html?
+                                           ConceptPage::HTML.new(site,
+                                                                 concept)
+                                         end),
+                                  json: (if output_json?
+                                           ConceptPage::JSON.new(site,
+                                                                 concept)
+                                         end),
+                                  jsonld: (if output_jsonld?
+                                             ConceptPage::JSONLD.new(site,
+                                                                     concept)
+                                           end),
+                                  tbx: (if output_tbx?
+                                          ConceptPage::TBX.new(site,
+                                                               concept)
+                                        end),
+                                  turtle: (if output_turtle?
+                                             ConceptPage::Turtle.new(site,
+                                                                     concept)
+                                           end),
+                                  yaml: (if output_yaml?
+                                           ConceptPage::YAML.new(site,
+                                                                 concept)
+                                         end),
+                                })
           add_page(*concept.pages.values.compact)
         end
       end
 
       def sort_pages
-        generated_pages.sort_by! { |p| p.termid }
+        generated_pages.sort_by!(&:termid)
       end
 
       def initialize_collections
@@ -53,6 +71,7 @@ module Jekyll
           concepts_ttl concepts_tbx concepts_yaml
         ].each do |label|
           next if site.collections[label]
+
           site.config["collections"][label] ||= { "output" => true }
           site.collections[label] = Jekyll::Collection.new(site, label)
         end
@@ -65,7 +84,7 @@ module Jekyll
       end
 
       def add_page *pages
-        self.generated_pages.concat(pages)
+        generated_pages.concat(pages)
       end
 
       def find_page(name)

data/lib/jekyll/geolexica/configuration.rb

@@ -33,17 +33,22 @@ module Jekyll
       end
 
       def images_metadata_path
-        glossary_path = glossary_config["glossary_path"]
-        return {} if glossary_path.nil? || glossary_path.empty?
+        images_metadata_path = glossary_config["images_metadata_path"] ||
+          glossary_config["glossary_path"]
+
+        return {} if images_metadata_path.nil? || images_metadata_path.empty?
 
-        File.expand_path("#{glossary_path}/images_metadata.yaml", site.source)
+        File.expand_path(
+          "#{images_metadata_path}/images_metadata.yaml", site.source
+        )
       end
 
       def bibliography_path
-        glossary_path = glossary_config["glossary_path"]
-        return nil if glossary_path.nil? || glossary_path.empty?
+        bibliography_path = glossary_config["bibliography_path"] ||
+          glossary_config["glossary_path"]
+        return nil if bibliography_path.nil? || bibliography_path.empty?
 
-        File.expand_path("#{glossary_path}/bibliography.yaml", site.source)
+        File.expand_path("#{bibliography_path}/bibliography.yaml", site.source)
       end
 
       def suggest_translation_url

data/lib/jekyll/geolexica/filters.rb

@@ -11,12 +11,16 @@ module Jekyll
       #
       # TODO Maybe support string inputs.
       def display_authoritative_source(input)
-        ref, clause, link = input["origin"].values_at("ref", "clause", "link") rescue nil
+        ref, clause, link = begin
+          input["origin"].values_at("ref", "clause", "link")
+        rescue StandardError
+          nil
+        end
 
         return "" if ref.nil? && link.nil?
 
         ref_caption = escape_once(ref || link)
-        ref_part = link ? %[<a href="#{link}">#{ref_caption}</a>] : ref_caption
+        ref_part = link ? %(<a href="#{link}">#{ref_caption}</a>) : ref_caption
 
         clause_part = clause && escape_once(clause)
 
@@ -25,7 +29,7 @@ module Jekyll
         modification = input["modification"]
         return source unless modification
 
-        "#{source}, #{input["status"] || "modified"} -- #{modification}"
+        "#{source}, #{input['status'] || 'modified'} -- #{modification}"
       end
 
       def concepts_url(base_url)
@@ -86,8 +90,12 @@ module Jekyll
           link = bib_ref["link"]
           docidentifier = bib_ref["reference"]
         else
-          link = bib_ref["link"].detect { |l| l["type"] == "src" }["content"]["uri_string"]
-          docidentifier = bib_ref["docidentifier"].detect { |d| d["primary"] }["id"]
+          link = bib_ref["link"].detect do |l|
+            l["type"] == "src"
+          end["content"]["uri_string"]
+          docidentifier = bib_ref["docidentifier"].detect do |d|
+            d["primary"]
+          end["id"]
         end
 
         link_tag(link, docidentifier)
@@ -133,11 +141,14 @@ module Jekyll
 
       def images_metadata
         site = @context.registers[:site]
-        glossary_path = site.config["geolexica"]["glossary_path"]
-        return {} if glossary_path.nil? || glossary_path.empty?
+        site_config = site.config["geolexica"]
+        images_metadata_path = site_config["images_metadata_path"] ||
+          site_config["glossary_path"]
+        return {} if images_metadata_path.nil? || images_metadata_path.empty?
 
         @images_metadata ||= YAML.safe_load_file(
-          File.expand_path("#{glossary_path}/images_metadata.yaml", site.source),
+          File.expand_path("#{images_metadata_path}/images_metadata.yaml",
+                           site.source),
           permitted_classes: [Time],
         )
       end

data/lib/jekyll/geolexica/glossary.rb

@@ -17,19 +17,20 @@ module Jekyll
       end
 
       def load_glossary
-        Jekyll.logger.info('Geolexica:', 'Loading concepts')
+        Jekyll.logger.info("Geolexica:", "Loading concepts")
         @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,
+            "termid" => managed_concept.data.id,
             "status" => managed_concept.status,
-          }.merge(managed_concept.to_h)
+          }.merge(managed_concept.to_yaml_hash)
 
           managed_concept.localizations.each do |lang, localization|
-            concept_hash[lang] = localization.to_h["data"]
+            concept_hash[lang] =
+              localization.to_yaml_hash["data"].merge({ "status" => localization.entry_status })
           end
 
           preprocess_concept_hash(concept_hash)
@@ -38,7 +39,7 @@ module Jekyll
       end
 
       def store(concept)
-        super(concept.data['termid'], concept)
+        super(concept.data["termid"], concept)
       end
 
       def language_statistics
@@ -48,7 +49,7 @@ module Jekyll
       # Defines how Glossary is exposed in Liquid templates.
       def to_liquid
         {
-          'language_statistics' => language_statistics
+          "language_statistics" => language_statistics,
         }
       end
 
@@ -59,9 +60,9 @@ module Jekyll
 
       def calculate_language_statistics
         unsorted = each_value.lazy
-                             .flat_map { |concept| term_languages & concept.data.keys }
-                             .group_by(&:itself)
-                             .transform_values(&:count)
+          .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.
@@ -80,7 +81,7 @@ module Jekyll
         end
 
         def termid
-          data['termid']
+          data["termid"]
         end
 
         class LiquidCompatibleHash < Hash

data/lib/jekyll/geolexica/hooks.rb

@@ -40,13 +40,13 @@ module Jekyll
             ascii_equation = CGI.unescapeHTML(Regexp.last_match[1])[1..-2]
 
             mathml_equation = ::Plurimath::Math
-                                .parse(ascii_equation, math_notation)
-                                .to_mathml
+              .parse(ascii_equation, math_notation)
+              .to_mathml
 
             normalize_mathml(mathml_equation, page.html?)
           end
         end
-      rescue => e
+      rescue StandardError => e
         # Skipping broken formulas
         Jekyll.logger.info(e.message)
       end
@@ -54,16 +54,20 @@ module Jekyll
       def normalize_mathml(mathml_equation, is_html)
         # temporary hack to use display inline for math equations because
         # currently there is no option to use display inline in plurimath
-        mathml_equation = mathml_equation.gsub("display=\"block\"", "display=\"inline\"")
+        mathml_equation = mathml_equation.gsub('display="block"',
+                                               'display="inline"')
 
         # Removing newlines(\n) and escaping double quotes(")
         # because they will cause parsing issues in json
-        mathml_equation = mathml_equation.gsub("\n", "").gsub("\"", "\\\"") unless is_html
+        unless is_html
+          mathml_equation = mathml_equation.delete("\n").gsub('"',
+                                                              '\"')
+        end
 
         mathml_equation
       end
 
-      def hook event, target, action
+      def hook(event, target, action)
         Jekyll::Hooks.register target, event, &method(action)
       end
     end

data/lib/jekyll/geolexica/jbuilder_tag.rb

@@ -1,7 +1,7 @@
 # (c) Copyright 2021 Ribose Inc.
 #
 
-# TODO Extract that to a separate gem.
+# TODO: Extract that to a separate gem.
 
 require "jbuilder"
 
@@ -13,7 +13,7 @@ module Jekyll
         wrapper = JbuilderWrapper.new(context)
         wrapper.eval_source(source)
         wrapper.target!
-      rescue
+      rescue StandardError
         Jekyll.logger.error $!.detailed_message
         raise
       end
@@ -39,9 +39,7 @@ module Jekyll
           @builder
         end
 
-        def context
-          @context
-        end
+        attr_reader :context
 
         def page
           @context["page"]
@@ -53,7 +51,7 @@ module Jekyll
 
         def eval_source(source)
           instance_eval(source)
-        rescue
+        rescue StandardError
           raise Error.new(source)
         end
 

data/lib/jekyll/geolexica/meta_pages_generator.rb

@@ -28,6 +28,7 @@ module Jekyll
       def make_pages
         all_pages_pathnames.each do |p|
           next if skip_page?(p)
+
           add_page Page.new(site, base_dir, p.dirname.to_s, p.basename.to_s)
         end
       end
@@ -35,9 +36,9 @@ module Jekyll
       # Lists all regular files in +base_dir+ recursively, and returns them
       # as an Array of Pathname instances, which are relative to +base_dir+.
       def all_pages_pathnames
-        Dir.glob("**/*", base: base_dir).
-          map { |path| Pathname.new(path) }.
-          reject { |pathname| pathname.expand_path(base_dir).directory? }
+        Dir.glob("**/*", base: base_dir)
+          .map { |path| Pathname.new(path) }
+          .reject { |pathname| pathname.expand_path(base_dir).directory? }
       end
 
       def base_dir
@@ -46,12 +47,12 @@ module Jekyll
 
       def skip_page?(pathname)
         (pathname.extname == ".ttl" && !output_turtle?) ||
-        (pathname.extname == ".json" && !output_json?) ||
-        false
+          (pathname.extname == ".json" && !output_json?) ||
+          false
       end
 
       def add_page *pages
-        self.generated_pages.concat(pages)
+        generated_pages.concat(pages)
       end
     end
   end

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.9.6".freeze
+    VERSION = "1.9.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2025-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glossarist
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +65,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: jekyll-asciidoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -65,7 +79,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jekyll-asciidoc
+  name: plurimath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,20 +92,6 @@ 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
@@ -120,20 +120,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: plurimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +190,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-description: 
+description:
 email:
 - open.source@ribose.com
 executables: []
@@ -305,7 +291,7 @@ metadata:
   bug_tracker_uri: https://github.com/geolexica/jekyll-geolexica/issues
   homepage_uri: https://open.ribose.com/
   source_code_uri: https://github.com/geolexica/jekyll-geolexica
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -320,8 +306,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Geolexica plugin for Jekyll
 test_files: []