relaton-render 0.5.8 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ebdb614711c3fdca1166a3017396ce04245c92cfb793940efdc9da6d3d4c6d
-  data.tar.gz: e548c4fb11f390c585eaa95c4d7ccc77111d9166ecdf4fad795fa2c4181990e0
+  metadata.gz: be542bce28bee8b30b8a719d8e6e822fb998c7d042c2c7b546309733c3ca1d66
+  data.tar.gz: 5be41eba5e9771af4d39bcf7e2df8d4344db4ad9275d2fbf97fcb9c3f7eef362
 SHA512:
-  metadata.gz: f8e53bff23c39d72ecb3d9167f92c9d6570d09148fdb5907fccbc018e974302e591101fe2e491014a6a4fbafff00960ae84de3a477ad6568416c02ab2274d15d
-  data.tar.gz: 6c699eaec0669e07ebb7ac9e1e43a2c31e7b303158d900117abe580fee599a8fde92409c861eca3e4c8b85c750bbab1141087d753dc9ac02be6fa7704871f58a
+  metadata.gz: 54acff0f3354e44e6af2fe54fc20dd1f1f814b4d632604e820b6ab72a04275dc0b46dcd7981dd7a12f17ddea05506ed73b7c6401b31fe35097b90d5352ea3b5b
+  data.tar.gz: 4a584b500e0e6438fdc69340386c641e6f79780ca8cbe0d01811fddcb0d5baafa99e5679a447efad08e5e6e15d4de2ba5dd56fc7e4832ee914ec6412009d1dd9

data/README.adoc

@@ -155,16 +155,17 @@ drawn from the bibliographic item:
 | place   | ./place | | Y |
 | publisher | ./contributor[role/@type = 'publisher']/organization/name | | Y | 
 | distributor | ./contributor[role/@type = 'distributor']/organization/name | | Y | 
+| authorizer | ./contributor[role/@type = 'authorizer']/organization/name \| ./contributor[role/@type = 'publisher']/organization/name | | Y | 
 | 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 = 'citation' or @type = 'uri' or @type = 'src' or true] | | | If multiples, prioritise language match. Always exclude DOI: that is not where the resource is available from
 | 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
-| authorcite | ./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 | | <<authorcitetemplate,`authorcitetemplate`>> applied to each name; joining template from internationalisation applied to multiple names
+| 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[role/@type = 'authorizer'] \| ./contributor | Y | | <<nametemplate,`nametemplate`>> applied to each name; joining template from internationalisation applied to multiple names
+| authorcite | ./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[role/@type = 'authorizer'] \| ./contributor | Y | | <<authorcitetemplate,`authorcitetemplate`>> applied to each name; joining template from internationalisation applied to multiple names
 | role | ./contributor[role/description] \| ./contributor[role/@type] | | | 
-| date | ./date[@type = 'issued'] \| ./date[@type = 'circulated'] \| ./date | | Y |
+| date | ./date[@type = 'issued'] \| ./date[@type = 'circulated'] \| ./date | | Y | Always truncated to just year
 | date_updated | ./date[@type = 'updated'] | | Y | 
 | date_accessed | ./date[@type = 'accessed'] | | Y | 
 | series | ./series[@type = 'main' or not(@type) or true] | | Y | <<seriestemplate,`seriestemplate`>> applies to series

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

@@ -17,7 +17,8 @@ module Relaton
 
       def name_fields_format(hash)
         [%i(creatornames creators), %i(host_creatornames host_creators),
-         %i(publisher publisher_raw), %i(distributor distributor_raw)]
+         %i(publisher publisher_raw), %i(distributor distributor_raw),
+         %i(authorizer authorizer_raw)]
           .each do |k|
           hash[k[0]] = nameformat(hash[k[1]])
         end
@@ -62,8 +63,7 @@ module Relaton
 
       # TODO is not being i18n-alised
       def mediumformat(hash)
-        return nil if hash.nil?
-
+        hash.nil? and return nil
         %w(content genre form carrier size scale).each_with_object([]) do |i, m|
           m << hash[i] if hash[i]
           m
@@ -81,8 +81,7 @@ module Relaton
       end
 
       def nameformat(names)
-        return names if names.nil?
-
+        names.nil? and return names
         parts = %i(surname initials given middle nonpersonal)
         names_out = names.each_with_object({}) do |n, m|
           parts.each do |i|
@@ -94,8 +93,7 @@ module Relaton
       end
 
       def authorciteformat(names)
-        return names if names.nil? || @r.authorcitetemplate.nil?
-
+        names.nil? || @r.authorcitetemplate.nil? and return names
         parts = %i(surname initials given middle nonpersonal)
         names_out = names.each_with_object({}) do |n, m|
           parts.each do |i|
@@ -107,9 +105,9 @@ module Relaton
       end
 
       def role_inflect(contribs, role)
-        return nil if role.nil? || contribs.size.zero? ||
-          %w(author publisher).include?(role)
-
+        role.nil? || contribs.size.zero? ||
+          %w(author publisher distributor
+             authorizer).include?(role) and return nil
         number = contribs.size > 1 ? "pl" : "sg"
         @r.i18n.get[role][number] || role
       end
@@ -134,9 +132,9 @@ module Relaton
       end
 
       def draftformat(num, _hash)
-        return nil if num.nil?
-        return nil if num.is_a?(Hash) && num[:status].nil? && num[:iteration].nil?
-
+        num.nil? ||
+          (num.is_a?(Hash) && num[:status].nil? &&
+            num[:iteration].nil?) and return nil
         @r.i18n.draft.sub(/%/, num)
       end
 
@@ -159,12 +157,12 @@ module Relaton
       end
 
       def range(hash)
-        if hash[:on] then hash[:on]
-        elsif hash.has_key?(:from) && hash[:from].nil? then nil
-        elsif hash[:from]
-          hash[:to] ? "#{hash[:from]}&#x2013;#{hash[:to]}" : hash[:from]
-        else hash
-        end
+        hash[:on] and return hash[:on]
+        hash.has_key?(:from) && hash[:from].nil? and return nil
+        !hash[:from] and return hash
+        hash[:to] && hash[:to] != hash[:from] and
+          return "#{hash[:from]}&#x2013;#{hash[:to]}"
+        hash[:from]
       end
 
       def sizeformat(size, hash)
@@ -180,23 +178,16 @@ module Relaton
 
       def sizeformat1(key, val, hash)
         case key
-        when "volume"
-          hash[:volume_raw] = val
-          hash[:volume] = pagevolformat(val, nil, "volume", true)
-        when "issue"
-          hash[:issue_raw] = val
-          hash[:issue] = pagevolformat(val, nil, "issue", true)
-        when "page"
-          hash[:page_raw] = val
-          hash[:page] = pagevolformat(val, nil, "page", true)
+        when "volume", "issue", "page"
+          hash["#{key}_raw".to_sym] = val
+          hash[key.to_sym] = pagevolformat(val, nil, key, true)
         when "data" then hash[:data] = val
         when "duration" then hash[:duration] = val
         end
       end
 
       def pagevolformat(value, value_raw, type, is_size)
-        return nil if value.nil?
-
+        value.nil? and return nil
         num = "pl"
         if is_size
           value == "1" and num = "sg"
@@ -208,15 +199,12 @@ module Relaton
       end
 
       def date_range(hash)
-        if hash[:from]
-          "#{hash[:from]}&#x2013;#{hash[:to]}"
-        else range(hash)
-        end
+        hash[:from] && !hash[:to] and return "#{hash[:from]}&#x2013;"
+        range(hash)
       end
 
       def dateformat(date, _hash)
-        return nil if date.nil?
-
+        date.nil? and return nil
         %i(from to on).each do |k|
           date[k] = ::Relaton::Render::Date.new(date[k], renderer: @r).render
         end
@@ -224,20 +212,16 @@ module Relaton
       end
 
       def uriformat(uri)
-        return nil if uri.nil? || uri.empty?
-
+        uri.nil? || uri.empty? and return nil
         "<link target='#{uri}'>#{uri}</link>"
       end
 
       private
 
       def tw_cldr_lang
-        if @r.lang != "zh"
-          @r.lang.to_sym
-        elsif @r.script == "Hant"
-          :"zh-tw"
-        else
-          :"zh-cn"
+        if @r.lang != "zh" then @r.lang.to_sym
+        elsif @r.script == "Hant" then :"zh-tw"
+        else :"zh-cn"
         end
       end
     end

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

@@ -30,10 +30,11 @@ module Relaton
 
       def simple_or_host_xml2hash(doc, host)
         { edition_raw: edition(doc, host), edition_num: edition_num(doc, host),
-          medium_raw: medium(doc, host),
+          medium_raw: medium(doc, host), draft_raw: draft(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),
+          authorizer_raw: authorizer(doc, host),
+          distributor_raw: distributor(doc, host),
           access_location: access_location(doc, host),
           date: date(doc, host), date_updated: date_updated(doc, host),
           date_accessed: date_accessed(doc, host) }

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

@@ -75,7 +75,7 @@ module Relaton
       end
 
       def creatornames_roles_allowed
-        %w(author performer adapter translator editor distributor)
+        %w(author performer adapter translator editor distributor authorizer)
       end
 
       def creatornames1(doc)
@@ -112,10 +112,13 @@ module Relaton
         date.first
       end
 
+      # year-only
       def date(doc, host)
         ret = date1(doc.date)
         host and ret ||= date1(host.date)
-        datepick(ret)
+        datepick(ret)&.transform_values do |v|
+          v&.sub(/-.*$/, "")
+        end
       end
 
       def date_updated(doc, host)
@@ -153,6 +156,15 @@ module Relaton
         x.nil? and return nil
         x.map { |c| extractname(c) }
       end
+
+      def authorizer(doc, host)
+        x = pick_contributor(doc, "authorizer") ||
+          pick_contributor(doc, "publisher")
+        host and x ||= pick_contributor(host, "authorizer") ||
+          pick_contributor(host, "publisher")
+        x.nil? and return nil
+        x.map { |c| extractname(c) }
+      end
     end
   end
 end

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

@@ -7,8 +7,7 @@ module Relaton
 
       # TODO : first is naive choice
       def title(doc)
-        return nil if doc.nil? || doc.title.empty?
-
+        doc.nil? || doc.title.empty? and return nil
         t = doc.title.select { |x| x.title.language&.include? @lang }
         t.empty? and t = doc.title
         t1 = t.select { |x| x.type == "main" }
@@ -62,8 +61,7 @@ module Relaton
       end
 
       def series_title(series, _doc)
-        return nil if series.nil?
-
+        series.nil? and return nil
         series.title.respond_to?(:titles) && !series.title.titles.empty? and
           return content(series.title.titles.first.title)
         series.title.respond_to?(:title) and
@@ -104,8 +102,9 @@ module Relaton
 
       def other_identifier(doc)
         doc.docidentifier.each_with_object([]) do |id, ret|
-          other_identifier_include.include? id.type or next
-          ret << @i18n.l10n("#{id.type}: #{id.id}")
+          type = id.type&.sub(/^(ISBN|ISSN)\..*$/, "\\1")
+          other_identifier_include.include? type or next
+          ret << @i18n.l10n("#{type}: #{id.id}")
         end
       end
 
@@ -122,8 +121,7 @@ module Relaton
           u.language == @lang && !u.type&.casecmp("doi")&.zero?
         end
         uri ||= doc.link.detect { |u| !u.type&.casecmp("doi")&.zero? }
-        return nil unless uri
-
+        uri or return nil
         uri.content.to_s.strip
       end
 
@@ -172,9 +170,8 @@ module Relaton
       end
 
       def draft(doc, host)
-        dr = doc.status&.stage&.value || host&.status&.stage&.value
-
-        { iteration: iter_ordinal(doc) || iter_ordinal(host), status: dr }
+        { iteration: iter_ordinal(doc) || iter_ordinal(host),
+          status: status(doc) || status(host) }
       end
 
       def iter_ordinal(doc)
@@ -184,7 +181,7 @@ module Relaton
       end
 
       def status(doc)
-        doc.status&.stage&.value
+        doc&.status&.stage&.value
       end
 
       private
@@ -202,10 +199,8 @@ module Relaton
 
       def localized_string_or_text(str)
         case str
-        when RelatonBib::LocalizedString
-          content(str)
-        when String
-          str
+        when RelatonBib::LocalizedString then content(str)
+        when String then str
         end
       end
     end

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.8".freeze
+    VERSION = "0.5.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler