relaton-bib 1.9.20 → 1.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b714ee74a9d4da85784bbcc2e7fb50c9548215c1399a799290646eb230529f2f
-  data.tar.gz: 75cf8abea4defed1d25cd241443ae6b8df03688a47e8cce4e907bab03315d978
+  metadata.gz: fcb3b3d66701b4722151be5191a2eabfb1bc1e00453051e1a903e2af8c2b30b2
+  data.tar.gz: eca150d7708507187a93e6cff06eda12cfeef54dc1a6ac93d8244c0db6accdaa
 SHA512:
-  metadata.gz: 50dd80e6be598a65d4ded5f35e047b7b32a1c9cdcdacdd0539d13e149533501f093e95bbb176b1a58f566274c16ec88b461d50c295daa9bb46c52a9c683bf949
-  data.tar.gz: 58ac55543ac1f21477ca3c1125c8d50ccd88aee77c1ab74c4aa374839549d289083827d3b54795cb35901fa26bf46b3a7f4fff46c7b86e8ee23043f05c18ba04
+  metadata.gz: 7f390c1e5e802966bc00002bf54bd1d246b45fc293188dc829940d90c32bc89db6b4e49e2ef4de14c13751c6ac6cff9692d23e558c1fe929815523f99de2a680
+  data.tar.gz: 404f08acad50390f9e63af5a3a30685eb7d50a085e6d98d8730277062b644f38ac5f3ab75c959a25523457bed001ef6a7f8d6dd063b5d227319a0e651936f379

data/lib/relaton_bib/bibliographic_date.rb

@@ -29,14 +29,22 @@ module RelatonBib
 
     # @param part [Symbol] :year, :month, :day, :date
     # @return [String, Date, nil]
-    def from(part = nil)
+    def from(part = nil) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       d = instance_variable_get "@#{__callee__}".to_sym
       return d unless part && d
 
-      date = parse_date(d)
-      return date if part == :date
+      # date = parse_date(d)
+      # return date if part == :date
 
-      date.is_a?(Date) ? date.send(part) : date
+      parts = d.split "-"
+      case part
+      when :year then parts[0]&.to_i
+      when :month then parts[1]&.to_i
+      when :day then parts[2]&.to_i
+      else parse_date(d)
+      end
+
+      # date.is_a?(Date) ? date.send(part) : date
     end
 
     alias_method :to, :from
@@ -71,7 +79,7 @@ module RelatonBib
     # @param count [Integer] number of dates
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = count > 1 ? "#{pref}date::\n" : ""
       out += "#{pref}date.type:: #{type}\n"
       out += "#{pref}date.on:: #{on}\n" if on

data/lib/relaton_bib/bibliographic_item.rb

@@ -165,8 +165,8 @@ module RelatonBib
     # @option date [String, nil] :to
     # @option date [String, nil] :on required if :from is nil
     #
-    # @param contributor [Array<Hash>]
-    # @option contributor [RealtonBib::Organization, RelatonBib::Person]
+    # @param contributor [Array<Hash, RelatonBib::ContributionInfo>]
+    # @option contributor [RealtonBib::Organization, RelatonBib::Person] :entity
     # @option contributor [String] :type
     # @option contributor [String] :from
     # @option contributor [String] :to
@@ -860,9 +860,9 @@ module RelatonBib
           builder.seriesInfo(name: di.type, value: di.id)
         end
       end
-      di_types = docidentifier.map(&:type)
+      # di_types = docidentifier.map(&:type)
       series.select do |s|
-        s.title && !di_types.include?(s.title.title.to_s) &&
+        s.title && # !di_types.include?(s.title.title.to_s) &&
           !BibXMLParser::SERIESINFONAMES.include?(s.title.title.to_s)
       end.uniq { |s| s.title.title.to_s }.each do |s|
         si = builder.seriesInfo(name: s.title.title.to_s)

data/lib/relaton_bib/bibxml_parser.rb

@@ -1,7 +1,10 @@
 module RelatonBib
   module BibXMLParser
+    # SeriesInfo what should be saved as docidentifiers in the Relaton model.
     SERIESINFONAMES = ["DOI", "Internet-Draft"].freeze
+
     FLAVOR = nil
+
     ORGNAMES = {
       "IEEE" => "Istitute of Electrical and Electronics Engineers",
       "W3C" => "World Wide Web Consortium",
@@ -314,11 +317,13 @@ module RelatonBib
     def dates(reference)
       return [] unless (date = reference.at "./front/date")
 
-      d = [date[:year], month(date[:month]), (date[:day] || 1)].compact.join "-"
-      date = Time.parse(d).strftime "%Y-%m-%d"
-      [BibliographicDate.new(type: "published", on: date)]
-    rescue ArgumentError
-      []
+      d = date[:year]
+      d += "-#{month(date[:month])}" if date[:month] && !date[:month].empty?
+      d += "-#{date[:day]}" if date[:day]
+      # date = Time.parse(d).strftime "%Y-%m-%d"
+      [BibliographicDate.new(type: "published", on: d)]
+    # rescue ArgumentError
+    #   []
     end
 
     # @param reference [Nokogiri::XML::Element]
@@ -338,10 +343,10 @@ module RelatonBib
     end
 
     def month(mon)
-      return 1 if !mon || mon.empty?
+      # return 1 if !mon || mon.empty?
       return mon if /^\d+$/.match? mon
 
-      Date::MONTHNAMES.index(mon)
+      Date::MONTHNAMES.index(mon).to_s.rjust 2, "0"
     end
 
     #
@@ -352,7 +357,7 @@ module RelatonBib
     #
     def series(reference)
       reference.xpath("./seriesInfo", "./front/seriesInfo").map do |si|
-        next if si[:name] == "DOI" || si[:stream] || si[:status]
+        next if SERIESINFONAMES.include?(si[:name]) || si[:stream] || si[:status]
 
         t = TypedTitleString.new(
           content: si[:name], language: language(reference), script: "Latn",

data/lib/relaton_bib/contributor.rb

@@ -25,7 +25,7 @@ module RelatonBib
     # @param state [String]
     # @param country [String]
     # @param postcode [String]
-    def initialize(street:, city:, state: nil, country:, postcode: nil)
+    def initialize(street:, city:, country:, state: nil, postcode: nil)
       @street   = street
       @city     = city
       @state    = state
@@ -45,7 +45,7 @@ module RelatonBib
     end
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       hash = {}
       hash["street"] = street if street&.any?
       hash["city"] = city
@@ -59,7 +59,7 @@ module RelatonBib
     # @param count [Integer] number of addresses
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize
-      pref = prefix.empty? ? "address" : prefix + ".address"
+      pref = prefix.empty? ? "address" : "#{prefix}.address"
       out = count > 1 ? "#{pref}::\n" : ""
       street.each { |st| out += "#{pref}.street:: #{st}\n" }
       out += "#{pref}.city:: #{city}\n"
@@ -99,7 +99,7 @@ module RelatonBib
     # @param count [Integer] number of contacts
     # @return [string]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = count > 1 ? "#{pref}contact::\n" : ""
       out += "#{pref}contact.type:: #{type}\n"
       out += "#{pref}contact.value:: #{value}\n"
@@ -156,7 +156,7 @@ module RelatonBib
     # @param count [Integer]
     # @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}affiliation::\n" : ""
       out += name.to_asciibib "#{pref}affiliation.name" if name
       description.each do |d|
@@ -206,7 +206,7 @@ module RelatonBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = ""
       out += "#{pref}url:: #{uri}\n" if uri
       addr = contact.select { |c| c.is_a? RelatonBib::Address }

data/lib/relaton_bib/organization.rb

@@ -39,7 +39,7 @@ module RelatonBib
     # @param count [Integer]
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = count > 1 ? "#{pref}identifier::\n" : ""
       out += "#{pref}identifier.type:: #{type}\n"
       out += "#{pref}identifier.value:: #{value}\n"
@@ -118,7 +118,7 @@ module RelatonBib
     # @param count [Integer]
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
-      pref = prefix.sub /\*$/, "organization"
+      pref = prefix.sub(/\*$/, "organization")
       out = count > 1 ? "#{pref}::\n" : ""
       name.each { |n| out += n.to_asciibib "#{pref}.name", name.size }
       out += abbreviation.to_asciibib "#{pref}.abbreviation" if abbreviation
@@ -136,10 +136,11 @@ module RelatonBib
     # @param arg [String, Hash, RelatoBib::LocalizedString]
     # @return [RelatoBib::LocalizedString]
     def localized_string(arg)
-      if arg.is_a?(String) then LocalizedString.new(arg)
-      elsif arg.is_a?(Hash)
+      case arg
+      when String then LocalizedString.new(arg)
+      when Hash
         LocalizedString.new(arg[:content], arg[:language], arg[:script])
-      elsif arg.is_a? LocalizedString then arg
+      when LocalizedString then arg
       end
     end
   end

data/lib/relaton_bib/series.rb

@@ -13,7 +13,7 @@ module RelatonBib
     # @return [RelatonBib::FormattedRef, NilClass]
     attr_reader :formattedref
 
-    # @return [RelatonBib::FormattedString, NilClass] title
+    # @return [RelatonBib::TypedTitleString, NilClass] title
     attr_reader :title
 
     # @return [String, NilClass]
@@ -39,10 +39,10 @@ module RelatonBib
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
-    # @param type [String, NilClass] title or formattedref argument should be
-    #   passed
+    # @param type [String, NilClass]
     # @param formattedref [RelatonBib::FormattedRef, NilClass]
-    # @param title [RelatonBib::TypedTitleString, NilClass]
+    # @param title [RelatonBib::TypedTitleString, NilClass] title or
+    #   formattedref argument should be passed
     # @param place [String, NilClass]
     # @param orgaization [String, NilClass]
     # @param abbreviation [RelatonBib::LocalizedString, NilClass]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.20".freeze
+  VERSION = "1.9.21".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.9.20
+  version: 1.9.21
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug