relaton-bib 1.13.9 → 1.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d370dad5e6a20ef5eaaed6633e0d62d80c0087f8a24d205dcb02723c025b35
-  data.tar.gz: 7ef8d3f6530096ed1e15bc66f148a3972490e39ba3c51bfc894a31cab8195d4f
+  metadata.gz: 73b4305723e6d28afdb0f4dc7b5037abd284b3cf495704c89ee9be2ff16421eb
+  data.tar.gz: a7da23375b0d336259e602a24bc807e5f64f9d07a3b6d090d0d9c2e7ca7e28f5
 SHA512:
-  metadata.gz: 305a89bc3529accd1087f9e7928172bacf6acb4672fa0215ee1b27406cca08cda484470227625c94928f5be4ac0766cd0b13b43059c0328b3f9d0ba03f6ad0af
-  data.tar.gz: 44e3711a83e329cba17baabbaacecc03736eef8c20857aac71c760bcfd7289071b1d2a60b70d0d9710d132c02c0607c0ad234522ee280b6867f1bf7fba69bed1
+  metadata.gz: c2c7c852ceac5da96237e9de8346269ad7ca3b8a8984915efac66df93507dbb7a16b8652ae84628019195d657a16dfc9c94d472b36c6bb8fd8efc05f1e614cac
+  data.tar.gz: cc5f8ba67a8d9c9563674c1e90f662c05feb82453ed939ea1f47a82ee2abc3887958119345f402918ca91f3ac5b6dfe829507f52ad65e955ef038cc3f23d7aff

data/lib/relaton_bib/bibliographic_item.rb

@@ -35,10 +35,10 @@ 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
 
@@ -1039,18 +1039,18 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder xml builder
     # @param [RelatonBib::Organization] org organization
     #
-    def render_organization(builder, org, role = []) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/AbcSize
-      ab = org&.abbreviation&.content
-      on = org&.name&.first&.content
-      orgname = if BibXMLParser::ORGNAMES.key?(ab) then ab
-                else BibXMLParser::ORGNAMES.key(on) || on || ab
+    def render_organization(builder, org, _role = []) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/AbcSize
+      abbrev = org&.abbreviation&.content
+      orgname = org&.name&.first&.content
+      orgname = if BibXMLParser::ORGNAMES.key?(abbrev) then abbrev
+                else BibXMLParser::ORGNAMES.key(orgname) || orgname || abbrev
                 end
-      if role.detect { |r| r.description.detect { |d| d.content == "BibXML author" } }
-        builder.parent[:fullname] = orgname
-      else
-        o = builder.organization orgname
-        o[:abbrev] = ab if ab
-      end
+      # if role.detect { |r| r.description.detect { |d| d.content == "BibXML author" } }
+      #   builder.parent[:fullname] = orgname
+      # else
+      org = builder.organization orgname
+      org[:abbrev] = abbrev if abbrev
+      # end
     end
   end
 end

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,64 +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 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)] }
-      # end
+      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
 
@@ -288,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
 
@@ -315,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/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/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.13.9".freeze
+  VERSION = "1.13.11".freeze
 end

metadata

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