relaton-bib 1.9.21 → 1.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb3b3d66701b4722151be5191a2eabfb1bc1e00453051e1a903e2af8c2b30b2
-  data.tar.gz: eca150d7708507187a93e6cff06eda12cfeef54dc1a6ac93d8244c0db6accdaa
+  metadata.gz: d003dbfecade683b1474dfc3923c2210997574d956f3c96ef0b7b0f113100d66
+  data.tar.gz: 6829735611e2ad3807ecb8014b6dddc115f8a2b8799328a11a7b7a229174a49c
 SHA512:
-  metadata.gz: 7f390c1e5e802966bc00002bf54bd1d246b45fc293188dc829940d90c32bc89db6b4e49e2ef4de14c13751c6ac6cff9692d23e558c1fe929815523f99de2a680
-  data.tar.gz: 404f08acad50390f9e63af5a3a30685eb7d50a085e6d98d8730277062b644f38ac5f3ab75c959a25523457bed001ef6a7f8d6dd063b5d227319a0e651936f379
+  metadata.gz: fbb7e6611505b14b7b321893dd4c1941e91b0d52cd2de4ea4f6fe083e1e2378c6f8c34a6fe3c39bb9d028ee81e5548ba435a893483c6e42e16f01030dd230eaa
+  data.tar.gz: 01aef015aefc3a321442118ccafd9ae310e9fccab9f57bce7d4e3e2c8c0abf70b9b5d4a1ad3877866daabc2054f572fec72be93311e7d66446c77f119b4ce781

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.21".freeze
+  VERSION = "1.9.22".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.21
+  version: 1.9.22
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug