relaton-render 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f484dc0f8b679d7aa4e200ea5288c7b08120ed482eb50dbb4feb6d8f4ebc18
-  data.tar.gz: 5775265c429b2861268f838b794d8a2a874c6caa789b73d77b4e1e6983b7a57e
+  metadata.gz: 4bcf0448a633329d256fee9e297e7c50182a5e214014a7cb78a9d3ab7ec3147f
+  data.tar.gz: 766c8ddbb23a88334eaf2d3be35894ffe62ce300126c7cdded5af90e8341a7a6
 SHA512:
-  metadata.gz: 4fd197eee29210c266c87a38b195a6358d8446aefac03baac057b15a93524b2f590c5470ed1ae419595b986067d20f725878e058574acd146b0435e4eebce8be
-  data.tar.gz: b53ec5cadb07fe27883468c83b1799ed0191efaa56cf5bf11715f0320a4d9c0329ce99e7447e8b558b2ae1ebac953f42c20e6f83f7a3831bee952c27452992bf
+  metadata.gz: 9ff2d1381a4075e7c0c5b46a5fb174b1190621b25760600928f2b49da2379eea21006f17468d74c89e9c1f30cd8abb49f591bd5361e5ab57e029a6de04d09c57
+  data.tar.gz: 18b0f1710c29a3e8ce67f055d3dcdefeaf62191ff7711beaa296bf95f669f49699186868172a617a429765c9544de52eb30669b98c2b63f41a46c76b36b91b65

data/lib/relaton/render/general/render.rb

@@ -241,7 +241,7 @@ module Relaton
 
       def valid_parse(ret)
         @i18n.select(nil).get["no_date"] == ret and return nil
-        ret
+        ret&.gsub(/\+\+\+(.+?)\+\+\+/, '\1')
       end
 
       # expect array of Relaton objects, in sorted order

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

@@ -82,6 +82,8 @@ module Relaton
         end
       end
 
+      ALLOWED_INLINE_TAGS = %w[em strong sub sup a smallcap].freeze
+
       private
 
       def blank?(text)
@@ -93,6 +95,19 @@ module Relaton
         "<esc>#{text}</esc>"
       end
 
+      # Strip any tag not in ALLOWED_INLINE_TAGS, in both literal (<tag>) and
+      # entity-encoded (&lt;tag&gt;) forms. Used to defend Liquid template
+      # output against embedded structural markup (most commonly <title>) in
+      # bibliographic text fields, where relaton-bib may surface either form
+      # depending on lutaml-model serialisation behaviour.
+      def sanitise_inline_markup(str)
+        blank?(str) and return str
+        allowed = ALLOWED_INLINE_TAGS.join("|")
+        literal = %r{</?(?!(?:#{allowed})\b)[A-Za-z][\w:-]*(?:\s[^>]*)?/?>}
+        encoded = %r{&lt;/?(?!(?:#{allowed})\b)[A-Za-z][\w:-]*(?:\s[^&]*?)?/?&gt;}
+        str.gsub(literal, "").gsub(encoded, "")
+      end
+
       def wrap_in_esc(obj)
         case obj
         when String then esc(obj)

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

@@ -4,15 +4,12 @@ module Relaton
       def content(node)
         node.nil? and return node
         node.is_a?(String) and
-          return node.strip.gsub("</title>", "").gsub("<title>", "")
+          return sanitise_inline_markup(node.strip)
             .gsub(/>\n\s*</, "><").gsub(/\n\s*/, " ")
         node.content.is_a?(Array) and return node.content.map { |x| content(x) }
-        ret = node.content.strip
-          .gsub("</title>", "").gsub("<title>", "")
+        ret = sanitise_inline_markup(node.content.strip)
         # safeguard against indented XML
         ret.gsub(/>\n\s*</, "><").gsub(/\n\s*/, " ")
-        # 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/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "1.1.0".freeze
+    VERSION = "1.2.1".freeze
   end
 end

data/relaton-render.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "canon"
   spec.add_development_dependency "debug"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "isodoc"
   spec.add_development_dependency "openssl"
   spec.add_development_dependency "rake", ">= 12.3.3"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "base64" # Liquid
   spec.add_dependency "bigdecimal" # Liquid
-  spec.add_dependency "isodoc-i18n", "~> 1.4.0"
+  spec.add_dependency "isodoc-i18n", "~> 1.5.0"
   spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "metanorma-utils", "~> 2"
   spec.add_dependency "nokogiri"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-09 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debug
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="