relaton-render 0.5.14 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a59266f60d60c8d152141f675eac858ef9f9b81e4c8d9ac2bfe9dd158db148d
-  data.tar.gz: 40d269013ae823a85f21c335b7157e13c6062572e6e06190e6a06688b5508061
+  metadata.gz: f168f3ef6e4f5baf6efd001c182cf239681199742561699c8e4d3d5784b4b282
+  data.tar.gz: 0ef031d1a92b9f8bcd67d1328b9305b8d2222c9f1b767d78d0c03f7a6325d70c
 SHA512:
-  metadata.gz: a084f59643670d47b6e237c00df3b831f7b50781aa39bbf153bf1fc6912dd6358c77d8d04f5ce6a8742d6c3586bd5d025c2a6ceddb70f5db8f0b0d4f2200f07e
-  data.tar.gz: 1ae9f86ae3ee701eeece1ac44c6cfcfd41ce34320ea263c413c3417609c0b919c2924bdafda02b0db828e9f16ce7de0aaec1f25bee3ec53a33a9da5ff14896d9
+  metadata.gz: 4189b0b9bd03f96bf3f67f00e94973dd0289d968ff3f3395bbd09f2a1c0ff5d0e2641e532c78579bc1a841cee06c379b7ecc43d247fbc8509f8c7a06a756a402
+  data.tar.gz: 810cbb87d5eeffe1f88f21f4cfbdb04a1ab905bc34f857d06218ea4a09f1efd8a65a3814756143204c9110be568691d5247089ebf41a5c0cefcda4b1e74376ba

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

@@ -133,6 +133,13 @@ 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/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_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/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.14".freeze
+    VERSION = "0.6.0".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", "~> 1.1.2"
+  spec.add_dependency "isodoc-i18n", "~> 1.2.0"
   spec.add_dependency "liquid", "~> 5"
   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.14
+  version: 0.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-10-09 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.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -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