relaton-render 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077a906da97ebd8417a856d6c5b73ae81cd3c5457ba8383094e752fd5c585bc0
-  data.tar.gz: 85c8446d1a644ba1b4cd28cfae099dddaa31867a376a9e484d387387ac7d0c7c
+  metadata.gz: ffb9cdf17ba3f47947a747bd8867ea9e7c47a98d458756ec947ee4423dc6b303
+  data.tar.gz: d3a34c0f04cdb456517403b16fa3055ceb5e78162a44570e05ed5da16163c6ea
 SHA512:
-  metadata.gz: 3fb5003aaefb0915a9eebd6d021bdd20e92dcf2c2eb015aea68c102928f1b8702841624d356d14dc00912752df3a50f7e98222d2e9a84cda819d1ed755610aad
-  data.tar.gz: 5cd715d1b65f71d1e4126b8443dbcb99a4bf078145cd3bfaa9e9fff5c67bac96b9d6b9e97e55b995c6f63764997f1e703bc65e366fde5b1d2c376f4e7af384bf
+  metadata.gz: 4a2aa5ae8d17b38ad0e79e575b9852127886a93ceafa5003ed1fc36d0bfb28e5a51733059b0a4c68256acdf62f3f1fd95195e68cf1e2b8d050fd753b6230f1a4
+  data.tar.gz: 5bd29bd5368dc53408da0888cb11734a580041288132a0a73b1e93206849b527df5ee7bbb771734274be9d2927f098f9dea798bcdadd1c7d52ae2f909e52f1d7

data/README.adoc

@@ -35,8 +35,7 @@ The parameters are:
 `journaltemplate`:: template for rendering journals in article citations
 `extenttemplate`:: templates for rendering extents
 `sizetemplate`:: templates for rendering sizes
-`edition_number`:: override formatting of edition number
-`edition`:: override formatting of edition 
+`edition_ordinal`:: override formatting of edition with ordinal
 `date`:: default date format (from Twitter CLDR)
 
 == Configuration

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -8,8 +8,10 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal"]
-edition: "الطبعة؜ %؜"
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition_ordinal: "الطبعة؜ %Ordinal"
+edition: الطبعة؜ ؜
 draft: "مشروع؜ %؜"
 editor:
   sg: محرر
@@ -28,4 +30,7 @@ size:
   volume:
     sg: "المجلد %"
     pl: "المجلدين %"
+inflection:
+  الطبعة؜:
+    gender: f
 

data/lib/isodoc-yaml/i18n-de.yaml

@@ -9,7 +9,9 @@ date:
   day_month_year: to_long_s
   date_time: to_long_s
 draft: "Entwurf %"
-edition: "% Aufl."
+edition_ordinal: "% Aufl."
+ordinal_keys: []
+edition: Auflage
 editor:
   sg: Hrsg.
   pl: Hrsg.
@@ -27,3 +29,7 @@ size:
   volume:
     sg: "% Bd."
     pl: "% Bde."
+inflection:
+  Auflage:
+    gender: f
+

data/lib/isodoc-yaml/i18n-en.yaml

@@ -8,8 +8,10 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal"]
-edition: "% edition"
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition: edition
+edition_ordinal: "%Ordinal edition"
 draft: "draft %"
 editor:
   sg: ed.

data/lib/isodoc-yaml/i18n-es.yaml

@@ -8,8 +8,12 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal-feminine"]
-edition: "% ed."
+ordinal_keys: [gender]
+OrdinalRules: 
+  m: digits-ordinal-masculine
+  f: digits-ordinal-feminine
+edition_ordinal: "%Ordinal ed."
+edition: edición
 draft: "borrador %"
 editor:
   sg: ed.
@@ -28,3 +32,7 @@ size:
   volume:
     sg: "% vol."
     pl: "% vols."
+inflection:
+  edición:
+    gender: f
+

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -8,8 +8,14 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal-feminine"]
-edition: "% édition"
+ordinal_keys: [gender,number]
+OrdinalRules:
+  m.sg: digits-ordinal-masculine
+  f.sg: digits-ordinal-feminine
+  m.pl: digits-ordinal-masculine-plural
+  f.pl: digits-ordinal-feminine-plural
+edition_ordinal: "%Ordinal édition"
+edition: édition
 draft: "brouillon %"
 editor:
   sg: éd.
@@ -28,3 +34,7 @@ size:
   volume:
     sg: "% vol."
     pl: "% vol."
+inflection:
+  édition:
+    gender: f
+

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -8,8 +8,16 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["SpelloutRules", "spellout-ordinal-neuter"]
-edition: "% издание"
+ordinal_keys: [gender,number]
+SpelloutRules:
+  m.sg: spellout-ordinal-masculine
+  f.sg: spellout-ordinal-feminine
+  n.sg: spellout-ordinal-neuter
+  m.pl: spellout-ordinal-plural
+  f.pl: spellout-ordinal-plural
+  n.pl: spellout-ordinal-plural
+edition_ordinal: "%Spellout издание"
+edition: издание
 draft: "проект %"
 editor:
   sg: изд.
@@ -28,4 +36,7 @@ size:
   volume:
     sg: "% т."
     pl: "% тт."
+inflection:  
+  издание:
+    gender: n
 

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -8,8 +8,10 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal"]
-edition: "第%版"
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition_ordinal: "第%Ordinal版"
+edition: 版
 draft: "草案%"
 editor:
   sg: 编辑

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

@@ -24,6 +24,7 @@ module Relaton
           .each do |k|
           hash[k[0]] = nameformat(hash[k[1]])
         end
+        hash[:publisher_abbrev] = hash[:publisher_abbrev_raw]&.join(", ")
       end
 
       def role_fields_format(hash)
@@ -97,10 +98,20 @@ module Relaton
       def editionformat(edn)
         return edn unless /^\d+$/.match?(edn)
 
-        num = edn
-        @r.edition_number and num = edn.to_i.localize(tw_cldr_lang)
-          .to_rbnf_s(*@r.edition_number)
-        @r.edition.sub(/%/, num)
+        num = edition_translate1(edn.to_i)
+        @r.edition_ordinal.sub(/%(Spellout|Ordinal)?/, num)
+      end
+
+      def edition_translate1(num)
+        ruleset = case @r.i18n.edition_ordinal
+                  when /%Spellout/ then "SpelloutRules"
+                  when /%Ordinal/ then "OrdinalRules"
+                  else "Digit"
+                  end
+        ruleset == "Digit" and return num.to_s
+        ed = HTMLEntities.new.decode(@r.i18n.edition)
+        @r.i18n.inflect_ordinal(num, @r.i18n.inflection&.dig(ed) || {},
+                                ruleset)
       end
 
       def draftformat(num, _hash)

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

@@ -10,7 +10,7 @@ module Relaton
     class General
       attr_reader :template, :journaltemplate, :seriestemplate, :nametemplate,
                   :extenttemplate, :sizetemplate, :lang, :script, :i18n,
-                  :edition, :edition_number, :date
+                  :edition, :edition_ordinal, :date
 
       def initialize(opt = {})
         options = read_config.merge(Utils::string_keys(opt))
@@ -53,7 +53,7 @@ module Relaton
         @lang = opt["language"]
         @script = opt["script"]
         @i18n = i18n_klass(opt["language"], opt["script"])
-        @edition_number = opt["edition_number"] || @i18n.edition_number
+        @edition_ordinal = opt["edition_ordinal"] || @i18n.edition_ordinal
         @edition = opt["edition"] || @i18n.edition
         @date = opt["date"] || @i18n.date
       end

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

@@ -29,6 +29,7 @@ module Relaton
       def simple_or_host_xml2hash(doc, host)
         { edition_raw: edition(doc, host), medium_raw: medium(doc, host),
           place_raw: place(doc, host), publisher_raw: publisher(doc, host),
+          publisher_abbrev_raw: publisher_abbrev(doc, host),
           distributor_raw: distributor(doc, host), draft_raw: draft(doc, host),
           access_location: access_location(doc, host),
           date: date(doc, host), date_updated: date_updated(doc, host),

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

@@ -48,17 +48,20 @@ module Relaton
         [cr.map { |x| extractname(x) }, contributor_role(cr)]
       end
 
+      def creatornames_roles_allowed
+        %w(author performer adapter translator editor publisher distributor)
+      end
+
       def creatornames1(doc)
         cr = []
         return [] if doc.nil?
 
-        %w(author performer adapter translator editor publisher distributor)
-          .each do |r|
-            add = pick_contributor(doc, r)
-            next if add.nil?
+        creatornames_roles_allowed.each do |r|
+          add = pick_contributor(doc, r)
+          next if add.nil?
 
-            cr = add and break
-          end
+          cr = add and break
+        end
         cr.nil? and cr = doc.contributor
         cr
       end
@@ -100,6 +103,27 @@ module Relaton
         host and ret ||= host.date.detect { |x| x.type == "accessed" }
         datepick(ret)
       end
+
+      def publisher(doc, host)
+        x = pick_contributor(doc, "publisher")
+        host and x ||= pick_contributor(host, "publisher")
+        x.nil? and return nil
+        x.map { |c| extractname(c) }
+      end
+
+      def publisher_abbrev(doc, host)
+        x = pick_contributor(doc, "publisher")
+        host and x ||= pick_contributor(host, "publisher")
+        x.nil? and return nil
+        x.map { |c| c.entity.abbreviation&.content }
+      end
+
+      def distributor(doc, host)
+        x = pick_contributor(doc, "distributor")
+        host and x ||= pick_contributor(host, "distributor")
+        x.nil? and return nil
+        x.map { |c| extractname(c) }
+      end
     end
   end
 end

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

@@ -11,7 +11,9 @@ module Relaton
 
         t = doc.title.select { |x| x.title.language&.include? @lang }
         t.empty? and t = doc.title
-        t.first&.title&.content
+        t1 = t.select { |x| x.type == "main" }
+        t1.empty? and t1 = t
+        t1.first&.title&.content
       end
 
       def medium(doc, host)
@@ -41,20 +43,6 @@ module Relaton
         x.map(&:name)
       end
 
-      def publisher(doc, host)
-        x = pick_contributor(doc, "publisher")
-        host and x ||= pick_contributor(host, "publisher")
-        x.nil? and return nil
-        x.map { |c| extractname(c) }
-      end
-
-      def distributor(doc, host)
-        x = pick_contributor(doc, "distributor")
-        host and x ||= pick_contributor(host, "distributor")
-        x.nil? and return nil
-        x.map { |c| extractname(c) }
-      end
-
       def series(doc)
         doc.series.detect { |s| s.type == "main" } ||
           doc.series.detect { |s| s.type.nil? } ||
@@ -101,7 +89,7 @@ module Relaton
 
       def uri(doc)
         uri = nil
-        %i(doi uri src).each do |t|
+        %w(doi uri src).each do |t|
           uri = doc.link.detect { |u| u.type == t } and break
         end
         uri ||= doc.link.first

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

@@ -79,6 +79,7 @@ module Relaton
             .gsub(/(:\s+)(&\s)/, "\\2")
             .gsub(/\s+([,.:;)])/, "\\1")
             .sub(/^\s*[,.:;]\s*/, "")
+            .sub(/[,:;]\s*$/, "")
             .gsub(/_/, " ")
             .gsub(/#{NON_SPACING_DELIM}/o, "").gsub(/\s+/, " ")
         end
@@ -133,9 +134,9 @@ module Relaton
         end
 
         def template_select_etal(names)
-          if @etal_count && names.size >= @etal_count
+          if @etal_count && names[:surname].size >= @etal_count
             @template[:etal]
-          else expand_nametemplate(@template_raw[:more], names.size)
+          else expand_nametemplate(@template_raw[:more], names[:surname].size)
           end
         end
 

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler