relaton-bib 1.13.10 → 1.13.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b689b96d8bc90ca647a1e11528aea5b02ae148d5a2b319a44f5739567312dc61
-  data.tar.gz: aafa8e3c0c37a5d1719b69bd9fdef15060176408790c9f742d8c48a209781391
+  metadata.gz: f6ddb62c2750bc1f862980dfbe3c66e6e97db50b00550c794e1a9366265854e2
+  data.tar.gz: b170e48789567d8b97cb8f969a3afa6785e52ff5e0883a34f80ff09e52884cda
 SHA512:
-  metadata.gz: 4a39467d46ffcb67009b4c1e048ef6b11fcfec9c45db3c570b4759600bb920da2bb9060dc0e6c32f313c96fb2e66720cc7c7cdb93ad587542547af4da4b9631b
-  data.tar.gz: c1cfb779ede8f36cb8502fea7a074cbb8e530c41df10b6d827175dec6392810be15ebbd37bfda667250541a5f2571dbb4ab8aea2419af0b99914bf182b887a39
+  metadata.gz: 3a6125762169389c71b9c51ebc27e5a180d66281e5e634584167b3d210b129ae4771a4c624e12b4a90e4318da0278a4e6279e2926298a6026d549b69fe5b3497
+  data.tar.gz: 2fa41a845a293c0e8cc6ab5bd4720906b59290a700349c03a6af4d705610ddb9d4b115d8726d7de634f8421b569d8091a8e6c05530747f5f0fa79552cc56fe23

data/lib/relaton_bib/bibliographic_item.rb

@@ -35,12 +35,12 @@ module RelatonBib
   class BibliographicItem
     include RelatonBib
 
-    TYPES = %W[article book booklet conference manual proceedings presentation
+    TYPES = %W[article book booklet manual proceedings presentation
                thesis techreport standard unpublished map electronic\sresource
-               audiovisual film video broadcast graphic_work music patent
-               inbook incollection inproceedings journal software website
+               audiovisual film video broadcast software graphic_work music
+               patent inbook incollection inproceedings journal website
                webresource dataset archival social_media alert message
-               conversation misc].freeze
+               conversation misc internal].freeze
 
     # @return [Boolean, nil]
     attr_accessor :all_parts
@@ -204,7 +204,7 @@ module RelatonBib
     # @option link [String] :content
     def initialize(**args)
       if args[:type] && !TYPES.include?(args[:type])
-        warn %{[relaton-bib] document type "#{args[:type]}" is invalid.}
+        warn %{[relaton-bib] WARNING: type "#{args[:type]}" is invalid.}
       end
 
       @title = if args[:title].is_a?(TypedTitleStringCollection)

data/lib/relaton_bib/bibxml_parser.rb

@@ -12,11 +12,6 @@ module RelatonBib
       "3GPP" => "3rd Generation Partnership Project",
     }.freeze
 
-    FULLNAMEORG = [
-      "IAB", "Internet Architecture Board", "IAB and IESG", "IESG",
-      "IAB Advisory Committee", "Internet Engineering Steering Group"
-    ].freeze
-
     #
     # Parse BibXML content
     #
@@ -219,63 +214,47 @@ module RelatonBib
     # @param reference [Nokogiri::XML::Element]
     # @return [Array<Hash>]
     def contributors(reference)
+      lang = language reference
       reference.xpath("./front/author").map do |contrib|
-        full_name_org(contrib) || person(contrib, reference) || organization(contrib)
-      end.compact
-    end
+        entity = person(contrib, lang) || organization(contrib)
+        next unless entity
 
-    #
-    # Parse organization from author element
-    #
-    # @param [Nokogiri::XML::Element] contrib author element
-    #
-    # @return [Hash] contribution info
-    #
-    def full_name_org(contrib)
-      return unless self::FULLNAMEORG.include? contrib[:fullname]
-
-      role = contributor_role(contrib)
-      # role[:description] = ["BibXML author"]
-      { entity: new_org(contrib[:fullname]), role: [role] }
+        { entity: entity, role: [contributor_role(contrib)] }
+      end.compact
     end
 
     # @param author [Nokogiri::XML::Element]
-    # @param reference [Nokogiri::XML::Element]
-    # @return [Array<Hash{Symbol=>RelatonBib::Person,Symbol=>Array<String>}>]
-    def person(author, reference)
+    # @param lang [String]
+    # @return [RelatonBib::Person, nil]
+    def person(author, lang)
       return unless author[:fullname] || author[:surname]
 
-      entity = Person.new(
-        name: full_name(author, reference),
-        affiliation: affiliation(author),
-        contact: contacts(author.at("./address")),
-      )
-      { entity: entity, role: [contributor_role(author)] }
+      name = full_name(author[:fullname], author[:surname], author[:initials], lang)
+      Person.new(name: name, affiliation: affiliation(author),
+                 contact: contacts(author.at("./address")))
     end
 
     # @param contrib [Nokogiri::XML::Element]
-    # @return [Array<Hash{Symbol=>RelatonBib::Organization,
-    #   Symbol=>Array<String>}>]
+    # @return [RelatonBib::Organization, nil]
     def organization(contrib)
       org = contrib.at("./organization")
       orgname = org.text.strip
       return if orgname.empty?
 
       name = ORGNAMES[orgname] || orgname
-      { entity: new_org(name, org[:abbrev]), role: [contributor_role(contrib)] }
-      # end
+      new_org name, org[:abbrev]
     end
 
-    # @param author [Nokogiri::XML::Element]
-    # @param reference [Nokogiri::XML::Element]
+    # @param fname [String] full name
+    # @param sname [String] surname
+    # @param inits [String] initials
+    # @param lang [String] language
     # @return [RelatonBib::FullName]
-    def full_name(author, reference)
-      lang = language reference
-      initials = localized_string(author[:initials], lang) if author[:initials]
+    def full_name(fname, sname, inits, lang)
+      initials = localized_string(inits, lang) if inits
       FullName.new(
-        completename: localized_string(author[:fullname], lang),
-        initials: initials, forename: forename(author[:initials], lang),
-        surname: localized_string(author[:surname], lang)
+        completename: localized_string(fname, lang), initials: initials,
+        forename: forename(inits, lang), surname: localized_string(sname, lang)
       )
     end
 
@@ -287,11 +266,11 @@ module RelatonBib
     #
     # @return [Array<RelatonBib::Forename>] forenames
     #
-    def forename(initials, lang)
+    def forename(initials, lang = nil, script = nil)
       return [] unless initials
 
       initials.split(/\.-?\s?|\s/).map do |i|
-        Forename.new(initial: i, language: lang)
+        Forename.new(initial: i, language: lang, script: script)
       end
     end
 
@@ -314,9 +293,10 @@ module RelatonBib
 
     # @param content [String, nil]
     # @param lang [String, nil]
+    # @param script [String, nil]
     # @return [RelatonBib::LocalizedString, nil]
-    def localized_string(content, lang)
-      LocalizedString.new(content, lang) if content
+    def localized_string(content, lang, script = nil)
+      LocalizedString.new(content, lang, script) if content
     end
 
     # @param postal [Nokogiri::XML::Element]

data/lib/relaton_bib/contribution_info.rb

@@ -46,13 +46,10 @@ module RelatonBib
 
     # @return [Hash, String]
     def to_hash
-      if description&.any?
-        hash = { "description" => single_element_array(description) }
-        hash["type"] = type if type
-        hash
-      elsif type
-        type
-      end
+      hash = {}
+      hash["description"] = description.map(&:to_hash) if description&.any?
+      hash["type"] = type if type
+      hash
     end
 
     # @param prefix [String]

data/lib/relaton_bib/copyright_association.rb

@@ -6,10 +6,10 @@ module RelatonBib
     # @return [Date]
     attr_reader :from
 
-    # @return [Date, NilClass]
+    # @return [Date, nil]
     attr_reader :to
 
-    # @return [String, NilClass]
+    # @return [String, nil]
     attr_reader :scope
 
     # @return [Array<RelatonBib::ContributionInfo>]
@@ -22,8 +22,8 @@ module RelatonBib
     # @option owner [String] :abbreviation
     # @option owner [String] :url
     # @param from [String] date
-    # @param to [String, NilClass] date
-    # @param scope [String, NilClass]
+    # @param to [String, nil] date
+    # @param scope [String, nil]
     def initialize(owner:, from:, to: nil, scope: nil)
       unless owner.any?
         raise ArgumentError, "at least one owner should exist."
@@ -67,7 +67,7 @@ module RelatonBib
     # @param count [Iteger] number of copyright elements
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-      pref = prefix.empty? ? "copyright" : prefix + ".copyright"
+      pref = prefix.empty? ? "copyright" : "#{prefix}.copyright"
       out = count > 1 ? "#{pref}::\n" : ""
       owner.each { |ow| out += ow.to_asciibib "#{pref}.owner", owner.size }
       out += "#{pref}.from:: #{from.year}\n" if from

data/lib/relaton_bib/forename.rb

@@ -37,13 +37,9 @@ module RelatonBib
     #
     def to_hash
       ls = super
-      # if initial
       hash = ls.is_a?(Hash) ? ls : { "content" => ls }
       hash["initial"] = initial if initial
       hash
-      # else
-      #   ls
-      # end
     end
 
     #

data/lib/relaton_bib/localized_string.rb

@@ -92,7 +92,7 @@ module RelatonBib
       HTMLEntities.new.encode str.dup.force_encoding("UTF-8")
     end
 
-    # @return [Hash]
+    # @return [Hash, Array<Hash>]
     def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       if content.nil? || content.is_a?(String)
         # return content unless language || script

data/lib/relaton_bib/organization.rb

@@ -52,7 +52,7 @@ module RelatonBib
     # @return [Array<RelatonBib::LocalizedString>]
     attr_reader :name
 
-    # @return [RelatonBib::LocalizedString, NilClass]
+    # @return [RelatonBib::LocalizedString, nil]
     attr_reader :abbreviation
 
     # @return [Array<RelatonBib::LocalizedString>]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.10".freeze
+  VERSION = "1.13.12".freeze
 end

metadata

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