relaton-render 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75575a57cbac1f7ce210b85d268a9823b40480a39450db3280d56f7957e61cc6
-  data.tar.gz: 70b154b648b4128289f6ba3756b6ab214e449616b68be983e3adb45ddb58ad70
+  metadata.gz: 54bf3f59c3256133ee01beae991596ff8c6be10f44d23d06cc1b4e7c6b83341a
+  data.tar.gz: b187bf01f207fb03fe5ef351db816229417146dd4254d4a593ae211412b94596
 SHA512:
-  metadata.gz: 3895597474affcbe243087c895f2d98d75e705401b0fb686539bf11e37bc160906a8fe03f1481dd678b2378464b77493e8995bdd59b4f40ee366f12e8649e3dd
-  data.tar.gz: 3ab8323c45c199cb25490a7c7eadf0208d82acb0d5457f4c6df8b37dc81ebf50647745cc759110f242a2a7b683ba384954bcacdf0024be69ddb2896523cfa6b1
+  metadata.gz: 698dc535088cec7578bc75f3f4811a5fd30e3300d205f41ae3abd5f3434db85efdb2231db8382a5aa17af9dedd9c0aaacab2572b90eaed518aec491b9806d6ab
+  data.tar.gz: 1671c424fce8b4642228eeddef8398675ac2c7a2fddf98e80301f3f0c6fa2c0fa76fe62278d022d6a3c144eb0aa91938db2e8e0690c4ef2baf01818dd088250e

data/.gitignore

@@ -0,0 +1,14 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status
+Gemfile.lock
+.vscode/
+bin/rspec

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

@@ -34,7 +34,7 @@ module Relaton
         def initialize(opt = {})
           @htmlentities = HTMLEntities.new
           @templatecache = CacheManager.instance
-          customise_liquid
+          @liquid_env = create_liquid_environment
           parse_options(opt)
         end
 
@@ -51,9 +51,10 @@ module Relaton
             end
         end
 
-        def customise_liquid
-          ::Liquid::Template
-            .register_filter(::Relaton::Render::Template::CapitalizeFirst)
+        def create_liquid_environment
+          env = ::Liquid::Environment.new
+          env.register_filter(::Relaton::Render::Template::CustomFilters)
+          env
         end
 
         # denote start and end of field,
@@ -81,7 +82,7 @@ module Relaton
           @templatecache.mutex.synchronize do
             unless t = @templatecache.retrieve(template)
               t = ::Liquid::Template
-                .parse(add_field_delim_to_template(template))
+                .parse(add_field_delim_to_template(template), environment: @liquid_env)
               @templatecache.store(template, t)
             end
           end
@@ -187,7 +188,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.3".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.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-23 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -215,6 +215,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
+- ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - Gemfile
@@ -270,7 +271,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