relaton-bib 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1acb1bee569016f446bebcaeac0a98d1491d19be9a87dbd072cabec368c1aea
-  data.tar.gz: 48897d74a02ea1fe1d2578ac8fbe9f6bd89d1f0fb47b19000f75dbc7697caac7
+  metadata.gz: a7f6ef2eec280ac48d171fa25bc4c88d2df63692b5736823868f1751af971f3d
+  data.tar.gz: 78e4a52cb0e1d1ce66404af62d2e7f79f27634acbf84094a19e0f593affbdb5a
 SHA512:
-  metadata.gz: ef1c0e62f60371c2416af0d0436165ba187d95004a2b8e6401b0c56ac98c0a4a4d1a75a4ec44f65bc5c50130e38d453107bbc370c291c23697efb8aae5f1c422
-  data.tar.gz: 2c7a9ccf203fe180282339700b580b575db35ce712901784b3c0e72005279561ad0e9218202b2d4f1a9ed609fc9118412a1ae9a7919fb913015efae150e2eeb1
+  metadata.gz: 226ead0669d2f060d24b541c8e0eab0d9357b0a697b96572aed3b68b539b97d9f2662f76669a7e0167eedd3fcbc1bdf8ff65e3d3135facdb1531619749095cba
+  data.tar.gz: 2a333a1a1ba8aa6683a6abc6f97d521c3be510cbaa7455483266e62523764cf6e04de0b909a0109c21c0c1e5aab5fc224140f97b0f2b60c66d55535e5f434c12

data/lib/relaton_bib/biblio_note.rb

@@ -62,9 +62,10 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
       pref = prefix.empty? ? prefix : prefix + "."
-      out = count > 1 ? "#{pref}biblionote::\n" : ""
-      out + "#{pref}biblionote.type:: #{type}\n" if type
-      out += super "#{pref}biblionote"
+      has_attrs = !(type.nil? || type.empty?)
+      out = count > 1 && has_attrs ? "#{pref}biblionote::\n" : ""
+      out += "#{pref}biblionote.type:: #{type}\n" if type
+      out += super "#{pref}biblionote", 1, has_attrs
       out
     end
   end

data/lib/relaton_bib/contribution_info.rb

@@ -81,8 +81,11 @@ module RelatonBib
     attr_reader :entity
 
     # @param entity [RelatonBib::Person, RelatonBib::Organization]
-    # @param role [Array<String>]
-    def initialize(entity:, role: [{ type: "publisher" }])
+    # @param role [Array<Hash>]
+    def initialize(entity:, role: [])
+      if role.empty?
+        role << { type: entity.is_a?(Person) ? "author" : "publisher" }
+      end
       @entity = entity
       @role   = role.map { |r| ContributorRole.new(**r) }
     end

data/lib/relaton_bib/formatted_string.rb

@@ -44,7 +44,8 @@ module RelatonBib
     # @param prefix [String]
     # @param count [Integer] number of elements
     # @return [String]
-    def to_asciibib(prefix = "", count = 1)
+    def to_asciibib(prefix = "", count = 1, has_attrs = false)
+      has_attrs ||= !(format.nil? || format.empty?)
       pref = prefix.empty? ? prefix : prefix + "."
       # out = count > 1 ? "#{prefix}::\n" : ""
       out = super

data/lib/relaton_bib/localized_string.rb

@@ -77,9 +77,13 @@ module RelatonBib
     # @param prefix [String]
     # @param count [Integer] number of elements
     # @return [String]
-    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def to_asciibib(prefix = "", count = 1, has_attrs = false) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
       pref = prefix.empty? ? prefix : prefix + "."
       if content.is_a? String
+        unless language&.any? || script&.any? || has_attrs
+          return "#{prefix}:: #{content}\n"
+        end
+
         out = count > 1 ? "#{prefix}::\n" : ""
         out += "#{pref}content:: #{content}\n"
         language&.each { |l| out += "#{pref}language:: #{l}\n" }

data/lib/relaton_bib/typed_title_string.rb

@@ -162,7 +162,7 @@ module RelatonBib
       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"
+      out += title.to_asciibib "#{pref}title", 1, !(type.nil? || type.empty?)
       out
     end
   end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.6.1".freeze
+  VERSION = "1.6.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug