jekyll-geolexica 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f479dfc2225e9c5a6fded676c733ae54d9d2e9c42b92d2fc59d46f0f8ab14213
-  data.tar.gz: a8f4492903569521e575ca726a0734910f6db2c6d3c4842ff74d4b5a2a6630db
+  metadata.gz: 84b336a4bbc401ff60ff72c59f3f4e5086f6b300182b37a1a7e12bc0e532a73d
+  data.tar.gz: 10443bf14b7126ce05c80f1beb7130152e97cf1ed0eb7d8060ea0b725438def6
 SHA512:
-  metadata.gz: cc239129a0e3c802d88cfaae5bc78f6833d9eb3e92f431876c64211760ed5ebdd1cb9be0066d91b9ca9f25aa37ca0d24fd6d34d65bf2cf3138c7427ad9910c54
-  data.tar.gz: d6a09b8b8090246eec080a775d7a4a41ca1e9ce23db85cd8eb766aa64c88e79103a5beba9916ad74e0f981ac8339443c1cb345559c509c96b04fca77595db5fc
+  metadata.gz: 510924b7936929b37e8bba19999d392bfbf253c5719a47389ae335594c0cf91d51496ed8eb03bf17bab689b7dd7b5dd39000fc9ea0a41bb8a21207ccc371c44a
+  data.tar.gz: 06d4421c7db00c7adf24e51072dfa8b8a37a028ee4a92eea2601471605daf759466e159218344d2786dde901ec34f8c590f3a2874df05c61ca38c85c48f75ed6

data/_includes/concept-source.html

@@ -1,11 +1,6 @@
-{%- assign english = page["eng"] -%}
 <section class="field source">
   <p class="field-name">source</p>
   <p class="field-value">
-    {% if english.authoritative_source.link %}
-      <a href="{{ english.authoritative_source.link }}">{{ english.authoritative_source.ref | default: english.authoritative_source.link | escape_once }}</a>{% if english.authoritative_source.clause %}, {{ english.authoritative_source.clause }}{% endif %}
-    {% else %}
-      {{ english.authoritative_source.ref }}{% if english.authoritative_source.clause %}, {{ english.authoritative_source.clause }}{% endif %}
-    {% endif %}
+    {{ page["eng"].authoritative_source | display_authoritative_source }}
   </p>
 </section>

data/_includes/localized-concept.html

@@ -26,16 +26,9 @@
     {% endif %}
 
     {% if localized_term.authoritative_source.ref != english.authoritative_source.ref %}
-    {% if localized_term.authoritative_source.link %}
       <p class="source localized">
-        [SOURCE: <a href="{{ localized_term.authoritative_source.link }}">
-          {{ localized_term.authoritative_source.ref }}</a>{% if localized_term.authoritative_source.clause %}, {{ localized_term.authoritative_source.clause }}{% endif %}]
+        [SOURCE: {{ localized_term.authoritative_source | display_authoritative_source }}]
       </p>
-    {% else %}
-      <p class="source localized">
-        [SOURCE: {{ localized_term.authoritative_source.ref }}{% if localized_term.authoritative_source.clause %}, {{ localized_term.authoritative_source.clause }}{% endif %}]
-      </p>
-    {% endif %}
       <span class="warning">
         This translated term may not be from the same source as the normative term.
       </span>

data/lib/jekyll/geolexica.rb

@@ -16,6 +16,7 @@ require_relative "geolexica/configuration"
 require_relative "geolexica/concept_page"
 require_relative "geolexica/concept_serializer"
 require_relative "geolexica/concepts_generator"
+require_relative "geolexica/filters"
 require_relative "geolexica/glossary"
 require_relative "geolexica/hooks"
 require_relative "geolexica/meta_pages_generator"

data/lib/jekyll/geolexica/filters.rb

@@ -0,0 +1,26 @@
+module Jekyll
+  module Geolexica
+    module Filters
+      # Renders authoritative source hash as HTML.
+      #
+      # @param input [Hash] authoritative source hash.
+      # @return [String]
+      #
+      # TODO Maybe support string inputs.
+      def display_authoritative_source(input)
+        ref, clause, link = input.values_at("ref", "clause", "link") rescue nil
+
+        return "" if ref.nil? && link.nil?
+
+        ref_caption = escape_once(ref || link)
+        ref_part = link ? %[<a href="#{link}">#{ref_caption}</a>] : ref_caption
+
+        clause_part = clause && escape_once(clause)
+
+        [ref_part, clause_part].compact.join(", ")
+      end
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::Geolexica::Filters)

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.5.1".freeze
+    VERSION = "1.5.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -187,6 +187,7 @@ files:
 - lib/jekyll/geolexica/concept_serializer.rb
 - lib/jekyll/geolexica/concepts_generator.rb
 - lib/jekyll/geolexica/configuration.rb
+- lib/jekyll/geolexica/filters.rb
 - lib/jekyll/geolexica/glossary.rb
 - lib/jekyll/geolexica/hooks.rb
 - lib/jekyll/geolexica/meta_pages_generator.rb
@@ -216,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Geolexica plugin for Jekyll