relaton-bib 1.5.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6731fb438a67250f0ea4b70e14aa783a6034595f7e6677f4c97c7158b787355e
-  data.tar.gz: b91531a725bd08256e4c41cb9c61f670195f4e4dd00665b034182e7b990aa228
+  metadata.gz: a7f6ef2eec280ac48d171fa25bc4c88d2df63692b5736823868f1751af971f3d
+  data.tar.gz: 78e4a52cb0e1d1ce66404af62d2e7f79f27634acbf84094a19e0f593affbdb5a
 SHA512:
-  metadata.gz: f8cc251a4c9dd90633c123862bdd09b8e7a3745080733aa36db751c26367b66558598d035b0aed131d095cd6d6a67df56e0ec988a4e18e674b64fdf3b216c061
-  data.tar.gz: fa3bb5f8290df770a2607ba65812fa8998650d2cfee2b22170964cf13b8286dd25f162e239e43b7ee5c9ca6e4efd42b819e10a40da77856044c308f03b02796a
+  metadata.gz: 226ead0669d2f060d24b541c8e0eab0d9357b0a697b96572aed3b68b539b97d9f2662f76669a7e0167eedd3fcbc1bdf8ff65e3d3135facdb1531619749095cba
+  data.tar.gz: 2a333a1a1ba8aa6683a6abc6f97d521c3be510cbaa7455483266e62523764cf6e04de0b909a0109c21c0c1e5aab5fc224140f97b0f2b60c66d55535e5f434c12

data/.github/workflows/macos.yml

@@ -32,6 +32,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/lib/relaton_bib.rb

@@ -13,21 +13,24 @@ module RelatonBib
 
   class << self
     # @param date [String, Integer, Date]
-    # @return [Date, NilClass]
-    def parse_date(date) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # @param str [Boolean]
+    # @return [Date, nil]
+    def parse_date(date, str = true) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/AbcSize
       return date if date.is_a?(Date)
 
-      sdate = date.to_s
-      case sdate
+      case date.to_s
       when /(?<date>\w+\s\d{4})/ # February 2012
-        Date.strptime($~[:date], "%B %Y")
+        d = Date.strptime($~[:date], "%B %Y")
+        str ? d.strftime("%Y-%m") : d
       when /(?<date>\w+\s\d{1,2},\s\d{4})/ # February 11, 2012
-        Date.strptime($~[:date], "%B %d, %Y")
+        d = Date.strptime($~[:date], "%B %d, %Y")
+        str ? d.strftime("%Y-%m-%d") : d
       when /(?<date>\d{4}-\d{2}-\d{2})/ # 2012-02-11
-        Date.parse($~[:date])
+        str ? $~[:date] : Date.strptime($~[:date], "%Y-%m-%d")
       when /(?<date>\d{4}-\d{2})/ # 2012-02
-        Date.strptime date, "%Y-%m"
-      when /(?<date>\d{4})/ then Date.strptime $~[:date], "%Y" # 2012
+        str ? $~[:date] : Date.strptime($~[:date], "%Y-%m")
+      when /(?<date>\d{4})/ # 2012
+        str ? $~[:date] : Date.strptime($~[:date], "%Y")
       end
     end
   end

data/lib/relaton_bib/biblio_note.rb

@@ -3,7 +3,7 @@ module RelatonBib
     extend Forwardable
 
     def_delegators :@array, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :map, :detect, :length
+                   :each, :map, :reduce, :detect, :length
 
     def initialize(notes)
       @array = notes
@@ -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/bibliographic_date.rb

@@ -12,15 +12,6 @@ module RelatonBib
     # @return [String]
     attr_reader :type
 
-    # @return [Date]
-    attr_reader :from
-
-    # @return [Date]
-    attr_reader :to
-
-    # @return [Date]
-    attr_reader :on
-
     # @param type [String] "published", "accessed", "created", "activated"
     # @param on [String]
     # @param from [String]
@@ -36,6 +27,21 @@ module RelatonBib
       @to   = RelatonBib.parse_date to
     end
 
+    # @param part [Symbol] :year, :month, :day, :date
+    # @return [String, Date, nil]
+    def from(part = nil)
+      d = instance_variable_get "@#{__callee__}".to_sym
+      return d unless part && d
+
+      date = parse_date(d)
+      return date if part == :date
+
+      date.is_a?(Date) ? date.send(part) : date
+    end
+
+    alias_method :to, :from
+    alias_method :on, :from
+
     # rubocop:disable Metrics/AbcSize
 
     # @param builder [Nokogiri::XML::Builder]
@@ -77,14 +83,27 @@ module RelatonBib
     private
 
     # Formats date
-    # @param date [Time]
-    # @param format [Symbol, nil] :full (yyyy-mm-dd), :short (yyyy-mm) or nil (yyyy)
+    # @param date [String]
+    # @param format [Symbol, nil] :full (yyyy-mm-dd), :short (yyyy-mm) or nil
     # @return [String]
     def date_format(date, format = nil)
-      case format
-      when :short then date.strftime "%Y-%m"
-      when :full then date.strftime "%Y-%m-%d"
-      else date.year
+      tmplt = case format
+              when :short then "%Y-%m"
+              when :full then "%Y-%m-%d"
+              else return date
+              end
+      d = parse_date(date)
+      d.is_a?(Date) ? d.strftime(tmplt) : d
+    end
+
+    # @param date [String]
+    # @return [Date]
+    def parse_date(date)
+      case date
+      when /^\d{4}-\d{2}-\d{2}/ then Date.parse(date) # 2012-02-11
+      when /^\d{4}-\d{2}/ then Date.strptime(date, "%Y-%m") # 2012-02
+      when /^\d{4}/ then Date.strptime(date, "%Y") # 2012
+      else date
       end
     end
   end

data/lib/relaton_bib/bibliographic_item.rb

@@ -292,7 +292,7 @@ module RelatonBib
     def shortref(identifier, **opts) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/PerceivedComplexity
       pubdate = date.select { |d| d.type == "published" }
       year = if opts[:no_year] || pubdate.empty? then ""
-             else ":" + pubdate&.first&.on&.year.to_s
+             else ":" + pubdate&.first&.on(:year).to_s
              end
       year += ": All Parts" if opts[:all_parts] || @all_parts
 
@@ -610,8 +610,8 @@ module RelatonBib
       date.each do |d|
         case d.type
         when "published"
-          item.year = d.on.year
-          item.month = d.on.month
+          item.year = d.on :year
+          item.month = d.on :month
         when "accessed" then item.urldate = d.on.to_s
         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/document_identifier.rb

@@ -71,11 +71,12 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
       pref = prefix.empty? ? prefix : prefix + "."
+      return "#{pref}docid:: #{id}\n" unless type || scope
+
       out = count > 1 ? "#{pref}docid::\n" : ""
       out += "#{pref}docid.type:: #{type}\n" if type
       out += "#{pref}docid.scope:: #{scope}\n" if scope
-      out += "#{pref}docid.id:: #{id}\n"
-      out
+      out + "#{pref}docid.id:: #{id}\n"
     end
 
     private

data/lib/relaton_bib/document_relation_collection.rb

@@ -6,7 +6,7 @@ module RelatonBib
     extend Forwardable
 
     def_delegators :@array, :<<, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :detect, :map, :length
+                   :each, :detect, :map, :reduce, :length
 
     # @param relation [Array<RelatonBib::DocumentRelation, Hash>]
     # @option relation [String] :type

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/hash_converter.rb

@@ -125,7 +125,7 @@ module RelatonBib
 
         ret[:docid] = array(ret[:docid])
         ret[:docid]&.each_with_index do |id, i|
-          type = id[:type] || id[:id].match(/^\w+/)&.to_s
+          type = id[:type] || id[:id].match(/^\w+\s/)&.to_s
           ret[:docid][i] = DocumentIdentifier.new(id: id[:id], type: type,
                                                   scope: id[:scope])
         end

data/lib/relaton_bib/hit_collection.rb

@@ -4,7 +4,8 @@ module RelatonBib
   class HitCollection
     extend Forwardable
 
-    def_delegators :@array, :<<, :[], :first, :empty?, :any?, :size, :each, :each_slice
+    def_delegators :@array, :<<, :[], :first, :empty?, :any?, :size, :each,
+                   :each_slice, :reduce
 
     # @return [TrueClass, FalseClass]
     attr_reader :fetched

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/structured_identifier.rb

@@ -3,7 +3,8 @@ module RelatonBib
     include RelatonBib
     extend Forwardable
 
-    def_delegators :@collection, :any?, :size, :[], :detect
+    def_delegators :@collection, :any?, :size, :[], :detect, :map, :each,
+                   :reduce
 
     # @param collection [Array<RelatonBib::StructuredIdentifier>]
     def initialize(collection)

data/lib/relaton_bib/typed_title_string.rb

@@ -3,7 +3,7 @@ module RelatonBib
     extend Forwardable
 
     def_delegators :@array, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :detect, :map, :length
+                   :each, :detect, :map, :reduce, :length
 
     # @param title [Array<RelatonBib::TypedTitleString, Hash>]
     def initialize(title = [])
@@ -30,6 +30,12 @@ module RelatonBib
       TypedTitleStringCollection.new(titles.select { |t| yield t })
     end
 
+    # @param init [Array, Hash]
+    # @return [RelatonBib::TypedTitleStringCollection]
+    # def reduce(init)
+    #   self.class.new @array.reduce(init) { |m, t| yield m, t }
+    # end
+
     # @param title [RelatonBib::TypedTitleString]
     # @return [self]
     def <<(title)
@@ -156,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.5.0".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.5.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug