relaton-bib 1.13.3 → 1.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca70214e52f3a00a9388de24a1e07fa6464e0cb23831fd14775ce0e29c929fdf
-  data.tar.gz: 33cafac4c23e9dc57f102982bffbea20c25420f89471f164a0f875e4e6a74e26
+  metadata.gz: 0caab7f3d9965a4a482826d13169b71667104909e0e88b5da5e0f26e63ae2949
+  data.tar.gz: 07fb1078b43b5490685e9219569fa304a0c3f9024145aad4a1406eec103fcfd6
 SHA512:
-  metadata.gz: d5eb2c4f5b7c13337a0e1f560d69ad140f91ea49405c3a4d876110bcdab32e532043a65187ca5fa6973c6cb0cf0240c285430a58d32338d186da882632194b2d
-  data.tar.gz: 3fd3d4b199c1c190c4920c7daba0e73979a6e82ee24648a84ab3057e2cee08345db9cc929ba324773a55d0e1fe4160ca5af2320a2e297c52dfcbace78bbcd282
+  metadata.gz: afdba375985986ad6be85d4491f4477c69bf61c8adf998684d037d8100e4298cc8edb7734b311f0a9adeb3252da08b961e6499263a814b6edcbb92919ebc98b0
+  data.tar.gz: ea84abe94491d7f43e29aca0b5a7a2334876f419d653ca6f2f340c05d1a5ae0c3cbee226731969d4489179767362547e0d3ce4474143e670f35bdd7b5fc03981

data/lib/relaton_bib/bibliographic_item.rb

@@ -145,7 +145,7 @@ module RelatonBib
     # @param language [Arra<String>]
     # @param script [Array<String>]
     # @param docstatus [RelatonBib::DocumentStatus, nil]
-    # @param edition [RelatonBib::Edition, nil]
+    # @param edition [RelatonBib::Edition, String, Integer, Float, nil]
     # @param version [Array<RelatonBib::BibliographicItem::Version>]
     # @param biblionote [RelatonBib::BiblioNoteCollection]
     # @param series [Array<RelatonBib::Series>]
@@ -240,8 +240,9 @@ module RelatonBib
       @docnumber      = args[:docnumber]
       @edition        = case args[:edition]
                         when Hash then Edition.new(**args[:edition])
-                        when String then Edition.new(content: args[:edition])
-                        else args[:edition]
+                        when String, Integer, Float
+                          Edition.new(content: args[:edition].to_s)
+                        when Edition then args[:edition]
                         end
       @version        = args.fetch :version, []
       @biblionote     = args.fetch :biblionote, BiblioNoteCollection.new([])

data/lib/relaton_bib/edition.rb

@@ -9,12 +9,12 @@ module RelatonBib
     #
     # Initialize edition.
     #
-    # @param [String] content edition
-    # @param [String, nil] number number
+    # @param [String, Integer, Float] content edition
+    # @param [String, Integer, Float, nil] number number
     #
     def initialize(content:, number: nil)
-      @content = content
-      @number = number
+      @content = content.to_s
+      @number = number&.to_s
     end
 
     #

data/lib/relaton_bib/formatted_string.rb

@@ -31,6 +31,62 @@ module RelatonBib
       super
     end
 
+    #
+    # Encode content.
+    #
+    # @param [String] cnt content
+    #
+    # @return [String] encoded content
+    #
+    def encode(cnt) # rubocop:disable Metrics/MethodLength
+      return unless cnt
+      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 +102,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
 
     #

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.3".freeze
+  VERSION = "1.13.5".freeze
 end

metadata

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