relaton-bib 1.9.6 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d616ee7971147c734b6e0520531c4e9b529e76b53c22a98dca1c36b6f49285
-  data.tar.gz: 2762c1d26b7a07888c3605939ae18de1b6f2ef44da7f1513dc779e3207ff176f
+  metadata.gz: 944fd26ef5c5b32d7a9a5023bc1c2291f6bfb772814c19bfd214dc951449186c
+  data.tar.gz: 0b168752f3e1c622cdcb04c24b7f8e0d492bea3617b0e8bbcb1e2e388717e3ce
 SHA512:
-  metadata.gz: beffce777ed3ef33181363edaf57a8e1efced984bcc19ffae88eaa8087a92e48d044b042686dc4b5e6e545f41fe7f67c1eb573abaddc4e056adc439643f0b12a
-  data.tar.gz: 44d2809601f70d17db2f5601a29614720fa13a0cfa3fbb1665406e0c4396390862688fc41cbd26de421e19efb5643a61e184b73bf2cb47be567c7aa4788ad4a4
+  metadata.gz: 6a0ee9af618a698c0ff2552185f4520e1bb37023ee0b51d5c8757a1a9b490631b589d5da49203cd099460d1807f1e1f2e71a85eb0cda25841e17cc9fecbcc124
+  data.tar.gz: f4f8cdc21e0320d29f5c40d7732fbb9af3fea8fd3c3db4b841895f8c316eaa88ce5e3033038f05b7e278f1fd31501f0a9e75b26e79ccab55137619b19dc47660

data/.rubocop.yml

@@ -2,6 +2,8 @@
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
 
+require: rubocop-rails
+
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:

data/lib/relaton_bib/bibliographic_item.rb

@@ -159,10 +159,11 @@ module RelatonBib
     # @option copyright [String, NilClass] :to
     # @option copyright [String, NilClass] :scope
     #
-    # @param date [Array<Hash>]
+    # @param date [Array<Hash, RelatonBib::BibliographicDate>]
     # @option date [String] :type
-    # @option date [String] :from
-    # @option date [String] :to
+    # @option date [String, nil] :from required if :on is nil
+    # @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]
@@ -176,7 +177,7 @@ module RelatonBib
     # @option abstract [String] :content
     # @option abstract [String] :language
     # @option abstract [String] :script
-    # @option abstract [String] :type
+    # @option abstract [String] :format
     #
     # @param relation [Array<Hash>]
     # @option relation [String] :type
@@ -828,10 +829,11 @@ module RelatonBib
           builder.seriesInfo(name: di.type, value: di.id)
         end
       end
-      snames = ["ANSI", "BCP", "RFC", "STD"]
-      series.each do |s|
-        next unless s.title && snames.include?(s.title.title.to_s)
-
+      di_types = docidentifier.map(&:type)
+      series.select do |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)
         si[:value] = s.number if s.number
       end

data/lib/relaton_bib/bibxml_parser.rb

@@ -67,11 +67,12 @@ module RelatonBib
     #
     def docids(reference, ver) # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
       ret = []
-      sfid = reference.at("./seriesInfo[@name='#{self::FLAVOR}']", "./front/seriesInfo[@name='#{self::FLAVOR}']")
+      sfid = reference.at("./seriesInfo[@name='#{self::FLAVOR}']",
+                          "./front/seriesInfo[@name='#{self::FLAVOR}']")
       if sfid
         ret << DocumentIdentifier.new(type: sfid[:name], id: sfid[:value])
       elsif self::FLAVOR && (id = (reference[:anchor] || reference[:docName] || reference[:number]))
-        ret << DocumentIdentifier.new( type: self::FLAVOR, id: id.sub(/^(RFC)/, "\\1 "))
+        ret << DocumentIdentifier.new(type: self::FLAVOR, id: id.sub(/^(RFC)/, "\\1 "))
       end
       if (id = reference[:anchor])
         ret << DocumentIdentifier.new(type: "rfc-anchor", id: id)
@@ -138,10 +139,9 @@ module RelatonBib
     # @return [Array<RelatonBib::FormattedString>]
     def abstracts(ref)
       ref.xpath("./front/abstract").map do |a|
-        FormattedString.new(
-          content: a.children.to_s.gsub(/(<\/?)t(>)/, '\1p\2'),
-          language: language(ref), script: "Latn", format: "text/html"
-        )
+        c = a.children.to_s.gsub(/\s*(<\/?)t(>)\s*/, '\1p\2').gsub(/\n/, "").squeeze " "
+        FormattedString.new(content: c, language: language(ref), script: "Latn",
+                            format: "text/html")
       end
     end
 
@@ -288,6 +288,8 @@ module RelatonBib
       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
+      []
     end
 
     # @param reference [Nokogiri::XML::Element]

data/lib/relaton_bib/contribution_info.rb

@@ -82,6 +82,8 @@ module RelatonBib
 
     # @param entity [RelatonBib::Person, RelatonBib::Organization]
     # @param role [Array<Hash>]
+    # @option role [String] :type
+    # @option role [Array<String>] :description
     def initialize(entity:, role: [])
       if role.empty?
         role << { type: entity.is_a?(Person) ? "author" : "publisher" }
@@ -94,7 +96,7 @@ module RelatonBib
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [String, Symbol] :lang language
     def to_xml(**opts)
-      entity.to_xml **opts
+      entity.to_xml(**opts)
     end
 
     # @return [Hash]

data/lib/relaton_bib/editorial_group.rb

@@ -35,7 +35,7 @@ module RelatonBib
 
     # @return [true]
     def presence?
-      true
+      technical_committee.any?
     end
   end
 end

data/lib/relaton_bib/person.rb

@@ -189,8 +189,8 @@ module RelatonBib
     # @option opts [String, Symbol] :lang language
     def to_xml(**opts)
       opts[:builder].person do |builder|
-        name.to_xml **opts
-        affiliation.each { |a| a.to_xml **opts }
+        name.to_xml(**opts)
+        affiliation.each { |a| a.to_xml(**opts) }
         identifier.each { |id| id.to_xml builder }
         contact.each { |contact| contact.to_xml builder }
       end
@@ -210,7 +210,7 @@ module RelatonBib
     # @count [Integer] number of persons
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize
-      pref = prefix.sub /\*$/, "person"
+      pref = prefix.sub(/\*$/, "person")
       out = count > 1 ? "#{pref}::\n" : ""
       out += name.to_asciibib pref
       affiliation.each { |af| out += af.to_asciibib pref, affiliation.size }

data/lib/relaton_bib/typed_title_string.rb

@@ -72,6 +72,8 @@ module RelatonBib
   end
 
   class TypedTitleString
+    ARGS = %i[content language script format].freeze
+
     # @return [String]
     attr_reader :type
 
@@ -93,9 +95,7 @@ module RelatonBib
       if args[:title]
         @title = args[:title]
       else
-        fsargs = args.select do |k, _v|
-          %i[content language script format].include? k
-        end
+        fsargs = args.select { |k, _v| ARGS.include? k }
         @title = FormattedString.new(**fsargs)
       end
     end

data/lib/relaton_bib/typed_uri.rb

@@ -5,7 +5,7 @@ module RelatonBib
   class TypedUri
     # @return [Symbol] :src/:obp/:rss
     attr_reader :type
-    # @retutn [URI]
+    # @retutn [Addressable::URI]
     attr_reader :content
 
     # @param type [String, NilClass] src/obp/rss
@@ -37,7 +37,7 @@ module RelatonBib
     # @param count [Integer] number of links
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? "link" : prefix + ".link"
+      pref = prefix.empty? ? "link" : "#{prefix}.link"
       out = count > 1 ? "#{pref}::\n" : ""
       out += "#{pref}.type:: #{type}\n" if type
       out += "#{pref}.content:: #{content}\n"

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.6".freeze
+  VERSION = "1.9.10".freeze
 end

data/lib/relaton_bib.rb

@@ -14,9 +14,9 @@ module RelatonBib
   class RequestError < StandardError; end
 
   class << self
-    # @param date [String, Integer, Date]
-    # @param str [Boolean]
-    # @return [Date, nil]
+    # @param date [String, Integer, Date] date
+    # @param str [Boolean] return string or Date
+    # @return [Date, String, nil] date
     def parse_date(date, str = true) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/AbcSize
       return date if date.is_a?(Date)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug