relaton-render 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60624cccbc9d2e12cc7bdd47f4a8dfadbfb3173ae3eb9e2cc5c7e9463ff5eae3
-  data.tar.gz: 7b00ae7cb5612f7c225a5211d18b1d118466e1e6ae96211191462e2d4eface81
+  metadata.gz: '093dc48a9893414c5abdee0073b6295634cfbf6a5c9189db4bd0707694579342'
+  data.tar.gz: 5d31145a5d427c19cc0bfd3304f6b1a8467525fc619e5ab7f3e9d1e7c40aa9b1
 SHA512:
-  metadata.gz: 625abfc7777b059ba61e8d1fc8cdb858390f7497e3c537522e84e3aed4e8bc375cb8363651e51b6b4d97d1b54084ce289f3215f7c396dbc0f6be4eb69e520697
-  data.tar.gz: e15b472ab455fea5e36465fbfcd1571d8dfadcae5bd34034abf02e4bb53e4067e76a5471420b6054829926bd5efa95a857ebf9868b77acada502c6a8a673f72e
+  metadata.gz: 654aa465197829c72232ce8065277d0a378554459f24aee28be8e9925f6e805e794aaa55729773fa0e0fdd99eaa97df216006028e313d191ad3045038743a194
+  data.tar.gz: a92588028e0d215d35781f0e78a0b5f40bee5ea19ed2c2bf502a78c2063c13449fbf8cb0cf60cdc16d008d865470d5087f2c039e691dd64ac28b117ec658844f

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,9 @@ module Relaton
         node.nil? and return node
         node.content.is_a?(Array) and return node.content.map { |x| content(x) }
         node.content.strip
+          .gsub("</title>", "").gsub("<title>", "")
+        # 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)
@@ -21,16 +24,19 @@ module Relaton
       end
 
       def given_and_middle_name(person)
-        forenames = person.name.forename.map do |x|
-          x.content.empty? ? "#{x.initial}." : content(x)
-        end
+        forenames = forenames_parse(person)
+        initials = extract_initials(person)
+        forenames.empty? and initials.empty? and return [nil, nil, nil]
+        initials.empty? and initials = initials_from_forenames(forenames)
+        [forenames.first, forenames[1..-1], Array(initials)]
+      end
+
+      def extract_initials(person)
         initials = content(person.name.initials)&.sub(/(.)\.?$/, "\\1.")
           &.split /(?<=\.) /
         initials ||= person.name.forename.map(&:initial)
           .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
-        forenames.empty? and initials.empty? and return [nil, nil, nil]
-        initials.empty? and initials = forenames.map { |x| "#{x[0]}." }
-        [forenames.first, forenames[1..-1], Array(initials)]
+        initials
       end
 
       def forenames_parse(person)
@@ -49,6 +55,10 @@ module Relaton
           .scan(/.+?\.(?=(?:$|\s|\p{Alpha}))/).map(&:strip)
       end
 
+      def initials_from_forenames(forenames)
+        forenames.map(&:split).flatten.map { |x| "#{x[0]}." }
+      end
+
       def extractname(contributor)
         org = contributor.entity if contributor.entity
           .is_a?(RelatonBib::Organization)

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

@@ -141,13 +141,15 @@ module Relaton
         doc.extent.each_with_object([]) do |e, acc|
           case e
           when RelatonBib::Extent, RelatonBib::LocalityStack
-            e.locality.each do |e1|
+            a = e.locality.each_with_object([]) do |e1, m|
               if e1.is_a?(RelatonBib::LocalityStack)
-                acc << extent1(e1.locality)
+                m << extent1(e1.locality)
               else
-                acc << extent1(Array(e1))
+                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/template/liquid.rb

@@ -1,7 +1,7 @@
 module Relaton
   module Render
     module Template
-      module CapitalizeFirst
+      module CustomFilters
         def capitalize_first(words)
           return nil if words.nil?
 
@@ -9,6 +9,33 @@ module Relaton
           ret.first.capitalize! if ret.size.positive?
           ret.join("_")
         end
+
+        def selective_upcase(text)
+          return nil if text.nil?
+
+          ret = text.split(/(\+\+\+[^+]+?\+\+\+)/)
+          ret.map do |n|
+            if m = /^\+\+\+(.+)\+\+\+$/.match(n)
+              m[1]
+            else
+              n.upcase
+            end
+          end.join
+        end
+
+        def selective_tag(text, tag)
+          return nil if text.nil?
+
+          ret = text.split(/(\+\+\+[^+]+?\+\+\+)/)
+          ret.map do |n|
+            if m = /^\+\+\+(.+)\+\+\+$/.match(n)
+              m[1]
+            else
+              closetag = tag.sub(/^</, "</")
+              "#{tag}#{n}#{closetag}"
+            end
+          end.join
+        end
       end
     end
   end

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

@@ -53,7 +53,7 @@ module Relaton
 
         def customise_liquid
           ::Liquid::Template
-            .register_filter(::Relaton::Render::Template::CapitalizeFirst)
+            .register_filter(::Relaton::Render::Template::CustomFilters)
         end
 
         # denote start and end of field,
@@ -187,7 +187,7 @@ module Relaton
         end
 
         def template_select_etal(names)
-          if @etal_count && names[:surname].size >= @etal_count
+          if @etal_count && names[:surname].size > @etal_count
             expand_nametemplate(@template_raw[:etal], @etal_display)
           else
             expand_nametemplate(@template_raw[:more], names[:surname].size)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.9.0".freeze
+    VERSION = "0.9.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2025-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Rendering of ISO 690 XML