relaton-render 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb92be3ce06dd2d7d1f2c940826ffcb94b061e0beeef81ccc745f85d10aed42
-  data.tar.gz: a7333f5a5d1154c8dcbe85135955595530bab40b584ac34a5f1febe67882d3b8
+  metadata.gz: 15d7bd7a186b81235cfc86e2259970512612706cd33cc09a87b98c06202d7ee7
+  data.tar.gz: 511378e83688bb4c0590f6012be5176cda67edd1e368e0994251b3bd638627bd
 SHA512:
-  metadata.gz: c7fb788d09f5ad3ccc820d52c171522498ad3f46782754aac07ce91e85b1c318864848be6df9391d0ec099a7b9a50afc21d1c069d07692a7c2a9b88505514f5b
-  data.tar.gz: 1f35895353ef8fdc5db0b71dd8cb7f8bf6bcf2ecf49ef06ebfa754391ac4b29e4268a14295febc1fceb4226c970e5f849c8c35597b42a16b00d5ff0ee36c1e62
+  metadata.gz: 48d082ba071e7b794ffced1cc4a74c691e1715b0bfad3adcfa85d58ef7b8a2dd0cc37931c6f4d9505b91209889415f930dc4d887d2b7aac5151c061912f3f8ee
+  data.tar.gz: 6a6786748486fbf4f065fac5951acdb5f647a5d7de652ed4dbf6d07cd344f5a3fcab3c4e9d59da521301fdc93f8e0d1552cdf0404a8d3bf363d145143f9117cc

data/README.adoc

@@ -218,7 +218,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 +228,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/fields/fields.rb

@@ -94,7 +94,7 @@ module Relaton
       end
 
       def authorciteformat(names)
-        return names if names.nil?
+        return names if names.nil? || @r.authorcitetemplate.nil?
 
         parts = %i(surname initials given middle nonpersonal)
         names_out = names.each_with_object({}) do |n, m|

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/general/render.rb

@@ -44,7 +44,7 @@ module Relaton
         @nametemplate = @nametemplateklass
           .new(template: opt["nametemplate"], i18n: @i18n)
         @authorcitetemplate = @authorcitetemplateklass
-          .new(template: opt["authorcitetemplate"], i18n: @i18n)
+          &.new(template: opt["authorcitetemplate"], i18n: @i18n)
         @seriestemplate = @seriestemplateklass
           .new(template: opt["seriestemplate"], i18n: @i18n)
         @journaltemplate = @seriestemplateklass

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

@@ -15,11 +15,14 @@ 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] }
+        initials.empty? and initials = forenames.map { |x| "#{x[0]}." }
         [forenames.first, forenames[1..-1], initials]
       end
 

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.4.0".freeze
+    VERSION = "0.4.3".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.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-22 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