relaton-bib 1.11.5 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4879a622c8f133828b75abffc19166c9bc8047d9ecff25bbcd7b8cdc472acde4
-  data.tar.gz: 27b37f70ddf22ded981996ac98ae58b284b99790ff0d1bb96a55c100fc08a850
+  metadata.gz: b67e36718ab80cde1c79a95f8233240641a49ef1faacadf94816d19f4d410b48
+  data.tar.gz: 63caef369d95e108ab09ecfb266db82528e76f29c3107f5ebb5b5a6ce3f6eab5
 SHA512:
-  metadata.gz: 46fdb1f657ae745e28ac3e4b11fa17b4bd42a75fef5c9aca29b7834796df6f75bdff1f73ef81222784f9dae07ea200a821d8d3ad10d754f5ee75eebded5e8fd1
-  data.tar.gz: 4a86ff51080029116ce9a0745f8411442fa6ce8da5a89b278a3a0dc38ffd4368fc36b516d9ea631662e74fc3704284889dfa1af758dba209520371824fe6321f
+  metadata.gz: 680f63959cde0cb1f151ae84afcf41696e52ba7c4777b84415b22f50a10c32d188e471a4c5d5bce2922326c76889a7402f3105c192004a4d94ed3aa1de8b07aa
+  data.tar.gz: c5d7df8e301a1518b1acdd2ca5dc5ae7bd88b24d0464b5e0428a41a446e660fac58f6658a992cbfc17369ca9986a7460cee0ffbfd606b690c53eb1df55f743e8

data/lib/relaton_bib/localized_string.rb

@@ -56,10 +56,67 @@ module RelatonBib
       else
         builder.parent["language"] = language.join(",") if language&.any?
         builder.parent["script"]   = script.join(",") if script&.any?
-        builder.text content
+        builder.parent.inner_html = encode content
       end
     end
 
+    #
+    # Encode content.
+    #
+    # @param [String] cnt content
+    #
+    # @return [String] encoded content
+    #
+    def encode(cnt) # rubocop:disable Metrics/MethodLength
+      regex = /(?<prf>.*?)(?<xml><(?<tag>\w+)>.*<\/\k<tag>>)(?<sfx>.*)/m
+      if cnt.match(regex)
+        prf = Regexp.last_match(:prf).lstrip
+        xml = Regexp.last_match[:xml]
+        sfx = Regexp.last_match(:sfx).rstrip
+        parts = xml.scan(/\s*<(?<tago>\w+)>(?<cnt1>.*?)(?=<\/?\w+>)|(?<cnt2>.*?)<\/(?<tagc>\w+)>/)
+        out = scan_xml parts
+        "#{escp(prf)}#{out}#{escp(sfx)}"
+      else
+        escp cnt
+      end
+    end
+
+    #
+    # Scan XML and escape HTML entities.
+    #
+    # @param [Array<Array<String,nik>>] parts XML parts
+    #
+    # @return [String] output string
+    #
+    def scan_xml(parts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+      return "" unless parts.any? && parts.first[0]
+
+      tago, cnt1, = parts.shift
+      if tago && tago == parts.first[3]
+        _, _, cnt2, tagc = parts.shift
+        "<#{tago}>#{escp(cnt1)}#{escp(cnt2)}</#{tagc}>"
+      elsif tago
+        inr = scan_xml parts
+        _, _, cnt2, tagc = parts.shift
+        if tago == tagc
+          "<#{tago}>#{escp(cnt1)}#{inr}#{escp(cnt2)}</#{tagc}>"
+        else
+          "#{escp("<#{tago}>#{cnt1}")}#{inr}#{escp("#{cnt2}</#{tagc}>")}"
+        end
+      end + scan_xml(parts)
+    end
+
+    #
+    # Escope HTML entities.
+    #
+    # @param [String] str input string
+    #
+    # @return [String] output string
+    #
+    def escp(str)
+      HTMLEntities.new.encode str
+    end
+
     # @return [Hash]
     def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       if content.is_a? String

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.11.5".freeze
+  VERSION = "1.11.6".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -354,7 +354,7 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          c = a.text.strip # children.to_s
+          c = a.inner_html(encoding: "utf-8").strip
           FormattedString.new(content: c, language: a[:language],
                               script: a[:script], format: a[:format])
         end

data/lib/relaton_bib.rb

@@ -1,5 +1,6 @@
 require "forwardable"
 require "yaml"
+require "htmlentities"
 require "relaton_bib/version"
 require "relaton_bib/deep_dup"
 require "relaton_bib/localized_string"

data/relaton-bib.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable"
   spec.add_dependency "bibtex-ruby"
+  spec.add_dependency "htmlentities"
   spec.add_dependency "iso639"
   spec.add_dependency "nokogiri", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.11.5
+  version: 1.11.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: iso639
   requirement: !ruby/object:Gem::Requirement