relaton-render 0.5.13 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff9e0dafe6ba6d6df3cd7f3e98057a96400abe99c90e8f8a14525b18d019d673
-  data.tar.gz: 450df19a0aec2275174c164559838023a977ffdfb435f0e07730081c46f4bcfb
+  metadata.gz: 0af6169e02ec5d26e446cde74cd73a1f46e35c8940d30f6c510f4be4de0088e6
+  data.tar.gz: f57803b06b0cdd09d3a0a7c88a2e33755fc976c4e32d15d5ad060442ac2a7c10
 SHA512:
-  metadata.gz: 1f408ad815ea069f7bf8eca30461eaa1965f6303e57a37698d66135159d70e93bcc90ffaf5f49bb3dc173a4e689e7d5090baa60b510aca95b5fe2d50cf0bb196
-  data.tar.gz: 070304e5689852b644ff5d072e18d7354e5d274196afa4b1f85f89e3edfb865c93642bcce1bd18a9d195217e9ec1cbe1a63782549382308ee67632a1d9dcc108
+  metadata.gz: ea4a04f26b246e60e332e6b77a9ebbdac20c0ae80e77b68e80446930a3eff08b12e598eec6d35919aebbc17e07d6ae4b56aa6b808b752d877ca1cb9f7ce10d16
+  data.tar.gz: 31712a34848e3564f871e7b41044d8082d2ee19036372b002a46670c4b8dc8ce9a206d6a4ae1fb783ea501fea20604753c2c9946e804afa36576a75b62aa74db

data/README.adoc

@@ -158,6 +158,7 @@ drawn from the bibliographic item:
 | 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
+| doi | ./docidentifier[@type = 'DOI'] | Y | | No prefix supplied
 | 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 |

data/lib/isodoc/i18n.rb

@@ -5,7 +5,7 @@ module IsoDoc
   class RelatonRenderI18n < I18n
     def load_yaml1(lang, script)
       case lang
-      when "en", "fr", "ru", "de", "es", "ar"
+      when "en", "fr", "ru", "de", "es", "ar", "ja"
         load_yaml2(lang)
       when "zh"
         case script
@@ -25,7 +25,7 @@ module IsoDoc
     # because of the potential for script mixing
     def cleanup_entities(hash, is_xml: true)
       ret = super
-      if @lang == "ar" && /%/.match?(ret)
+      if @lang == "ar" && ret.include?("%")
         ret = "&#x61c;#{ret}&#x61c;"
       end
       ret

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

@@ -5,6 +5,7 @@ author_and: و
 updated: محدث
 viewed: ينظر
 version: الإصدار
+also_pub_as: ":نشرت أيضا باسم"
 no_date: بدون تاريخ
 no_place: بدون مدينة
 date_formats:

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

@@ -5,6 +5,7 @@ author_and: und
 updated: aktualisiert
 viewed: angesehen
 version: Version
+also_pub_as: "Auch veröffentlicht als: "
 no_date: o.J.
 no_place: o.O.
 date_formats:

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

@@ -5,6 +5,7 @@ author_and: and
 updated: updated
 viewed: viewed
 version: version
+also_pub_as: "Also published as: "
 no_date: n.d.
 no_place: n.p.
 date_formats:

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

@@ -5,6 +5,7 @@ author_and: y
 updated: actualizado
 viewed: visto
 version: versión
+also_pub_as: "También publicado como: "
 no_date: s.f.
 no_place: s.l.
 date_formats:

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

@@ -5,6 +5,7 @@ author_and: et
 updated: mise à jour
 viewed: vu
 version: version
+also_pub_as: "Également publié sous le titre : "
 no_date: s.d.
 no_place: s.l.
 date_formats:

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

@@ -0,0 +1,46 @@
+in: 
+at: 
+and: と
+author_and: と
+updated: 更新しました
+viewed: 見た
+version: バージョン
+also_pub_as: 次のようにも出版されています
+no_date: 日付なし。
+no_place: 都市はありません。
+date_formats:
+  month_year: yMMMM
+  day_month_year: to_long_s
+  date_time: to_long_s
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition: 版
+edition_ordinal: "%Ordinal edition"
+draft: "下書き %"
+editor:
+  sg: 編
+  pl: 編
+qq-open: <em>
+qq-close: </em>
+q-open:
+q-close:
+extent:
+  page:
+    sg: "ページ%"
+    pl: "ページ%"
+  volume:
+    sg: "巻%"
+    pl: "巻%"
+  issue:
+    sg: "いいえ%"
+    pl: "いいえ%"
+size:
+  page:
+    sg: "ページ%"
+    pl: "ページ%"
+  volume:
+    sg: "巻%"
+    pl: "巻%"
+  issue:
+    sg: "いいえ%"
+    pl: "いいえ%"

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

@@ -5,6 +5,7 @@ author_and: и
 updated: обновлен
 viewed: просмотрено
 version: версия
+also_pub_as: "Также опубликовано как: "
 no_date: б.г.
 no_place: б.м.
 date_formats:

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

@@ -5,6 +5,7 @@ author_and: 和
 updated: 更新
 viewed: 阅
 version: 版本
+also_pub_as: "还发布为："
 no_date: 无日期
 no_place: 无出版地
 date_formats:

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

@@ -5,6 +5,7 @@ author_and: 與
 updated: 更新
 viewed: 閱
 version: 版本
+also_pub_as: "也發佈為："
 no_date: 無日期
 no_place: 無出版地
 date_formats:

data/lib/relaton/render/general/config.yml

@@ -48,7 +48,7 @@ template:
   software: "{{ creatornames }} ({{ role}}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize}}. {{place}}: {{publisher}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{size}}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
     # TODO: omitted: author ids, subsidiary titles, subsidiary creators, copyright, license, distributor, system requirements, relationships
   electronic resource:  software
-  standard: "{{ creatornames }} ({{ role}}) . {{ authoritative_identifier | join '|' }}: {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['in'] | capitalize }}:_{{ series_title }}. {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{ place }}: {{ publisher }}. {{date}}. {{size}}. {{ extent }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  standard: "{{ creatornames }} ({{ role}}) . {{ authoritative_identifier | join: '|' }}: {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['in'] | capitalize }}:_{{ series_title }}. {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{ place }}: {{ publisher }}. {{date}}. {{size}}. {{ extent }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
     # TODO: omitted: author ids, subsidiary titles, rights metadata, distributor, persistent identifier, item attributes, relationships
   techreport: standard
   dataset: "{{ creatornames }} ({{ role }}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ labels['in'] | capitalize }}:_{{series}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ size }}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "

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

@@ -2,7 +2,9 @@ require_relative "render_classes"
 require_relative "citations"
 require "yaml"
 require "liquid"
+require "date"
 require "relaton_bib"
+require "net/http"
 require_relative "../template/template"
 require_relative "../../../isodoc/i18n"
 
@@ -131,8 +133,16 @@ module Relaton
       end
 
       def parse1(doc)
+        r = doc.relation.select { |x| x.type == "hasRepresentation" }
+          .map { |x| @i18n.also_pub_as + parse_single_bibitem(x.bibitem) }
+        out = [parse_single_bibitem(doc)] + r
+        @i18n.l10n(out.join(". ").gsub(".. ", ". "))
+      end
+
+      def parse_single_bibitem(doc)
         r = renderer(doc.type || "misc")
         data = @parse.extract(doc)
+        enhance_data(data, r.template_raw)
         data_liquid = @fieldsklass.new(renderer: self)
           .compound_fields_format(data)
         valid_parse(@i18n.l10n(r.render(data_liquid)))
@@ -173,6 +183,23 @@ module Relaton
         end
       end
 
+      # add to liquid data based on template
+      def enhance_data(data, template)
+        template.is_a?(String) or return
+        add_date_accessed(data, template)
+      end
+
+      def add_date_accessed(data, template)
+        (/\{\{\s*date_accessed\s*\}\}/.match?(template) &&
+          /\{\{\s*uri\s*\}\}/.match?(template) &&
+          data[:uri_raw] && !data[:date_accessed]) or return
+        if url_exist?(data[:uri_raw])
+          data[:date_accessed] = { on: ::Date.today.to_s }
+        else
+          warn "BIBLIOGRAPHY WARNING: cannot access #{data[:uri_raw]}"
+        end
+      end
+
       private
 
       def template_hash_fill(templates)
@@ -182,6 +209,23 @@ module Relaton
           m[type] = template
         end
       end
+
+      def url_exist?(url_string)
+        res = access_url(url_string)
+        res.is_a?(Net::HTTPRedirection) and return url_exist?(res["location"])
+        res.code[0] != "4"
+      rescue Errno::ENOENT, SocketError
+        false # false if can't find the server
+      end
+
+      def access_url(url_string)
+        url = URI.parse(url_string)
+        req = Net::HTTP.new(url.host, url.port)
+        req.use_ssl = (url.scheme == "https")
+        path = url.path or return false
+        path.empty? and path = "/"
+        req.request_head(path)
+      end
     end
   end
 end

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

@@ -22,7 +22,7 @@ module Relaton
       def simple_xml2hash(doc)
         creators, role = creatornames(doc)
         { type: type(doc), title: title(doc), extent_raw: extent(doc),
-          size_raw: size(doc), uri_raw: uri(doc),
+          size_raw: size(doc), uri_raw: uri(doc), doi: doi(doc),
           authoritative_identifier: authoritative_identifier(doc),
           other_identifier: other_identifier(doc),
           status: status(doc), creators: creators, role_raw: role }

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

@@ -109,7 +109,7 @@ module Relaton
           ret = date.detect { |x| x.type == t } and
             return ret
         end
-        date.first
+        date.reject { |x| x.type == "accessed" }.first
       end
 
       # year-only

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

@@ -91,9 +91,15 @@ module Relaton
       end
 
       def authoritative_identifier(doc)
-        doc.docidentifier.each_with_object([]) do |id, ret|
-          ret << id.id unless authoritative_identifier_exclude.include? id.type
+        out = doc.docidentifier.each_with_object([]) do |id, ret|
+          id.primary && !authoritative_identifier_exclude.include?(id.type) and
+            ret << id.id
+        end
+        out.empty? and out = doc.docidentifier.each_with_object([]) do |id, ret|
+          authoritative_identifier_exclude.include?(id_type_norm(id)) or
+            ret << id.id
         end
+        out
       end
 
       def authoritative_identifier_exclude
@@ -102,7 +108,7 @@ module Relaton
 
       def other_identifier(doc)
         doc.docidentifier.each_with_object([]) do |id, ret|
-          type = id.type&.sub(/^(ISBN|ISSN)\..*$/, "\\1")
+          type = id_type_norm(id)
           other_identifier_include.include? type or next
           ret << @i18n.l10n("#{type}: #{id.id}")
         end
@@ -112,6 +118,19 @@ module Relaton
         %w(ISSN ISBN DOI)
       end
 
+      def doi(doc)
+        out = doc.docidentifier.each_with_object([]) do |id, ret|
+          type = id.type&.sub(/^(DOI)\..*$/i, "\\1") or next
+          type.casecmp("doi").zero? or next
+          ret << id.id
+        end
+        out.empty? ? nil : out
+      end
+
+      def id_type_norm(id)
+        id.type&.sub(/^(ISBN|ISSN)\..*$/i) { $1.upcase }
+      end
+
       def uri(doc)
         uri = nil
         %w(citation uri src).each do |t|

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

@@ -5,6 +5,8 @@ module Relaton
   module Render
     module Template
       class General
+        attr_reader :template_raw
+
         def initialize(opt = {})
           @htmlentities = HTMLEntities.new
           customise_liquid
@@ -43,7 +45,7 @@ module Relaton
 
         def punct_field?(name)
           name or return false
-          name = name.gsub(/'/, '"')
+          name = name.gsub("'", '"')
           %w(labels["qq-open"] labels["qq-close"] labels["q-open"]
              labels["q-close"]).include?(name)
         end
@@ -60,7 +62,7 @@ module Relaton
               a[3] = "}}#{FIELD_DELIM}"
             end
             a.join
-          end.join.gsub(/\t/, " ")
+          end.join.gsub("\t", " ")
           t.gsub(/\}\}#{FIELD_DELIM}\|/o, "}}#{FIELD_DELIM}\t")
             .gsub(/\|#{FIELD_DELIM}\{\{/o, "\t#{FIELD_DELIM}{{")
         end
@@ -96,7 +98,7 @@ module Relaton
             .sub(/^\s*[,.:;]\s*/, "")
             .sub(/[,:;]\s*$/, "")
             .gsub(/(?<!\\)_/, " ")
-            .gsub(/\\_/, "_")
+            .gsub("\\_", "_")
             .gsub(/#{NON_SPACING_DELIM}/o, "").gsub(/\s+/, " ")
         end
 
@@ -110,7 +112,7 @@ module Relaton
           when Array
             hash.map { |v| liquid_hash(v) }
           when String
-            hash.empty? ? nil : hash.gsub(/_/, "\\_").gsub(/ /, "_")
+            hash.empty? ? nil : hash.gsub("_", "\\_").gsub(/ /, "_")
           else hash
           end
         end
@@ -165,7 +167,7 @@ module Relaton
           t = nametemplate_split(template)
 
           mid = (1..size - 2).each_with_object([]) do |i, m|
-            m << t[1].gsub(/\[1\]/, "[#{i}]")
+            m << t[1].gsub("[1]", "[#{i}]")
           end
           t[1] = mid.join
           t[2].gsub!(/\[\d+\]/, "[#{size - 1}]")

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.13".freeze
+    VERSION = "0.5.15".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,6 +201,7 @@ files:
 - lib/isodoc-yaml/i18n-en.yaml
 - lib/isodoc-yaml/i18n-es.yaml
 - lib/isodoc-yaml/i18n-fr.yaml
+- lib/isodoc-yaml/i18n-ja.yaml
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc-yaml/i18n-zh-Hant.yaml