relaton-render 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b793b2241dd48d9b20f015798de7b1a8ec90fbfb5ec9c72b62668c0031f25e
-  data.tar.gz: f7dbd1c10347b24a9384cd5fb3d93fd4b8369d3880b4babd6aa765b0d12480a9
+  metadata.gz: b834b958e0a0c893b641087a171141972d18626cd01c66bce85e29a898d4fa40
+  data.tar.gz: 44b06318fdd7c00cca50fb0b309a84faaa26f914bade814f2a4389998076e7a1
 SHA512:
-  metadata.gz: f8121638021e74fe1d63ab87921d56b807c89d7f3d00ba4d11fc2b70d5442078f524cfae724b5b8669f48d5036eef50891c60a20cd3a842c132e0c301a9b249c
-  data.tar.gz: 0ee0d7ed68bfed31bff88f79001e615f51d2459b32940c8b33b9fa7d91114955b75b7282fbd58e9cddbb7c8d2983f831c582f600753140019100b12e5bc48f4e
+  metadata.gz: cd66e65e6a282d5926701f28965bcb6e857acc4fb675936effd18e7c40b957c9ec645522bdbea2ff50f7f12b5db44bddb1a3d66b1ca986b113b9cba38bd0a8fc
+  data.tar.gz: ad226183da8ff58d03f8b8cc75e9795b20a503f5c73adb6df6210f5c95382da1992a51d86a19acd526c38977d010437bc64171943704ce15f8c7586af9558af1

data/lib/relaton/render/fields/fields.rb

@@ -82,11 +82,13 @@ module Relaton
         @r.i18n.select(hash).get.dig("stage", status) || status
       end
 
+      # date => disambiguated_date, the disambiguation happens in citations/
       def date_fields_format(hash)
-        [%i(date date), %i(date_updated date_updated),
+        [%i(date date), %i(disambiguated_date date),
+         %i(date_updated date_updated),
          %i(date_accessed date_accessed)].each do |k|
           hash[k[0]] = dateformat(hash[k[1]], hash, k)
-          k[0] == :date &&
+          k[1] == :date &&
             !%w(standard webresource website).include?(hash[:type]) and
             hash[k[0]] ||= @r.i18n.select(nil).get["no_date"]
         end

data/lib/relaton/render/general/citations.rb

@@ -94,8 +94,8 @@ module Relaton
           i = @i18n.select(b[:data])
           b[:citation][:default] =
             i.l10n(b[:data][:authoritative_identifier]&.first || "")
-          b[:citation][:short] = i.l10n(renderer(b).citeshorttemplate
-            .render(b[:data].merge(citestyle: "short"), b[:data]))
+          d = b[:data].merge(citestyle: "short")
+          b[:citation][:short] = i.l10n(renderer(b).citeshorttemplate.render(d, d))
           citations_iterate_cite_styles(b, i)
         end
         ret
@@ -135,20 +135,29 @@ module Relaton
       def suffix_date(ret)
         ret.each do |k, v|
           v.each do |k1, v1|
-            next if v1.reject { |b| b[:date].nil? }.size < 2
-
-            suffix_date1(ret, k, k1)
+            s =  v1.reject { |b| b[:date].nil? }.size
+            s.zero? || k.nil? and next
+            suffix_date1(ret, k, k1, s)
+            copy_date_fields(ret, k, k1)
           end
         end
         ret
       end
 
-      def suffix_date1(ret, key1, key2)
-        key1.nil? and return
+      def suffix_date1(ret, key1, key2, size)
+        size > 1 or return
         ret[key1][key2].each_with_index do |b, i|
           b[:date].nil? and next
-          b[:date] += ("a".ord + i).chr.to_s
+          b[:disambiguated_date] = b[:date] + ("a".ord + i).chr.to_s
+        end
+      end
+
+      def copy_date_fields(ret, key1, key2)
+        ret[key1][key2].each do |b|
+          b[:date].nil? and next
           b[:data][:date] = b[:date]
+          b[:disambiguated_date] ||= b[:date]
+          b[:data][:disambiguated_date] = b[:disambiguated_date]
         end
       end
 
@@ -157,7 +166,8 @@ module Relaton
           v.each_value do |v1|
             v1.each do |b|
               m[b[:id]] = { author: @i18n.select(b[:data]).l10n(b[:author]),
-                            date: b[:date], citation: {},
+                            date: b[:disambiguated_date] || b[:date],
+                            citation: {},
                             data: b[:data], type: b[:type] }
             end
           end

data/lib/relaton/render/general/config.yml

@@ -37,10 +37,10 @@ language: en
 script: Latn
 
 citetemplate:
-  author_date: "{{ author }} {{ date}}"
-  author_date_br: "{{ author }} ({{ date}})"
+  author_date: "{{ author }} {{ disambiguated_date}}"
+  author_date_br: "{{ author }} ({{ disambiguated_date}})"
   author: "{{ author }}"
-  date: "{{ date }}"
+  date: "{{ disambiguated_date }}"
   reference_tag: "{{ biblio_tag }}"
   title: "{{ title }}"
   title_reference_tag: "{{ title }} {{ biblio_tag }}"

data/lib/relaton/render/general/render.rb

@@ -144,7 +144,7 @@ module Relaton
       end
 
       def default_template
-        "{{creatornames}}. {{title}}. {{date}}."
+        "{{creatornames}}. {{title}}. {{disambiguated_date}}."
       end
 
       def i18n_klass(language: "en", script: "Latn", locale: nil, i18nhash: nil)

data/lib/relaton/render/template/subclasses.rb

@@ -48,7 +48,6 @@ module Relaton
         # ...[0], ...[1], ...[2]
         def expand_nametemplate(template, size)
           t = nametemplate_split(template)
-
           mid = (1..size - 2).each_with_object([]) do |i, m|
             m << t[1].gsub("[1]", "[#{i}]")
           end
@@ -68,6 +67,7 @@ module Relaton
         def nametemplate_split(template)
           curr = 0
           prec = ""
+          @in_name = 0
           t = template.split(/(\{[{%][^{]+?[}%]\})/)
             .each_with_object([""]) do |n, m|
             m, curr, prec = nametemplate_split1(n, m, curr, prec)
@@ -79,6 +79,9 @@ module Relaton
 
         def nametemplate_split1(elem, acc, curr, prec)
           if match = /\{[{%].+?\[(\d)\]/.match(elem)
+            # we are in a name component
+            # if an if is started, track the if nesting...
+            @in_name += 1 if /\{%\s*if/.match?(elem)
             if match[1].to_i > curr
               curr += 1
               acc[curr] ||= ""
@@ -86,7 +89,10 @@ module Relaton
             acc[curr] += prec
             prec = ""
             acc[curr] += elem
-          elsif /\{%\s*endif/.match?(elem)
+          elsif /\{%\s*endif/.match?(elem) && @in_name.positive?
+            # stick the endif to the currently if-nested name component,
+            # if we are in one (@in_name.positive?)
+            @in_name -= 1
             acc[curr] += prec
             prec = ""
             acc[curr] += elem

data/lib/relaton/render/template/template.rb

@@ -115,10 +115,12 @@ module Relaton
         # potentially enhanced
         def render(hash, context)
           t = template_select(hash) or return nil # TODO select on context?
-          i = @i18n.select(context).get
-          ret = template_clean(t.render(liquid_hash(hash.merge("labels" => i))))
-          template_components(ret,
-                              i.dig("punct", "biblio-field-delimiter") || ". ")
+          i = @i18n.select(context)
+          i18nsettings = { "labels" => i.get, "lang" => i.lang,
+                           "script" => i.script, "locale" => i.locale }
+          ret = template_clean(t.render(liquid_hash(hash.merge(i18nsettings))))
+          bib_delim = i.get.dig("punct", "biblio-field-delimiter") || ". "
+          template_components(ret, bib_delim, context)
         end
 
         def template_select(_hash)
@@ -172,17 +174,23 @@ module Relaton
         # Do not strip any delimiters from final field in string
         #
         # if delim = ". " , then: ({{ series }}$$$|) => (series1.)
-        def template_components(str, delim)
+        def template_components(str, delim, context)
           str or return str
           delimrstrip, delimre, delimrstripre = template_components_prep(delim)
+          ret = template_components_split(str, delimre)
+          delim != delimrstrip and # "." in field followed by ". " in delim
+            ret = remove_double_period(ret, delimrstripre)
+          context[:citestyle] == "short" and
+            ret[0] += "<span class='fmt-first-biblio-delim'/>"
+          ret.join(delim).gsub(/#{delim}\|/, delimrstrip)
+        end
+
+        def template_components_split(str, delimre)
           ret = str.gsub(NON_SPACING_DELIM, "|").split(/#{COMPONENT_DELIM}/o)
             .map(&:strip).reject(&:empty?)
-          ret = ret[0...-1].map do |s|
+          ret[0...-1].map do |s|
             s.sub(/#{delimre}$/, "").sub(%r[#{delimre}(</[^>]+>)$], "\\1")
           end + [ret.last]
-          delim != delimrstrip and # "." in field followed by ". " in delim
-            ret = remove_double_period(ret, delimrstripre)
-          ret.join(delim).gsub(/#{delim}\|/, delimrstrip)
         end
 
         def remove_double_period(ret, delimrstripre)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "1.0.3".freeze
+    VERSION = "1.0.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-01 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler