relaton-render 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecff36647696036f6f4cb66699ebf76cf395420fbbe69a7399c67545cdf47a8d
-  data.tar.gz: 5a9c9404da6ca40bb41b1dd02d01f253bd7f5aaf6a7df84514e98716880d8841
+  metadata.gz: f4db19d0a9fb16b91e2e044c547f8ed65287362cf074486c0481d7a718cb7d98
+  data.tar.gz: 964075dc466461b3388febe72e346db46b28010aa7933ced18f9958f8ee89fd1
 SHA512:
-  metadata.gz: 998a52d231fd4053e54e7eb266ab7a351b1e70492b5cfe0c6c258b1493cf8df30b45762b00bae5ec1ab0f7a2e1be6125d066383e255cf160994b9d4ee1b47a7e
-  data.tar.gz: 5370302566a4fd84843d61a509709285a48f9e18e60a778ad7b2d49b5a45a2a81ebd8e10fcd7750efa2e02f33730da5fe18e417926b69088aab8308b8cd7356a
+  metadata.gz: 8b463024d200ae37a655cab3812fb4ef20d8b7b7f956c38a262ed4767b431f25c6b648964c09b6c3a37c516da4f6866091a637ba75db2e837fc852953ae64308
+  data.tar.gz: 4ac009ff61e8d9d21789fe7663b6caac24ce280880e7c97fefb17aa0875a05834538eff7394860d5f84db256cc269341c3873f89a089da6e1fb296aee5b1909c

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/parse/parse_contributors.rb

@@ -19,6 +19,7 @@ module Relaton
           x.content.empty? ? "#{x.initial}." : x.content
         end
         initials = person.name.initials&.content&.sub(/(.)\.?$/, "\\1.")
+          &.split /(?<=\.) /
         initials ||= person.name.forename.map(&:initial)
           .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
         forenames.empty? and initials.empty? and return [nil, nil, nil]

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.1".freeze
+    VERSION = "0.5.3".freeze
   end
 end

data/relaton-render.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "debug"
@@ -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", "~> 1.1.0"
+  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.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="