relaton-bib 1.13.4 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b16ceaaf0f86b9834a58c3a39008309f76d26de2347cb21fd2fef40cabc2fb0d
-  data.tar.gz: 98348d372d278546dfa04579b80e6f7b1b9fa289ce794c728716cd73b97787e0
+  metadata.gz: 0bb1128da936b194ce7e29899a6092f2767e85b4f7e7963306cdb65789af8c65
+  data.tar.gz: a3c52753f1459b6898d9780d10899b560708fbbccb5f5a8e168c8b9945bcb5c1
 SHA512:
-  metadata.gz: 97b3b1e729dfcae82196f3aff635c92a199cdae6ca0fa5c338321ef0f86bc3412212b83a3871c1aae7585e71d9db5bc6c6406327e1a7c43cb1f2ca1524e11ebb
-  data.tar.gz: eab637a2d826cfa98d7d1cbda52509d05a59949ef7617ef04e066e1abbe4b9326d9a7313db64495925ee345fb1214f08b2381f66acce9a8b3e5e1a21ce95809d
+  metadata.gz: edbdefdccca25da59d741f1013e5008a63ea53beff1350f5a248c52e8810f94ef3d08040a14976005ebdb0c79405b839534784550a893b368866ed6a561c6e33
+  data.tar.gz: f0ba59355807104e7915ff731da8bbe55197299af8b10e1ae90c6ba2a23c36e643d356c629dd307bf3fbf5094257c91a4509e908bbaca510cab5f1d65764e896

data/lib/relaton_bib/formatted_string.rb

@@ -31,6 +31,61 @@ module RelatonBib
       super
     end
 
+    #
+    # Encode content.
+    #
+    # @param [String] cnt content
+    #
+    # @return [String] encoded content
+    #
+    def encode(cnt) # rubocop:disable Metrics/MethodLength
+      return escp(cnt) unless format == "text/html"
+
+      parts = cnt.scan(%r{
+        <(?<tago>\w+)(?<attrs>[^>]*)> | # tag open
+        </(?<tagc>\w+)> | # tag close
+        (?<cmt><!--.*?-->) | # comment
+        (?<cnt>.+?)(?=<|$) # content
+        }x)
+      scan_xml parts
+    end
+
+    #
+    # Scan XML and escape HTML entities.
+    #
+    # @param [Array<Array<String,nil>>] 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?
+
+      out = ""
+      while parts.any? && (parts.first[3] || parts.first[4])
+        _, _, _, cmt, cnt = parts.shift
+        out += "#{cmt}#{escp(cnt)}"
+      end
+      unless out.empty?
+        out += scan_xml(parts) if parts.any? && parts.first[0]
+        return out
+      end
+
+      tago, attrs, tagc, = parts.shift
+      out = if tago && attrs && attrs[-1] == "/"
+              "<#{tago}#{attrs}>"
+            elsif tago
+              inr = scan_xml parts
+              _, _, tagc, = parts.shift
+              if tago == tagc
+                "<#{tago}#{attrs}>#{inr}</#{tagc}>"
+              else
+                "#{escp("<#{tago}#{attrs}>")}#{inr}#{escp("</#{tagc}>")}"
+              end
+            end
+      out += scan_xml(parts) if parts.any? && (parts.first[0] || parts.first[3] || parts.first[4])
+      out
+    end
+
     # @return [Hash]
     def to_hash
       hash = super
@@ -46,7 +101,7 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1, has_attrs = false)
       has_attrs ||= !(format.nil? || format.empty?)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       # out = count > 1 ? "#{prefix}::\n" : ""
       out = super
       out += "#{pref}format:: #{format}\n" if format

data/lib/relaton_bib/localized_string.rb

@@ -76,51 +76,7 @@ module RelatonBib
     # @return [String] encoded content
     #
     def encode(cnt) # rubocop:disable Metrics/MethodLength
-      return unless cnt
-
-      parts = cnt.scan(%r{
-        <(?<tago>\w+)(?<attrs>[^>]*)> | # tag open
-        </(?<tagc>\w+)> | # tag close
-        (?<cmt><!--.*?-->) | # comment
-        (?<cnt>.+?)(?=<|$) # content
-        }x)
-      scan_xml parts
-    end
-
-    #
-    # Scan XML and escape HTML entities.
-    #
-    # @param [Array<Array<String,nil>>] 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?
-
-      out = ""
-      while parts.any? && (parts.first[3] || parts.first[4])
-        _, _, _, cmt, cnt = parts.shift
-        out += "#{cmt}#{escp(cnt)}"
-      end
-      unless out.empty?
-        out += scan_xml(parts) if parts.any? && parts.first[0]
-        return out
-      end
-
-      tago, attrs, tagc, = parts.shift
-      out = if tago && attrs && attrs[-1] == "/"
-              "<#{tago}#{attrs}>"
-            elsif tago
-              inr = scan_xml parts
-              _, _, tagc, = parts.shift
-              if tago == tagc
-                "<#{tago}#{attrs}>#{inr}</#{tagc}>"
-              else
-                "#{escp("<#{tago}#{attrs}>")}#{inr}#{escp("</#{tagc}>")}"
-              end
-            end
-      out += scan_xml(parts) if parts.any? && (parts.first[0] || parts.first[3] || parts.first[4])
-      out
+      escp cnt
     end
 
     #
@@ -131,7 +87,9 @@ module RelatonBib
     # @return [String] output string
     #
     def escp(str)
-      HTMLEntities.new.encode str
+      return unless str
+
+      HTMLEntities.new.encode str.dup.force_encoding("UTF-8")
     end
 
     # @return [Hash]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.4".freeze
+  VERSION = "1.13.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.13.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug