relaton-render 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75575a57cbac1f7ce210b85d268a9823b40480a39450db3280d56f7957e61cc6
-  data.tar.gz: 70b154b648b4128289f6ba3756b6ab214e449616b68be983e3adb45ddb58ad70
+  metadata.gz: '093dc48a9893414c5abdee0073b6295634cfbf6a5c9189db4bd0707694579342'
+  data.tar.gz: 5d31145a5d427c19cc0bfd3304f6b1a8467525fc619e5ab7f3e9d1e7c40aa9b1
 SHA512:
-  metadata.gz: 3895597474affcbe243087c895f2d98d75e705401b0fb686539bf11e37bc160906a8fe03f1481dd678b2378464b77493e8995bdd59b4f40ee366f12e8649e3dd
-  data.tar.gz: 3ab8323c45c199cb25490a7c7eadf0208d82acb0d5457f4c6df8b37dc81ebf50647745cc759110f242a2a7b683ba384954bcacdf0024be69ddb2896523cfa6b1
+  metadata.gz: 654aa465197829c72232ce8065277d0a378554459f24aee28be8e9925f6e805e794aaa55729773fa0e0fdd99eaa97df216006028e313d191ad3045038743a194
+  data.tar.gz: a92588028e0d215d35781f0e78a0b5f40bee5ea19ed2c2bf502a78c2063c13449fbf8cb0cf60cdc16d008d865470d5087f2c039e691dd64ac28b117ec658844f

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

@@ -5,8 +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
-        #node.children.map { |n| n.text? ? n.content : n.to_xml }.join
-        #node.text? ? node.content.strip : node.to_xml.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)
@@ -23,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)
@@ -51,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/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.1".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.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-23 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