relaton-bib 1.9.16 → 1.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2b24daf1fbc819c9ca59c5c38be90c9a644d79c3f73a9a3d6462b30955a22fb
-  data.tar.gz: 0d370baf6ac11940a43d417661b1d306d1134d110507d371745078ad4e98a57c
+  metadata.gz: b714ee74a9d4da85784bbcc2e7fb50c9548215c1399a799290646eb230529f2f
+  data.tar.gz: 75cf8abea4defed1d25cd241443ae6b8df03688a47e8cce4e907bab03315d978
 SHA512:
-  metadata.gz: e63d120ba07f6b82b3ccce826f152fab3c85414a777962fbc8fed3102c4e565971e23ca5eeabca54852b41dcd9eb2dfc14d09249e5fb5a417b93dad2d4f62484
-  data.tar.gz: b0ee4c21adbd9a68443752b4c34bfe6b27ebeab891e8be029ec7de30ab4f8a13b1bcb7c64f30ba47c1b65e47b22741fbe6b756792a2106e0ac029c17c760687d
+  metadata.gz: 50dd80e6be598a65d4ded5f35e047b7b32a1c9cdcdacdd0539d13e149533501f093e95bbb176b1a58f566274c16ec88b461d50c295daa9bb46c52a9c683bf949
+  data.tar.gz: 58ac55543ac1f21477ca3c1125c8d50ccd88aee77c1ab74c4aa374839549d289083827d3b54795cb35901fa26bf46b3a7f4fff46c7b86e8ee23043f05c18ba04

data/lib/relaton_bib/bibliographic_item.rb

@@ -766,8 +766,8 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder
     #
     def render_bibxml(builder)
-      target = link.detect { |l| l.type == "src" } ||
-        link.detect { |l| l.type == "doi" }
+      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)
              else
@@ -920,13 +920,22 @@ 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
 
@@ -935,8 +944,13 @@ module RelatonBib
     def render_organization(builder, org)
       return unless org
 
-      o = builder.organization org.name.first&.content
-      o[:abbrev] = org.abbreviation.content if org.abbreviation
+      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
+      o = builder.organization orgname
+      o[:abbrev] = ab if ab
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/relaton_bib/bibxml_parser.rb

@@ -2,6 +2,10 @@ module RelatonBib
   module BibXMLParser
     SERIESINFONAMES = ["DOI", "Internet-Draft"].freeze
     FLAVOR = nil
+    ORGNAMES = {
+      "IEEE" => "Istitute of Electrical and Electronics Engineers",
+      "W3C" => "World Wide Web Consortium",
+    }.freeze
 
     def parse(bibxml, url: nil, is_relation: false, ver: nil)
       doc = Nokogiri::XML bibxml
@@ -82,7 +86,7 @@ module RelatonBib
       type_match = id&.match(/^(3GPP|W3C|[A-Z]{2,})(?:\.(?=[A-Z])|(?=\d))/)
       type = self::FLAVOR || (type_match && type_match[1])
       if id
-        /^(?<pref>I-D|3GPP|W3C|[A-Z]{2,})\.?(?<num>.+)/ =~ id
+        /^(?<pref>I-D|3GPP|W3C|[A-Z]{2,})[._]?(?<num>.+)/ =~ id
         num.sub!(/^-?0+/, "") if %w[RFC BCP FYI STD].include?(pref)
         pid = pref ? "#{pref} #{num}" : id
         ret << DocumentIdentifier.new(type: type, id: pid)
@@ -209,7 +213,8 @@ module RelatonBib
       #   "front/author[not(@surname)][not(@fullname)]/organization",
       # ).map do |org|
       org = contrib.at("./organization")
-      { entity: new_org(org.text, org[:abbrev]), role: [contributor_role(contrib)] }
+      name = ORGNAMES[org.text] || org.text
+      { entity: new_org(name, org[:abbrev]), role: [contributor_role(contrib)] }
       # end
     end
 
@@ -307,7 +312,7 @@ module RelatonBib
     # @return [Array<RelatonBib::BibliographicDate>] published data.
     #
     def dates(reference)
-      return unless (date = reference.at "./front/date")
+      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"

data/lib/relaton_bib/document_identifier.rb

@@ -9,7 +9,7 @@ module RelatonBib
 
     # @param id [String]
     # @param type [String, NilClass]
-    # @param scoope [String, NilClass]
+    # @param scope [String, NilClass]
     def initialize(id:, type: nil, scope: nil)
       @id    = id
       @type  = type

data/lib/relaton_bib/document_relation.rb

@@ -36,7 +36,7 @@ module RelatonBib
     attr_reader :source_locality
 
     # @param type [String]
-    # @parma description [RelatonBib::FormattedString, NilClass]
+    # @param description [RelatonBib::FormattedString, NilClass]
     # @param bibitem [RelatonBib::BibliographicItem,
     #   RelatonIso::IsoBibliographicItem]
     # @param locality [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]

data/lib/relaton_bib/document_status.rb

@@ -68,7 +68,7 @@ module RelatonBib
       # @return [String, NilClass]
       attr_reader :abbreviation
 
-      # @parma value [String]
+      # @param value [String]
       # @param abbreviation [String, NilClass]
       def initialize(value:, abbreviation: nil)
         @value = value

data/lib/relaton_bib/localized_string.rb

@@ -56,10 +56,14 @@ module RelatonBib
       else
         builder.parent["language"] = language.join(",") if language&.any?
         builder.parent["script"]   = script.join(",") if script&.any?
-        builder.parent << content # .encode(xml: :text)
+        builder.parent << escaped_content # .encode(xml: :text)
       end
     end
 
+    def escaped_content
+      content.encode("UTF-8") # .gsub(/&/, "&amp;").gsub(/"/, "&quot;").gsub(/'/, "&apos;")
+    end
+
     # @return [Hash]
     def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       if content.is_a? String
@@ -77,7 +81,7 @@ module RelatonBib
     # @param count [Integer] number of elements
     # @return [String]
     def to_asciibib(prefix = "", count = 1, has_attrs = false) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       if content.is_a? String
         unless language&.any? || script&.any? || has_attrs
           return "#{prefix}:: #{content}\n"

data/lib/relaton_bib/structured_identifier.rb

@@ -70,17 +70,18 @@ module RelatonBib
 
     # rubocop:disable Metrics/MethodLength
 
-    # @param type [String, NilClass]
-    # @param agency [Array<String>]
-    # @parma class [Stirng, NilClass]
-    # @parma docnumber [String]
-    # @param partnumber [String, NilClass]
-    # @param edition [String, NilClass]
-    # @param version [String, NilClass]
-    # @param supplementtype [String, NilClass]
-    # @param supplementnumber [String, NilClass]
-    # @param language [String, NilClass]
-    # @param year [String, NilClass]
+    # @param docnumber [String]
+    # @param args [Hash]
+    # @option args [String, nil] :type
+    # @option args [Array<String>] :agency
+    # @option args [Stirng, nil] :class
+    # @option args [String, nil] :partnumber
+    # @option args [String, nil] :edition
+    # @option args [String, nil] :version
+    # @option args [String, nil] :supplementtype
+    # @option args [String, nil] :supplementnumber
+    # @option args [String, nil] :language
+    # @option args [String, nil] :year
     def initialize(docnumber:, **args)
       @type = args[:type]
       @agency = args[:agency]

data/lib/relaton_bib/typed_uri.rb

@@ -15,7 +15,7 @@ module RelatonBib
       @content = Addressable::URI.parse content if content
     end
 
-    # @parma url [String]
+    # @param url [String]
     def content=(url)
       @content = Addressable::URI.parse url
     end

data/lib/relaton_bib/version.rb

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

data/lib/relaton_bib/xml_parser.rb

@@ -11,7 +11,7 @@ module RelatonBib
           bib_item item_data(bibitem)
         else
           warn "[relaton-bib] WARNING: can't find bibitem or bibdata element "\
-          "in the XML"
+               "in the XML"
         end
       end
 
@@ -320,7 +320,8 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          FormattedString.new(content: a.children.to_s, language: a[:language],
+          c = a.children.to_s
+          FormattedString.new(content: c, language: a[:language],
                               script: a[:script], format: a[:format])
         end
       end

data/lib/relaton_bib.rb

@@ -42,10 +42,10 @@ module RelatonBib
   # @param array [Array]
   # @return [Array<String>, String]
   def single_element_array(array)
-    if array.size > 1
-      array.map { |e| e.is_a?(String) ? e : e.to_hash }
-    else
-      array.first.is_a?(String) ? array[0] : array.first&.to_hash
-    end
+    # if array.size > 1
+    array.map { |e| e.is_a?(String) ? e : e.to_hash }
+    # else
+    #   array.first.is_a?(String) ? array[0] : array.first&.to_hash
+    # end
   end
 end

data/relaton-bib.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "bibtex-ruby"
   spec.add_dependency "iso639"
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "~> 1.12.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.9.16
+  version: 1.9.20
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -182,16 +182,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.5
 description: 'RelatonBib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com