relaton-render 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e893e8e3387625e3c0fa4d92117bf0580df3eda1fd24b7893627e97a70aa6e5
-  data.tar.gz: 0741eec09057676c8198d3572ed5c441fe3ae89669bf0120a37f8ab357f746e9
+  metadata.gz: 3e355ba215a67c891399708f72baabeba37cddfc01a43df6d722c0a1aa769878
+  data.tar.gz: cdc21aa38ecdadab907db21b1b0cf58b8ce1f2ebc7966be7a894b4f58ffc3919
 SHA512:
-  metadata.gz: 5f504a73a3b3ec8e5aeb2bea0557daf0f66f552af05277fdc6b52e8bf905bd629fdc06b6a02c8a8d8ab5a19f4be6aff10135c0e3b24feeb5a9b18c5d19c952a5
-  data.tar.gz: 87add59c85c84d861650b95e2d6ae2954dbd63ba4013a199493f2e9417b727de13955b4fbf2a5b20e3a00405dd0ae2c4e78d3cc1e8496f1d8ad2cd6d5c4188b4
+  metadata.gz: f52456f0d7708e911a731fb6f584aed61cced226ed4f7a5de54407b0563ccaa5e5d182472cc0d01d2a59e13d1955910b8cfed1fd601d79ac88745ec6cab45743
+  data.tar.gz: aeb47b97f4146f90bdc86a3e2b5637e35675c67e37bb79b49010a450d34adcfb5c2792b3334ecedf8ff2749bc3511afaeb42442cf35eb8ef840f56d2599f654c

data/README.adoc

@@ -191,6 +191,7 @@ The Liquid template surrounds each field by preceding and following punctuation.
 * Underscore is escaped by \. So `<span_class="std\_note">` maps to `<span class="std_note">`.
 * If punctuation is space delimited, it is inserted regardless of preceding content. So `{{ creatornames }} ({{date}}) .` will insert the full stop whether or not the date is present.
 * Space between punctuation and before punctuation is automatically removed.
+* Spaces within fields are globally converted to underscores. For that reason, any filter operations in Liquid need to refer to underscore instead of space.
 
 For example:
 
@@ -218,7 +219,7 @@ draws on the following fields drawn from the bibliographic item:
 | surname[0] | ./contributor[1]/person/name/surname \| ./contributor[1]/person/name/completename | | i.e. surname is the name default
 | surname[1] | ./contributor[2]/name/surname | |
 | surname[2] | ./contributor[3]/name/surname | |
-| initials[0] | ./contributor[1]/name/initial | | If not supplied, the first letter of each given name is used instead
+| initials[0] | ./contributor[1]/name/formatted-initials \| ./contributor[1]/name/forename/@initial | | If not supplied, the first letter of each given name is used instead
 | initials[1] | ./contributor[2]/name/initial | |
 | given[0] | ./contributor[1]/name/forename[1] | | If not supplied, initials are used instead
 | given[1] |  ./contributor[2]/name/forename[1] | |
@@ -228,6 +229,10 @@ draws on the following fields drawn from the bibliographic item:
 | nonpersonal[1] |./contributor[2]/organization/name | Y |
 |===
 
+The `formatted-initials` field is presumed to contain full stops, and so do the surrogates of that field done by using individual
+forenames' `initial` attributes, or the forename initials. If the full stops are to be stripped, that needs to occur within the
+Liquid template.
+
 There are at least three distinct `nametemplate` instances that need to be provided, one for a single contributor (`one:`), one for two contributors (`two:`), one for three or more (`more:`), and optionally one for "et al." (`etal:`). The number of contributors for which "et al." starts being used is indicated by `etal_count`.
 
 For example:

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

@@ -61,19 +61,25 @@ module Relaton
       end
 
       def suffix_date(ret)
-        ret.each_value do |v|
-          v.each_value do |v1|
-            next if v1.size < 2
+        ret.each do |k, v|
+          v.each do |k1, v1|
+            next if v1.reject { |b| b[:date].nil? }.size < 2
 
-            v1.each_with_index do |b, i|
-              b[:date] += ("a".ord + i).chr.to_s
-              b[:data_liquid][:date] = b[:date]
-            end
+            suffix_date1(ret, k, k1)
           end
         end
         ret
       end
 
+      def suffix_date1(ret, key1, key2)
+        ret[key1][key2].each_with_index do |b, i|
+          next if b[:date].nil?
+
+          b[:date] += ("a".ord + i).chr.to_s
+          b[:data_liquid][:date] = b[:date]
+        end
+      end
+
       def to_hash(ret)
         ret.each_with_object({}) do |(_k, v), m|
           v.each do |_k1, v1|

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

@@ -1,9 +1,9 @@
 nametemplate:
-  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase }} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: '. '}}.{%endif%}{% endif %}"
-  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: '. '}}.{%endif%}{% endif %} {{ labels['and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: '. '}}.{%endif%} {{surname[1] | upcase}}{% endif %}"
-  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: '. '}}.{%endif%}{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: '. '}}.{%endif%} {{surname[1] | upcase}}{% endif %} {{ labels['and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{%if given[2]%}{{given[2]}} {{middle[2]}}{%else%}{{initials[2] | join: '. '}}.{%endif%} {{surname[2] | upcase}}{% endif %}"
+  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase }} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %}"
+  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %} {{ labels['and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %}"
+  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %} {{ labels['and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{%if given[2]%}{{given[2]}} {{middle[2]}}{%else%}{{initials[2] | join: ' '}}.{%endif%} {{surname[2] | upcase}}{% endif %}"
 # disabled the following: they should be provided in inheriting calls
-# etal: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: '. '}}.{%endif%}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: '. '}}.{%endif%} {{surname[1] | upcase}}{% endif %} <em>et al.</em>"
+# etal: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %} <em>et al.</em>"
 # etal_count: 5
 authorcitetemplate:
   one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }}{% endif %}"

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

@@ -15,12 +15,15 @@ module Relaton
       end
 
       def given_and_middle_name(person)
-        forenames = person.name.forename.map(&:content)
-        initials = person.name.initial.map(&:content)
-          .map { |x| x.sub(/\.$/, "") }
+        forenames = person.name.forename.map do |x|
+          x.content.empty? ? "#{x.initial}." : x.content
+        end
+        initials = person.name.initials&.content&.sub(/(.)\.?$/, "\\1.")
+        initials ||= person.name.forename.map(&:initial)
+          .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
         forenames.empty? and initials.empty? and return [nil, nil, nil]
-        initials.empty? and initials = forenames.map { |x| x[0] }
-        [forenames.first, forenames[1..-1], initials]
+        initials.empty? and initials = forenames.map { |x| "#{x[0]}." }
+        [forenames.first, forenames[1..-1], Array(initials)]
       end
 
       def extractname(contributor)

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

@@ -56,9 +56,10 @@ module Relaton
       def series_title(series, _doc)
         return nil if series.nil?
 
-        series.title.respond_to?(:titles) and
+        series.title.respond_to?(:titles) && !series.title.titles.empty? and
           return series.title.titles.first.title.content
-        series.title&.title&.content || series.formattedref&.content
+        series.title.respond_to?(:title) and return series.title.title&.content
+        series.title.respond_to?(:formattedref) and series.formattedref.content
       end
 
       def series_formatted(series, _doc)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.4.1".freeze
+    VERSION = "0.4.4".freeze
   end
 end

data/relaton-render.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc-i18n"
   spec.add_dependency "liquid", "~> 4"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "relaton-bib", ">= 1.12.0"
+  spec.add_dependency "relaton-bib", ">= 1.13.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only
   #spec.metadata["rubygems_mfa_required"] = "true"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement