relaton-render 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5881b8b6067c4c4b679d7d7037ea9b3bb4537ad29c8b4d18f786e7f2a369cb7
-  data.tar.gz: 8f206ce02d52cd4a5781b8ddae109d540e18dcfe460264d5695c68a42a0fc642
+  metadata.gz: 1473c5dc29146f1092fab77dda408f5bc0e15891991f6ecb54775625028d62d2
+  data.tar.gz: c2008fe936003b2304fd437f3f19983ea6c64041d4442cdfd855e439a1f73965
 SHA512:
-  metadata.gz: c2e5f22923975ff914f60dbb8f885bb71d23249f844f0e82e5bae0635a1792ac2f254ec5cedfae59feac9823bf837c65aedc80947bda0dbfce74f81815353c21
-  data.tar.gz: c38f524ec2a3fc25f39a8837dcdc4f56f2061f3e1d9457605cdfb18eb0017405de69bd9ca7ff4788a002a324e639b271f8dd4b4876c7e6b65f188ce3ec9c3719
+  metadata.gz: '093e82b2f66e172221a6846a59f49d75f1a0e638c0cb7900f9d0e2395f49b196824c24dddb29aeab08280f48935db93fc8fffb3d927392e5903623562291713f'
+  data.tar.gz: 1761156e4dba5d2d5ae43081a6e83b117aeb4a5e5c9c06e0099bfe98e7889e2e28a4d29a618a0f7d62593662da49bc6d18de4c13d1f852d5fd54da580a94a83e

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

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

@@ -5,20 +5,23 @@ require "yaml"
 require "liquid"
 require "date"
 require "relaton_bib"
+require "metanorma-utils"
 require_relative "../template/template"
 require_relative "../../../isodoc/i18n"
 
 module Relaton
   module Render
     class General
+      Hash.include ::Metanorma::Utils::Hash
+      Array.include ::Metanorma::Utils::Array
+
       attr_reader :template, :journaltemplate, :seriestemplate, :nametemplate,
                   :authorcitetemplate, :extenttemplate, :sizetemplate,
                   :citetemplate, :citeshorttemplate, :lang, :script, :i18n,
                   :edition, :date, :fieldsklass, :dateklass, :config
 
       def initialize(opt = {})
-        @config = read_config
-        options = @config.merge(Utils::string_keys(opt))
+        options = init_options(opt)
         @type = self.class.name.downcase.split("::").last
         klass_initialize(options)
         root_initalize(options)
@@ -27,6 +30,13 @@ module Relaton
         init_misc
       end
 
+      def init_options(opt)
+        opt = opt.stringify_all_keys
+        @override_file ||= opt["config"]
+        @config = config_override(read_config)
+        @config.merge(opt)
+      end
+
       def init_misc
         @semaphore = Mutex.new
         @urlcache = {}
@@ -37,6 +47,12 @@ module Relaton
         YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
       end
 
+      def config_override(ret)
+        new = {}
+        @override_file and new = YAML.load_file(@override_file)
+        ret.deep_merge(new)
+      end
+
       def klass_initialize(options)
         @nametemplateklass = Relaton::Render::Template::Name
         @authorcitetemplateklass = Relaton::Render::Template::AuthorCite

data/lib/relaton/render/parse/parse_id.rb

@@ -65,7 +65,8 @@ module Relaton
       end
 
       def authoritative_identifier_exclude
-        %w(METANORMA METANORMA-ORDINAL TITLE URN ISO-REFERENCE) + other_identifier_include
+        %w(METANORMA METANORMA-ORDINAL AUTHOR-DATE TITLE URN ISO-REFERENCE) +
+          other_identifier_include
       end
 
       def other_identifier(doc)

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

@@ -1,6 +1,7 @@
-require_relative "../utils/utils"
+# require_relative "../utils/utils"
 require_relative "liquid"
 require "singleton"
+require "metanorma-utils"
 
 module Relaton
   module Render
@@ -10,6 +11,9 @@ module Relaton
 
         attr_accessor :mutex
 
+        Hash.include ::Metanorma::Utils::Hash
+        Array.include ::Metanorma::Utils::Array
+
         def initialize
           @cache = {}
           @mutex = Mutex.new
@@ -39,7 +43,8 @@ module Relaton
         end
 
         def parse_options(opt)
-          opt = Utils::sym_keys(opt)
+          # opt = Utils::sym_keys(opt)
+          opt = opt.symbolize_all_keys
           @i18n = opt[:i18n]
           @template_raw = opt[:template].dup
           @template =
@@ -110,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)
@@ -167,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.2".freeze
+    VERSION = "1.0.4".freeze
   end
 end

data/lib/relaton-render.rb

@@ -2,7 +2,6 @@ require "relaton/render/version"
 require "relaton/render/general/render"
 require "relaton/render/fields/fields"
 require "relaton/render/parse/parse"
-require "relaton/render/utils/utils"
 require "relaton/render/i18n/i18n"
 require "isodoc/i18n"
 require "base64" # Liquid

data/relaton-render.gemspec

@@ -25,18 +25,19 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "isodoc"
+  spec.add_development_dependency "openssl"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "openssl"
 
+  spec.add_dependency "base64" # Liquid
+  spec.add_dependency "bigdecimal" # Liquid
   spec.add_dependency "isodoc-i18n", "~> 1.4.0"
   spec.add_dependency "liquid", "~> 5"
+  spec.add_dependency "metanorma-utils", "~> 2"
   spec.add_dependency "nokogiri"
   spec.add_dependency "relaton-bib", ">= 1.20.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only
-  spec.add_dependency "base64" # Liquid
-  spec.add_dependency "bigdecimal" # Liquid
-  #spec.metadata["rubygems_mfa_required"] = "true"
+  # spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2026-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +123,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: openssl
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,63 +137,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: isodoc-i18n
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: liquid
+  name: isodoc-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: relaton-bib
+  name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: twitter_cldr
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,21 +207,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo-data
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
-  name: base64
+  name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bigdecimal
+  name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -279,7 +293,6 @@ files:
 - lib/relaton/render/template/liquid.rb
 - lib/relaton/render/template/subclasses.rb
 - lib/relaton/render/template/template.rb
-- lib/relaton/render/utils/utils.rb
 - lib/relaton/render/version.rb
 - relaton-render.gemspec
 homepage: https://github.com/relaton/relaton-render

data/lib/relaton/render/utils/utils.rb

@@ -1,27 +0,0 @@
-module Relaton
-  module Render
-    module Utils
-      def self.string_keys(hash)
-        case hash
-        when Hash
-          hash.each_with_object({}) do |(k, v), ret|
-            ret[k.to_s] = string_keys(v)
-          end
-        when Array then hash.map { |n| string_keys(n) }
-        else hash
-        end
-      end
-
-      def self.sym_keys(hash)
-        case hash
-        when Hash
-          hash.each_with_object({}) do |(k, v), ret|
-            ret[k.to_sym] = sym_keys(v)
-          end
-        when Array then hash.map { |n| sym_keys(n) }
-        else hash
-        end
-      end
-    end
-  end
-end