relaton-bib 1.13.7 → 1.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 493716815449edfed921ea2239b0c066b614211c2722f261bf4f59d5aa094e54
-  data.tar.gz: 661ad28bf88fcb3e5b27888885696c14385fbb9bfc891f4b20ea91d7e6dba1f1
+  metadata.gz: 566350d7e96478f76484698d7b249e2fc7e22a454a3b2e9572d23b4ddac14723
+  data.tar.gz: 53be5f2b3ee6967f22e654aae40133cbdba560ad176bbfc4c8c0f5cee541385c
 SHA512:
-  metadata.gz: 2e5ef5a5bd17eafad776a09434fb8e7df82ec2ca3b4fc1e59a6e7d722a72e1c1f57ec75a80dfb1c651a7cea71160c04fb1083517169a68ba341bc3f607c8219c
-  data.tar.gz: 7b556666124417d87dc58709325b4be7970fb4af443686e332376b739edaa8ad0041e0a26145954577a2b1f8674b078a31405ac2447868caa8df06b3eb25158c
+  metadata.gz: 0fbbf49b3d1cb2cd5a4e1b423f547cf03d4a9d2c8d9178b15e4089d384e8c42f15de338f9a8991c1cd9fd83e9a2ac1c1783b11b7d1f7fbd30d8b53e7652db077
+  data.tar.gz: 011acbf178b30a5b62f9180f229e49ee4c804e75cba490df2802bad897261a6fed9e1d3a40c6cbd78554375de7884c1447afbdc02e48570976f439244edbaedd

data/lib/relaton_bib/typed_title_string.rb

@@ -101,6 +101,7 @@ module RelatonBib
     # @param content [String]
     # @param language [String]
     # @param script [String]
+    # @param format [String]
     def initialize(**args) # rubocop:disable Metrics/MethodLength
       unless args[:title] || args[:content]
         raise ArgumentError, %{Keyword "title" or "content" should be passed.}
@@ -108,24 +109,35 @@ module RelatonBib
 
       @type = args[:type]
 
-      if args[:title]
-        @title = args[:title]
+      case args[:title]
+      when FormattedString then @title = args[:title]
+      when Hash then @title = FormattedString.new(**args[:title])
       else
         fsargs = args.select { |k, _v| ARGS.include? k }
         @title = FormattedString.new(**fsargs)
       end
     end
 
-    # @param title [String]
-    # @return [TypedTitleStringCollection]
-    def self.from_string(title, lang = nil, script = nil)
+    #
+    # Create TypedTitleStringCollection from string
+    #
+    # @param title [String] title string
+    # @param lang [String, nil] language code Iso639
+    # @param script [String, nil] script code Iso15924
+    # @param format [String] format text/html, text/plain
+    #
+    # @return [TypedTitleStringCollection] collection of TypedTitleString
+    #
+    def self.from_string(title, lang = nil, script = nil, format = "text/plain")
       types = %w[title-intro title-main title-part]
       ttls = split_title(title)
       tts = ttls.map.with_index do |p, i|
-        new type: types[i], content: p, language: lang, script: script if p
+        next unless p
+
+        new type: types[i], content: p, language: lang, script: script, format: format
       end.compact
       tts << new(type: "main", content: ttls.compact.join(" - "),
-                 language: lang, script: script)
+                 language: lang, script: script, format: format)
       TypedTitleStringCollection.new tts
     end
 
@@ -140,10 +152,10 @@ module RelatonBib
     end
 
     # @param ttls [Array<String>]
-    # @return [Array<Strin, nil>]
+    # @return [Array<String, nil>]
     def self.intro_or_part(ttls)
       if /^(Part|Partie) \d+:/.match? ttls[1]
-        [nil, ttls[0], ttls[1..-1].join(" -- ")]
+        [nil, ttls[0], ttls[1..].join(" -- ")]
       else
         parts = ttls.slice(2..-1)
         part = parts.join " -- " if parts.any?
@@ -162,13 +174,6 @@ module RelatonBib
       th = title.to_hash
       return th unless type
 
-      # hash = { "type" => type }
-      # if th.is_a? String
-      #   hash["content"] = th
-      # else
-      #   hash.merge! th
-      # end
-      # hash
       th.merge "type" => type
     end
 
@@ -176,7 +181,7 @@ module RelatonBib
     # @param count [Integer] number of titles
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = count > 1 ? "#{pref}title::\n" : ""
       out += "#{pref}title.type:: #{type}\n" if type
       out += title.to_asciibib "#{pref}title", 1, !(type.nil? || type.empty?)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.7".freeze
+  VERSION = "1.13.8".freeze
 end

metadata

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