relaton-render 0.5.9 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4279b77e453986c5068226fd078df3c97746d9ebbbe04a0b1217eccb27804030
-  data.tar.gz: c2340eca6f974d0fca1f6120fb50d1092dc9159a7d658734e3f750cf149b6692
+  metadata.gz: c28914c92390ac98de57c952d050e373a60ad77cbb8d86bda033c2cf219421e6
+  data.tar.gz: 6daf07a35e83f26d659a8f6fbd6979c980116e2e7df1ea1c666e2290a0781efb
 SHA512:
-  metadata.gz: f7ecf68117575c5b55b99bbad99a9eea91263ce61224253ee9149de113ce6edf66bd543dfb8d475a4ab4599572bd2701edc60c31576fa6d1475fb73cb63c2aff
-  data.tar.gz: c9a1452e1fb08dbc7d910a63b25b3e453919b5d3d1ce7cc0c943bf1adb3f6e6a9f6d638ca1be814a9ec836c77b2e6cc66be1a3be34f733cc2aedbfad45510df3
+  metadata.gz: d3d40767da2463d8a34cb5203cea52edccf21ab8e73dfd6a41ad770fe2c2d1362e4254fbd22407a5e7166f5434b39d07d3b9a4569e3a19364b5e1768a645b959
+  data.tar.gz: 3f1fda6927d28e8bc41b8d6a4891b6b7e1e05afed3ceb42594548a86fea082d1cf74f6842189250729e485643e0377d5fc527e26a708ff46fe496d589c87892f

data/README.adoc

@@ -165,7 +165,7 @@ drawn from the bibliographic item:
 | 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

@@ -157,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]}–#{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]}–#{hash[:to]}"
+        hash[:from]
       end
 
       def sizeformat(size, hash)
@@ -199,10 +199,8 @@ module Relaton
       end
 
       def date_range(hash)
-        if hash[:from]
-          "#{hash[:from]}–#{hash[:to]}"
-        else range(hash)
-        end
+        hash[:from] && !hash[:to] and return "#{hash[:from]}–"
+        range(hash)
       end
 
       def dateformat(date, _hash)

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

@@ -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)

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

@@ -102,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
 

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.9".freeze
+    VERSION = "0.5.11".freeze
   end
 end

data/relaton-render.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement