relaton-render 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 996ff1407f710b0195189008ac136236c636591071f5b1b6a93117d63f9bebda
-  data.tar.gz: 538d2fb64f5ab0c9bcebf81dc0ae718199ee380bb882177a6ddfb064d7abe03b
+  metadata.gz: 963f65bd45b2b7d271822ba18c63f2a6e34768da2e77b73dee08f43ae9e68c3d
+  data.tar.gz: 989731f97b400da01dbf2d549b7319f3b04d4450f087866b1622ba381674c744
 SHA512:
-  metadata.gz: 29448a51ba2bef275849506b3658e31eaa742514295b33d0ca0a9d4e9a2dabe30b0e83fc7570312a498c8fedbefe76ca98c7a660c54eea448128fa2d8f78d527
-  data.tar.gz: 70d0b1a5705983207fa485d146a25534a02e403b3d8c7720142f22bab38690d26d6f7eb2ed5dc8d53d51b80e6c15f3038fe8a95a0249b3144a54c07cb586856c
+  metadata.gz: d8b0815748c83dd0daf24055a1c4e4f7b2a51f2c7d65632d2e5b8596fd112df4882610626716e9feb5f46ce0054ba66ad28543a55aa3162b867dedff92cd2180
+  data.tar.gz: 917f533dfe7158d182bbd679c1e921442b0786d59a25db92d8cbd330fb01cb05bf9655e0ff566ac4574ab66b670d29d91b1c1b4796bfebb0e82db0e0ef07c479

data/README.adoc

@@ -99,6 +99,7 @@ drawn from the bibliographic item:
 | title   | ./title | | |
 | 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 | 
 | medium  | ./medium | | Y |
 | place   | ./place | | Y |
 | publisher | ./contributor[role/@type = 'publisher']/organization/name | | Y | 

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

@@ -34,7 +34,7 @@ module Relaton
       end
 
       def edition_fields_format(hash)
-        hash[:edition] = editionformat(hash[:edition_raw])
+        hash[:edition] = editionformat(hash[:edition_raw], hash[:edition_num])
         hash[:draft] = draftformat(hash[:draft_raw], hash)
       end
 
@@ -95,11 +95,11 @@ module Relaton
         @r.i18n.get[role][number] || role
       end
 
-      def editionformat(edn)
-        return edn unless /^\d+$/.match?(edn)
+      def editionformat(edn, num)
+        return edn unless num || /^\d+$/.match?(edn)
 
-        num = edition_translate1(edn.to_i)
-        @r.edition_ordinal.sub(/%(Spellout|Ordinal)?/, num)
+        ret = edition_translate1(num || edn.to_i)
+        @r.edition_ordinal.sub(/%(Spellout|Ordinal)?/, ret)
       end
 
       def edition_translate1(num)

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

@@ -27,7 +27,8 @@ module Relaton
       end
 
       def simple_or_host_xml2hash(doc, host)
-        { edition_raw: edition(doc, host), medium_raw: medium(doc, host),
+        { edition_raw: edition(doc, host), edition_num: edition_num(doc, host),
+          medium_raw: medium(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),

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

@@ -33,7 +33,11 @@ module Relaton
       end
 
       def edition(doc, host)
-        doc.edition || host&.edition
+        doc.edition&.content || host&.edition&.content
+      end
+
+      def edition_num(doc, host)
+        doc.edition&.number || host&.edition&.number
       end
 
       def place(doc, host)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.3.9".freeze
+    VERSION = "0.3.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler