relaton-nist 1.12.4 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a08c33ae20e118a973b19b9697114dd4be09331bc3322a3d75250959c4cb0880
-  data.tar.gz: 1066aab4db2167b2551fd59a76248a96bbcfddbbcc11e0894cb16d91af0fe69c
+  metadata.gz: 4c73a4a75166a362d34e2d1a4bec088d74863cf1ac9a4eee0798cfa84cbceca6
+  data.tar.gz: 398bd9b074c7c10da66c86047e617e7b643ea6cc3e45f1daa6fdd6f43d38bb4c
 SHA512:
-  metadata.gz: e0b46445fda68e042630f4eccfc925a317dbe22a3331fe5ef86eebcceb7a036134bedba1a2b6679987d4a2b727ee2590887d52a26c014adbbd27b382b70b2adc
-  data.tar.gz: cdc10291398c3f037a00f7a2b013f3a159ed1b8803a0d401522cfb4df0119036cd7b1a9cbfb28ebdf05819a4f365fd4bc0d284fc3031ef34311418e279e35eba
+  metadata.gz: 7695197e53d2d8b8b2048f034c6d47db2ce293f7f8dedafacefae8efb4ad85ed96169f5b317957a228b32bfa1e9a8899b80238aa8be594edd94e89619c9fbb51
+  data.tar.gz: 1b2eb51d32d0b0eb9456242e5727b891468509a55cdc2ce2251fa84857b83d6d29966bb3799557672da7cabc126949f0cc18d6581cb9464caa38293a317a7265

data/lib/relaton_nist/data_fetcher.rb

@@ -137,26 +137,10 @@ module RelatonNist
 
     # @param doc [Nokogiri::XML::Element]
     # @return [Array<Hash>]
-    def fetch_contributor(doc) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def fetch_contributor(doc)
       contribs = doc.xpath("contributors/person_name").map do |p|
-        forename = []
-        initial = []
-        p.at("given_name")&.text&.split&.each do |fn|
-          if /^(?<init>\w)\.?$/ =~ fn
-            initial << RelatonBib::LocalizedString.new(init, doc["language"], "Latn")
-          else
-            forename << RelatonBib::LocalizedString.new(fn, doc["language"], "Latn")
-          end
-        end
-        sname = p.at("surname").text
-        surname = RelatonBib::LocalizedString.new sname, doc["language"], "Latn"
-        ident = p.xpath("ORCID").map do |id|
-          RelatonBib::PersonIdentifier.new "orcid", id.text
-        end
-        fullname = RelatonBib::FullName.new(
-          surname: surname, forename: forename, initial: initial, identifier: ident,
-        )
-        person = RelatonBib::Person.new name: fullname, affiliation: affiliation(doc)
+        person = RelatonBib::Person.new(name: fullname(p, doc),
+                                        affiliation: affiliation(doc))
         { entity: person, role: [{ type: p["contributor_role"] }] }
       end
       contribs + doc.xpath("publisher").map do |p|
@@ -164,6 +148,57 @@ module RelatonNist
       end
     end
 
+    #
+    # Create full name object from person name element.
+    #
+    # @param [Nokogiri::XML::Element] person name element
+    # @param [Nokogiri::XML::Element] doc document element
+    #
+    # @return [RelatonBib::FullName] full name object
+    #
+    def fullname(person, doc)
+      forename, initial = forename_initial(person, doc)
+      surname = localized_string person.at("surname").text, doc
+      ident = person.xpath("ORCID").map do |id|
+        RelatonBib::PersonIdentifier.new "orcid", id.text
+      end
+      RelatonBib::FullName.new(surname: surname, forename: forename,
+                               initial: initial, identifier: ident)
+    end
+
+    #
+    # Create forename and initials objects from person name element.
+    #
+    # @param [Nokogiri::XML::Element] person person name element
+    # @param [Nokogiri::XML::Element] doc document element
+    #
+    # @return [Array<Array<RelatonBib::LocalizedString>>] forename and initials
+    #
+    def forename_initial(person, doc)
+      forename = []
+      initial = []
+      fname = person.at("given_name")&.text
+      if fname
+        if /^(?<inits>(?:\w[.\s]+|[A-Z]{1,2}$)+)$/ =~ fname
+          inits.split(/[.\s]*/).each { |i| initial << localized_string(i, doc) }
+        else forename << localized_string(fname, doc)
+        end
+      end
+      [forename, initial]
+    end
+
+    #
+    # Create localized string
+    #
+    # @param [String] content content of string
+    # @param [Nokogiri::XML::Elemrnt] doc XML element
+    #
+    # @return [RelatonBib::LocalizedString] localized string
+    #
+    def localized_string(content, doc)
+      RelatonBib::LocalizedString.new content, doc["language"], "Latn"
+    end
+
     #
     # Create publisher organization
     #

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.12.4".freeze
+  VERSION = "1.12.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml