relaton-bib 1.9.7 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd2b1c32cf6112b7afbf78584182ca256e7f2404a60c74247da9c7aef1df7c0
-  data.tar.gz: b39864d2a0b19aaec7bf6d59a2122ca3374bc6eb11030c4c78dd4ba3dbf73ce3
+  metadata.gz: a3f1dc44ef7d2716e9dab35fdb81005962960fb608d388b2d556073758f3cf25
+  data.tar.gz: e31e80c8a248a626bf83bc85e0f3d781544e5461c65e805d1a8ff45025808caa
 SHA512:
-  metadata.gz: d392e4fb2558ccf8f3ac2d814061944cf7bb0bc94bb5afd17183146ec49082d54847bbb9ec9cefa0d98b1be0f487e46d6faed3989036930467645d424ef479fc
-  data.tar.gz: 970106fad0a8c7799351529c61070ec7a451f6c610b8f78620f282f6b174c184dd759bc740938c3b3eb84217256399f7080dcd5ebc184343b95e928808c458e6
+  metadata.gz: 90256a1674ec5311fd7fedb5d0822a5cb10bb9ecaf6c7f5865d74b9a28e6b4feaa969fae327610726720524010db1f1d290dbad48902a3b6e4a86e468542179f
+  data.tar.gz: 29cfeccc2388db9096b094274653800499a4a40a52b7102e9283e64030e921edd37a93ea8c70f92cd2056ac654a2e8b9a4184ca08a05863365f12fa6c15e6305

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
@@ -330,7 +331,7 @@ module RelatonBib
     #
     # @param [Nokogiri::XML::Builder, nil] builder
     #
-    # @return [String] <description>
+    # @return [String, Nokogiri::XML::Builder::NodeBuilder] XML
     #
     def to_bibxml(builder = nil)
       if builder
@@ -338,8 +339,8 @@ module RelatonBib
       else
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
           render_bibxml xml
-        end
-      end.doc.root.to_xml
+        end.doc.root.to_xml
+      end
     end
 
     # @return [Hash]
@@ -760,13 +761,40 @@ module RelatonBib
     # rubocop:enable Style/NestedParenthesizedCalls, Metrics/BlockLength
 
     #
-    # Render BibXML (RFC)
+    # Render BibXML (RFC, BCP)
     #
     # @param [Nokogiri::XML::Builder] builder
     #
     def render_bibxml(builder)
       target = link.detect { |l| l.type == "src" } || link.detect { |l| l.type == "doi" }
-      bxml = builder.reference(anchor: anchor) do |xml|
+      bxml = if docnumber&.match(/^BCP/) || docidentifier[0].id.include?("BCP")
+               render_bibxml_refgroup(builder)
+             else
+               render_bibxml_ref(builder)
+             end
+      bxml[:target] = target.content.to_s if target
+    end
+
+    #
+    # Render BibXML (BCP)
+    #
+    # @param [Nokogiri::XML::Builder] builder
+    #
+    def render_bibxml_refgroup(builder)
+      builder.referencegroup(anchor: anchor) do |b|
+        relation.each do |r|
+          r.bibitem.to_bibxml(b) if r.type == "includes"
+        end
+      end
+    end
+
+    #
+    # Render BibXML (RFC)
+    #
+    # @param [Nokogiri::XML::Builder] builder
+    #
+    def render_bibxml_ref(builder)
+      builder.reference(anchor: anchor) do |xml|
         xml.front do
           xml.title title[0].title.content if title.any?
           render_seriesinfo xml
@@ -777,7 +805,6 @@ module RelatonBib
           render_abstract xml
         end
       end
-      bxml[:target] = target.content.to_s if target
     end
 
     def anchor

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_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.7".freeze
+  VERSION = "1.9.11".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.7
+  version: 1.9.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug