relaton-render 0.8.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2db7fae658791edf4fac0a3c6c1a523fa8f44e98c72a3a569f6e679cfae59289
-  data.tar.gz: cf0e253848e1ea25ed8e39bc09a266b61dfe9966d6ac12bf8e20c16b796e98fe
+  metadata.gz: 75575a57cbac1f7ce210b85d268a9823b40480a39450db3280d56f7957e61cc6
+  data.tar.gz: 70b154b648b4128289f6ba3756b6ab214e449616b68be983e3adb45ddb58ad70
 SHA512:
-  metadata.gz: b7439decec19ae4bc917d27fe313513a178601ce5d363b3ae797d6cca787a507e8c76505ab4fef5caf67b197b6fffba469688f92927511003675826054cf04fb
-  data.tar.gz: 742644122724cb16fc11660a7443a74a1a32d33ab0c0134f469b6a5e922e19a2e71390a4a2ecc262157f6772217afa3fbf8d6438ad1afb0084675ce0dea69212
+  metadata.gz: 3895597474affcbe243087c895f2d98d75e705401b0fb686539bf11e37bc160906a8fe03f1481dd678b2378464b77493e8995bdd59b4f40ee366f12e8649e3dd
+  data.tar.gz: 3ab8323c45c199cb25490a7c7eadf0208d82acb0d5457f4c6df8b37dc81ebf50647745cc759110f242a2a7b683ba384954bcacdf0024be69ddb2896523cfa6b1

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

@@ -128,13 +128,15 @@ module Relaton
       end
 
       def extentformat(extent, hash)
-        extent.map do |e|
+        extent.map do |stack|
+        stack.map do |e|
           e1 = e.transform_values { |v| v.is_a?(Hash) ? range(v) : v }
           ret = e.each_with_object({}) do |(k, v), m|
             extentformat1(k, v, m, e1)
             m
           end
           @r.extenttemplate.render(hash.merge(ret))
+        end.join(" ")
         end.join("; ")
       end
 

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

@@ -5,6 +5,8 @@ module Relaton
         node.nil? and return node
         node.content.is_a?(Array) and return node.content.map { |x| content(x) }
         node.content.strip
+        #node.children.map { |n| n.text? ? n.content : n.to_xml }.join
+        #node.text? ? node.content.strip : node.to_xml.strip
       end
 
       def extract_orgname(org)

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

@@ -140,8 +140,16 @@ module Relaton
       def extent(doc)
         doc.extent.each_with_object([]) do |e, acc|
           case e
-          when RelatonBib::LocalityStack
-            acc << extent1(e.locality)
+          when RelatonBib::Extent, RelatonBib::LocalityStack
+            a = e.locality.each_with_object([]) do |e1, m|
+              if e1.is_a?(RelatonBib::LocalityStack)
+                m << extent1(e1.locality)
+              else
+                m.empty? and m << {}
+                m[-1].merge!(extent1(Array(e1)))
+              end
+            end
+            acc << a
           when RelatonBib::Locality
             acc << extent1(Array(e))
           end

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.8.2".freeze
+    VERSION = "0.9.1".freeze
   end
 end

data/relaton-render.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc-i18n", "~> 1.3.0"
   spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "relaton-bib", ">= 1.13.0"
+  spec.add_dependency "relaton-bib", ">= 1.20.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only
   spec.add_dependency "base64" # Liquid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement