relaton-render 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c876441b0795c06974791ff6c689262426266b59c0de09d2b7d4d64ac347bb
-  data.tar.gz: aa0f083b296c8156c94debdf34797941cca2a22e714821810020657c1dfaff2a
+  metadata.gz: 26206861d94611cd7f677cb8896d4efcf4c98d74c0cb80e405404cc2d797c64e
+  data.tar.gz: 36352baf32c24debed0f932855210afe76d8b4e262c749d43bcb57b8c26fc24e
 SHA512:
-  metadata.gz: 475ab58c7d8c60be6a42312a32900460702b72bd6e523df26a0b9cbd5e78b2fbc90c3316102c089197730693d08be123cf4492aabe90c5a8817a52de59d06eb9
-  data.tar.gz: 9a604112f31a1a0d634a598e0a03a3137706d585502f7df7f6264bafc22c2fae0ec724bd512b11ffbab923b4ba76fc1ed9ed07f375861f32e1213518cc016d41
+  metadata.gz: b368e1635ec42701b76a60ab9551b9d0b8f03cb72326b0a27ea924c4eda6dcfde41eac7ff24085a0c88504f61dc7e19d28fdb29bae058077461e3c21a65ea0b3
+  data.tar.gz: 2bf3adcadd8d9574164f691ce45a92ab5b7ae2cd8483dfcd1c2b632e998800ec81de9a2f184bcf7f92ad63785fbe8fd440ad8381d910dd7629cb6ae31b45c6dd

data/README.adoc

@@ -147,7 +147,7 @@ drawn from the bibliographic item:
 |===
 | Field   | Relaton XPath | Multiple | Can come from host | Note
 
-| title   | ./title | | |
+| title   | ./title | | | If multiples, prioritise language match
 | edition | ./edition | | Y | If numeric value, is given internationalised rendering of "nth edition", as set in edition_numbering. Otherwise, the textual content of the tag is given.
 | edition_raw | ./edition | | Y | The strict textual content of the tag is given.
 | edition_num | ./edition[@number] | | Y | 
@@ -158,7 +158,7 @@ drawn from the bibliographic item:
 | authoritative_identifier | ./docidentifier[not(@type = 'metanorma' or @type = 'ordinal' or @type = 'ISBN' or @type = 'ISSN' or @type = 'DOI')] | Y | |
 | other_identifier | ./docidentifier[@type = 'ISBN' or @type = 'ISSN' or @type = 'DOI'] | Y | | By default, each such identifier is prefixed with its type and colon
 | status | ./status | | | Rendering varies by flavour
-| uri | ./uri[@type = 'doi' or @type = 'uri' or @type = 'src' or true] | | |
+| uri | ./uri[@type = 'citation' or @type = 'doi' or @type = 'uri' or @type = 'src' or true] | | | If multiples, prioritise language match
 | access_location | ./accessLocation | | Y |
 | extent | ./extent | Y | | Render with standard abbreviations for pp, vols, with n-dash, with delimiting of multiple locations
 | creatornames | ./contributor[role/@type = 'author'] \| ./contributor[role/@type = 'performer'] \| ./contributor[role/@type = 'adapter'] \| ./contributor[role/@type = 'translator'] \| ./contributor[role/@type = 'editor'] \| ./contributor[role/@type = 'distributor'] \| ./contributor | Y | | <<nametemplate,`nametemplate`>> applied to each name; joining template from internationalisation applied to multiple names

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

@@ -56,13 +56,14 @@ module Relaton
       def i18n_initialize(opt)
         @lang = opt["language"]
         @script = opt["script"]
+        @locale = opt["locale"]
         @i18n = opt["i18n"] ||
-          i18n_klass(opt["language"], opt["script"], opt["i18nhash"])
+          i18n_klass(language: @lang, script: @script, locale: @locale,
+                     i18nhash: opt["i18nhash"])
         @edition_ordinal = opt["edition_ordinal"] || @i18n.edition_ordinal
         @edition = opt["edition"] || @i18n.edition
         @date = opt["date"] || @i18n.get["date_formats"] ||
-          { "month_year" => "yMMMM",
-            "day_month_year" => "to_long_s",
+          { "month_year" => "yMMMM", "day_month_year" => "to_long_s",
             "date_time" => "to_long_s" }
       end
 
@@ -99,8 +100,9 @@ module Relaton
         "{{creatornames}}. {{title}}. {{date}}."
       end
 
-      def i18n_klass(lang = "en", script = "Latn", i18nhash = nil)
-        ::IsoDoc::RelatonRenderI18n.new(lang, script, i18nhash: i18nhash)
+      def i18n_klass(language: "en", script: "Latn", locale: nil, i18nhash: nil)
+        ::IsoDoc::RelatonRenderI18n.new(language, script, locale: locale,
+                                                          i18nhash: i18nhash)
       end
 
       def render(bib, embedded: false)

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

@@ -113,15 +113,24 @@ module Relaton
 
       def uri(doc)
         uri = nil
-        %w(doi uri src).each do |t|
-          uri = doc.link.detect { |u| u.type == t } and break
+        %w(citation doi uri src).each do |t|
+          uri = uri_type_select(doc, t) and break
         end
+        uri ||= doc.link.detect { |u| u.language == @lang }
         uri ||= doc.link.first
         return nil unless uri
 
         uri.content.to_s
       end
 
+      def uri_type_select(doc, type)
+        uri = doc.link.detect do |u|
+          u.type == type && u.language == @lang
+        end and return uri
+        uri = doc.link.detect { |u| u.type == type } and return uri
+        nil
+      end
+
       def access_location(doc, host)
         x = doc.accesslocation || host&.accesslocation or
           return nil

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.0".freeze
+    VERSION = "0.5.2".freeze
   end
 end

data/relaton-render.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"
 
-  spec.add_dependency "isodoc-i18n"
+  spec.add_dependency "isodoc-i18n", "~> 1.1.2"
   spec.add_dependency "liquid", "~> 4"
   spec.add_dependency "nokogiri"
   spec.add_dependency "relaton-bib", ">= 1.13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-18 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,16 +98,16 @@ dependencies:
   name: isodoc-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement