relaton-bib 1.9.19 → 1.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcf7272c206af7f7206cc3886a744db7a1c0084d1f999164f7971829c16e640e
-  data.tar.gz: c5260c213ab4542c98e5df926bb638451345fded8b7ebaa76897212aab9bb7c5
+  metadata.gz: 69ae43ef45d31008eb5fcfb3939335a6ecb7731a198c7fb944ff671a018180c2
+  data.tar.gz: 82154362500a3a1476efd7415ccc37e2a9f8a878b889b2562b51024f8d691884
 SHA512:
-  metadata.gz: 5a60302d3043fdac1e1ca6b1ebfbd7244b2788a266d5c6392f1279797f4e4c6fc7f3a951cc05b79bf24c7f2bfc7267bf1d1740ddfefe8534a54156233bb1664a
-  data.tar.gz: c5f46067ab37b963dee5c04fa9294a9e3522906ae011af2397eb18f88b0c48d37b0727eb44ca78dd17ba77e493a4246a8feef4c338ae68564a320e1cd148c0bf
+  metadata.gz: d151df39d087c6dfd66d50eeede28c8b14c3d4551197122f955000611f958fe89b7caa36c05730b77f34e5729ed4838d3d1cb52f85f53169babf624c5ac56c38
+  data.tar.gz: 2f0a0f3bf334cd1204eaafe55d90ce4825f6eeed884730f44ae4956ecb43a6bca9356bb27af473b421fb4a4a4ab4ad565721c0ced92f0e7b5b40b5b4a0104a49

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
@@ -330,15 +330,16 @@ module RelatonBib
     # Render BibXML (RFC)
     #
     # @param [Nokogiri::XML::Builder, nil] builder
+    # @param [Boolean] include_keywords (false)
     #
     # @return [String, Nokogiri::XML::Builder::NodeBuilder] XML
     #
-    def to_bibxml(builder = nil)
+    def to_bibxml(builder = nil, include_keywords: false)
       if builder
-        render_bibxml builder
+        render_bibxml builder, include_keywords
       else
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
-          render_bibxml xml
+          render_bibxml xml, include_keywords
         end.doc.root.to_xml
       end
     end
@@ -764,14 +765,15 @@ module RelatonBib
     # Render BibXML (RFC, BCP)
     #
     # @param [Nokogiri::XML::Builder] builder
+    # @param [Boolean] include_bibdata
     #
-    def render_bibxml(builder)
-      target = link.detect { |l| l.type == "src" } ||
-        link.detect { |l| l.type == "doi" }
+    def render_bibxml(builder, include_keywords)
+      target = link.detect { |l| l.type.casecmp("src").zero? } ||
+        link.detect { |l| l.type.casecmp("doi").zero? }
       bxml = if docnumber&.match(/^BCP/) || docidentifier[0].id.include?("BCP")
-               render_bibxml_refgroup(builder)
+               render_bibxml_refgroup(builder, include_keywords)
              else
-               render_bibxml_ref(builder)
+               render_bibxml_ref(builder, include_keywords)
              end
       bxml[:target] = target.content.to_s if target
     end
@@ -780,11 +782,12 @@ module RelatonBib
     # Render BibXML (BCP)
     #
     # @param [Nokogiri::XML::Builder] builder
+    # @param [Boolean] include_keywords
     #
-    def render_bibxml_refgroup(builder)
+    def render_bibxml_refgroup(builder, include_keywords)
       builder.referencegroup(**ref_attrs) do |b|
         relation.each do |r|
-          r.bibitem.to_bibxml(b) if r.type == "includes"
+          r.bibitem.to_bibxml(b, include_keywords: include_keywords) if r.type == "includes"
         end
       end
     end
@@ -793,18 +796,19 @@ module RelatonBib
     # Render BibXML (RFC)
     #
     # @param [Nokogiri::XML::Builder] builder
+    # @param [Boolean] include_keywords
     #
-    def render_bibxml_ref(builder)
+    def render_bibxml_ref(builder, include_keywords)
       builder.reference(**ref_attrs) do |xml|
         xml.front do
           xml.title title[0].title.content if title.any?
-          render_seriesinfo xml
           render_authors xml
           render_date xml
           render_workgroup xml
-          render_keyword xml
+          render_keyword xml if include_keywords
           render_abstract xml
         end
+        render_seriesinfo xml
       end
     end
 
@@ -849,8 +853,11 @@ module RelatonBib
       elm[:year] = y if y
       m = dt.on(:month) || dt.from(:month) || dt.to(:month)
       elm[:month] = Date::MONTHNAMES[m] if m
+      # rfcs = %w[RFC BCP FYI STD]
+      # unless rfcs.include?(doctype) && docidentifier.detect { |di| rfcs.include? di.type }
       d = dt.on(:day) || dt.from(:day) || dt.to(:day)
       elm[:day] = d if d
+      # end
     end
 
     # @param [Nokogiri::XML::Builder] builder
@@ -860,9 +867,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)
@@ -920,23 +927,32 @@ module RelatonBib
     def render_person(builder, person)
       render_organization builder, person.affiliation.first&.organization
       if person.name.completename
-        builder.parent[:fullname] = person.name.completename
+        builder.parent[:fullname] = person.name.completename.content
+      elsif person.name.forename.any?
+        builder.parent[:fullname] = person.name.forename.map(&:content).join
       end
       if person.name.initial.any?
         builder.parent[:initials] = person.name.initial.map(&:content).join
+      elsif person.name.forename.any?
+        builder.parent[:initials] = person.name.forename.map do |f|
+          "#{f.content[0]}."
+        end.join
       end
       if person.name.surname
-        builder.parent[:surname] = person.name.surname
+        if person.name.forename.any?
+          builder.parent[:fullname] += " #{person.name.surname}"
+        end
+        builder.parent[:surname] = person.name.surname.content
       end
     end
 
     # @param [Nokogiri::XML::Builder] builder
     # @param [RelatonBib::Organization] org
     def render_organization(builder, org)
-      return unless org
+      # return unless org
 
-      ab = org.abbreviation&.content
-      on = org.name.first&.content
+      ab = org&.abbreviation&.content
+      on = org&.name&.first&.content
       orgname = if BibXMLParser::ORGNAMES.key?(ab) then ab
                 else BibXMLParser::ORGNAMES.key(on) || on || ab
                 end

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",
@@ -312,13 +315,15 @@ module RelatonBib
     # @return [Array<RelatonBib::BibliographicDate>] published data.
     #
     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
-      []
+      return [] unless (date = reference.at "./front/date")
+
+      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.19".freeze
+  VERSION = "1.9.23".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -238,11 +238,12 @@ module RelatonBib
           OrgIdentifier.new(i[:type], i.text)
         end
         subdiv = org.xpath("subdivision").map &:text
-        Organization.new(name: names,
-                         abbreviation: org.at("abbreviation")&.text,
-                         subdivision: subdiv,
-                         url: org.at("uri")&.text,
-                         identifier: identifier)
+        contact = parse_contact org
+        Organization.new(
+          name: names, abbreviation: org.at("abbreviation")&.text,
+          subdivision: subdiv, # url: org.at("uri")&.text,
+          identifier: identifier, contact: contact
+        )
       end
 
       def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
@@ -255,21 +256,7 @@ module RelatonBib
           Affiliation.new organization: get_org(org), description: desc
         end
 
-        contact = person.xpath("./address|./phone|./email|./uri").map do |c|
-          if c.name == "address"
-            streets = c.xpath("./street").map(&:text)
-            Address.new(
-              street: streets,
-              city: c.at("./city")&.text,
-              state: c.at("./state")&.text,
-              country: c.at("./country")&.text,
-              postcode: c.at("./postcode")&.text,
-            )
-          else
-            Contact.new(type: c.name, value: c.text)
-          end
-        end
-
+        contact = parse_contact person
         identifier = person.xpath("./identifier").map do |pi|
           PersonIdentifier.new pi[:type], pi.text
         end
@@ -295,6 +282,23 @@ module RelatonBib
         )
       end
 
+      def parse_contact(contrib) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength,Metrics/AbcSize
+        contrib.xpath("./address|./phone|./email|./uri").map do |c|
+          if c.name == "address"
+            streets = c.xpath("./street").map(&:text)
+            Address.new(
+              street: streets,
+              city: c.at("./city")&.text,
+              state: c.at("./state")&.text,
+              country: c.at("./country")&.text,
+              postcode: c.at("./postcode")&.text,
+            )
+          else
+            Contact.new(type: c.name, value: c.text)
+          end
+        end
+      end
+
       def name_part(person, part)
         person.xpath("./name/#{part}").map do |np|
           LocalizedString.new np.text, np[:language], np[:script]

metadata

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