jekyll-geolexica 1.8.15 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c0a7c0547605c1021f70db23fb61dfd5bcc394508c380d5ba7c83d62e15050
-  data.tar.gz: dc7ebc49fd3aec4a6e3fc49432d12e6725c4acc27a68b8e8689f922a69b354a1
+  metadata.gz: 71d15e10d8832700e6e8feaa23a0347069e4e7c0482d633ae46fe66cd66bbba2
+  data.tar.gz: 8ebe077ef66a74ec5378843be25a6d6a52e3e41a7b42d4b66befb87574f8be9a
 SHA512:
-  metadata.gz: bd1b971b4fb9ab92f9f8661dc7e3476091c0470bf3c4d49111551e0284e9340ea292cd2b679e6ac6f5acc36ab2bc24f1adcb2652285784c72eff0a367a3348a2
-  data.tar.gz: f3aef44aa0bbaa85dc494463b74f8d2cce23958065666e2216354f58f46c6c8085706de66acf4b34bc56cbd5bbda2d703bc941a520a60f867e4ac44dacb627c7
+  metadata.gz: d969b0ffae0eb1435f49152892b4484282ce3093e867c8f18ac5e69241bbaad52f16675987e399e9d081e8ae366f4d7efec6bba6932c67570fb8a2868b4c1cae
+  data.tar.gz: 95f6c35f08e6baf7c7e3129e65473f7ed0fd6790a03593dbb86944f4f6f0597341f6493b747395d29c3f9f997f0978754d6ae17153754015b4b7f5139bd284af

data/_includes/concept-api-links.html

@@ -2,7 +2,7 @@
 {%- if json_url %}
 <section class="field json">
   <p class="field-name">JSON</p>
-  <p class="field-value"><a href="{{ json_url }}">{{ json_url }}</a></p>
+  <p class="field-value"><a href="{{ json_url | relative_url }}">{{ json_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -10,7 +10,7 @@
 {%- if yaml_url %}
 <section class="field yaml">
   <p class="field-name">YAML</p>
-  <p class="field-value"><a href="{{ yaml_url }}">{{ yaml_url }}</a></p>
+  <p class="field-value"><a href="{{ yaml_url | relative_url }}">{{ yaml_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -18,7 +18,7 @@
 {%- if json_url %}
 <section class="field json">
   <p class="field-name">SKOS in JSON-LD</p>
-  <p class="field-value"><a href="{{ json_url }}">{{ json_url }}</a></p>
+  <p class="field-value"><a href="{{ json_url | relative_url }}">{{ json_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -26,7 +26,7 @@
 {%- if ttl_url %}
 <section class="field ttl">
   <p class="field-name">SKOS in RDF</p>
-  <p class="field-value"><a href="{{ ttl_url }}">{{ ttl_url }}</a></p>
+  <p class="field-value"><a href="{{ ttl_url | relative_url }}">{{ ttl_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -34,6 +34,6 @@
 {%- if tbx_url %}
 <section class="field tbx">
   <p class="field-name">TBX-ISO-TML</p>
-  <p class="field-value"><a href="{{ tbx_url }}">{{ tbx_url }}</a></p>
+  <p class="field-value"><a href="{{ tbx_url | relative_url }}">{{ tbx_url | relative_url }}</a></p>
 </section>
 {% endif -%}

data/_includes/head.html

@@ -9,15 +9,15 @@
 
   <title>{% include title.html %}</title>
 
-  <link rel="icon" type="image/png" href="/images/favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="/images/android-chrome-192x192.png" sizes="192x192" />
-  <link rel="icon" type="image/png" href="/images/favicon-96x96.png" sizes="96x96" />
-  <link rel="icon" type="image/png" href="/images/favicon-16x16.png" sizes="16x16" />
-  <link rel="shortcut icon" href="/favicon.ico" />
+  <link rel="icon" type="image/png" href="{{ '/images/favicon-32x32.png' | relative_url }}" sizes="32x32" />
+  <link rel="icon" type="image/png" href="{{ '/images/android-chrome-192x192.png' | relative_url }}" sizes="192x192" />
+  <link rel="icon" type="image/png" href="{{ '/images/favicon-96x96.png' | relative_url }}" sizes="96x96" />
+  <link rel="icon" type="image/png" href="{{ '/images/favicon-16x16.png' | relative_url }}" sizes="16x16" />
+  <link rel="shortcut icon" href="{{ '/favicon.ico' | relative_url }}" />
 
   <meta name="msapplication-TileColor" content="#ffffff" />
-  <meta name="msapplication-TileImage" content="/images/mstile-144x144.png" />
-  <meta name="msapplication-config" content="/browserconfig.xml" />
+  <meta name="msapplication-TileImage" content="{{ '/images/mstile-144x144.png' | relative_url }}" />
+  <meta name="msapplication-config" content="{{ '/browserconfig.xml' | relative_url }}" />
   <meta name="theme-color" content="#ffffff" />
 
   <link rel="canonical" href="{{ page.url | replace: 'index.html', '' | relative_url }}" />
@@ -26,7 +26,7 @@
   {% if extra_stylesheets %}
     {% for ss in extra_stylesheets %}
       <link rel="stylesheet"
-        href="{{ ss.href }}"
+        href="{{ ss.href | relative_url }}"
         {% if ss.integrity %}integrity="{{ ss.integrity }}"{% endif %}
         {% if ss.crossorigin %}crossorigin="{{ ss.crossorigin }}"{% endif %}>
     {% endfor %}

data/_layouts/custom-home.html

@@ -17,7 +17,7 @@ extra_scripts:
 
 <section class="browse-concepts">
   <h2 class="section-title">Concepts</h2>
-  <a href="/concepts/" class="browse-concepts">Browse concepts</a>
+  <a href="{{ '/concepts/' | relative_url }}" class="browse-concepts">Browse concepts</a>
 </section>
 
 {{ content }}

data/_layouts/default.html

@@ -9,7 +9,7 @@
     <header class="{% if site.has_brand_name %}brand{% endif %}">
       <div class="site-headline">
         <div class="parent-org-reference">
-          <a href="/" class="logo-link">
+          <a href="{{ '/' | relative_url }}" class="logo-link">
             <img src="{{ site.committee.main_logo.path | relative_url }}" alt="{{ site.committee.main_logo.alt_text }}">
           </a>
         </div>
@@ -124,7 +124,7 @@
     {% if extra_scripts %}
       {% for sc in extra_scripts %}
         <script
-          src="{{ sc.src }}"
+          src="{{ sc.src | relative_url }}"
           {% if sc.integrity %}integrity="{{ sc.integrity }}"{% endif %}
           {% if sc.crossorigin %}crossorigin="{{ sc.crossorigin }}"{% endif %}></script>
       {% endfor %}

data/_pages/concept-search-index.jbuilder

@@ -8,7 +8,7 @@ permalink: "/api/concept-search-index.json"
 json.array! site["concepts"].each_with_index.to_a do |(concept, idx)|
   json.termid concept.termid
   json.term concept.data.dig("eng", "terms", 0, "designation")
-  json.term_url concept.url
+  json.term_url "#{site["baseurl"]}#{concept.url}"
 
   json.sort_order do
     json.natural idx + 1 # loop index, indexing from 1
@@ -26,7 +26,7 @@ json.array! site["concepts"].each_with_index.to_a do |(concept, idx)|
 
       json.term localized.dig("terms", 0, "designation")
       json.id localized["id"]
-      json.term_url "#{concept.url}#entry-lang-#{lang}"
+      json.term_url "#{site["baseurl"]}#{concept.url}#entry-lang-#{lang}"
       json.entry_status concept["status"]
       json.language_code localized["language_code"]
       json.review_decision english["review_decision"]

data/_pages/concepts-index.jbuilder

@@ -12,8 +12,11 @@ for concept_page in site["concepts"]
   json.set! concept_page.termid.to_s do
     json.term concept_page.data["term"]
     json.termid concept_page.termid
-    json.set! "uri-html", concept_page.url
-    json.set! "uri-json", concept_json_page&.url
+    json.set! "uri-html", "#{site["baseurl"]}#{concept_page.url}"
+
+    if concept_json_page&.url
+      json.set! "uri-json", "#{site["baseurl"]}#{concept_json_page.url}"
+    end
   end
 end
 

data/assets/js/concept-search-worker.js

@@ -1,8 +1,8 @@
 ---
 ---
-importScripts('/assets/js/babel-polyfill.js');
+importScripts("{{ '/assets/js/babel-polyfill.js' | relative_url }}");
 
-const CONCEPTS_URL = '/api/concept-search-index.json';
+const CONCEPTS_URL = "{{ '/api/concept-search-index.json' | relative_url }}";
 
 /** For example:
  *    const LANGUAGES = [ 'eng', 'deu' ];

data/assets/js/concept-search.js

@@ -2,7 +2,7 @@
 ---
 (function () {
 
-  const searchWorker = new Worker('/assets/js/concept-search-worker.js');
+  const searchWorker = new Worker("{{ '/assets/js/concept-search-worker.js' | relative_url }}");
 
   /** For example:
    *    const LANGUAGES = [ 'eng', 'deu' ];
@@ -231,7 +231,7 @@
         );
       }
       headerEls.push(el('span', { key: 'title' }, 'Find a concept'));
-      headerEls.push(el('a', { key: 'link', href: '/concepts' }, '(browse all)'));
+      headerEls.push(el('a', { key: 'link', href: "{{ '/concepts' | relative_url }}" }, '(browse all)'));
 
       var els = [
         el('h2', { key: 'section-title', className: 'section-title' }, headerEls),

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.7"
   # 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.

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,28 @@ 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,
+            "status" => managed_concept.status,
+          }.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 +54,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.15".freeze
+    VERSION = "1.9.1".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.15
+  version: 1.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2024-03-21 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.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement