lib/isodoc/metadata_contributor.rb in isodoc-1.6.4 vs lib/isodoc/metadata_contributor.rb in isodoc-1.6.5

@@ -1,29 +1,32 @@
 module IsoDoc
   class Metadata
     def extract_person_names(authors)
       authors.reduce([]) do |ret, a|
-        if a.at(ns('./name/completename'))
-          ret << a.at(ns('./name/completename')).text
+        if a.at(ns("./name/completename"))
+          ret << a.at(ns("./name/completename")).text
         else
-          fn = []
-          forenames = a.xpath(ns('./name/forename'))
-          forenames.each { |f| fn << f.text }
-          surname = a&.at(ns('./name/surname'))&.text
-          ret << fn.join(' ') + ' ' + surname
+          forenames = a.xpath(ns("./name/forename"))
+          fn = forenames.each_with_object([]) { |f, m| m << f.text }
+          surname = a&.at(ns("./name/surname"))&.text
+          ret << "#{fn.join(' ')} #{surname}"
         end
       end
     end
 
     def extract_person_affiliations(authors)
       authors.reduce([]) do |m, a|
-        name = a&.at(ns('./affiliation/organization/name'))&.text
-        subdivs = a&.xpath(ns('./affiliation/organization/subdivision'))&.map(&:text)&.join(", ")
-        name and subdivs and !subdivs.empty? and name = l10n("#{name}, #{subdivs}", @lang, @script)
-        location = a&.at(ns('./affiliation/organization/address/formattedAddress'))&.text
-        m << (!name.nil? && !location.nil? ? l10n("#{name}, #{location}", @lang, @script) :
-          (name || location || ''))
+        name = a&.at(ns("./affiliation/organization/name"))&.text
+        subdivs = a&.xpath(ns("./affiliation/organization/subdivision"))&.map(&:text)&.join(", ")
+        name and subdivs and !subdivs.empty? and
+          name = l10n("#{name}, #{subdivs}", @lang, @script)
+        location = a&.at(ns("./affiliation/organization/address/formattedAddress"))&.text
+        m << (if !name.nil? && !location.nil?
+                l10n("#{name}, #{location}", @lang, @script)
+              else
+                (name || location || "")
+              end)
         m
       end
     end
 
     def extract_person_names_affiliations(authors)
@@ -48,44 +51,44 @@
       personal_authors(xml)
       agency(xml)
     end
 
     def iso?(org)
-      name = org&.at(ns('./name'))&.text
-      abbrev = org&.at(ns('./abbreviation'))&.text
-      (abbrev == 'ISO' ||
-       name == 'International Organization for Standardization')
+      name = org&.at(ns("./name"))&.text
+      abbrev = org&.at(ns("./abbreviation"))&.text
+      (abbrev == "ISO" ||
+       name == "International Organization for Standardization")
     end
 
     def agency1(xml)
-      agency = ''
+      agency = ""
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
-                   'organization')).each do |org|
-        name = org&.at(ns('./name'))&.text
-        agency1 = org&.at(ns('./abbreviation'))&.text || name
+                   "organization")).each do |org|
+        name = org&.at(ns("./name"))&.text
+        agency1 = org&.at(ns("./abbreviation"))&.text || name
         publisher << name if name
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
       [agency, publisher]
     end
 
     def agency(xml)
       agency, publisher = agency1(xml)
-      set(:agency, agency.sub(%r{/$}, ''))
-      set(:publisher, @i18n.multiple_and(publisher, @labels['and']))
+      set(:agency, agency.sub(%r{/$}, ""))
+      set(:publisher, @i18n.multiple_and(publisher, @labels["and"]))
       agency_addr(xml)
     end
 
     def agency_addr(xml)
       a = xml.at(ns("//bibdata/contributor[xmlns:role/@type = 'publisher'][1]/"\
                     "organization")) or return
-      n = a.at(ns("./subdivision")) and set(:subdivision, n.text)
+      { subdivision: "./subdivision", pub_phone: "./phone[not(@type = 'fax')]",
+        pub_fax: "./phone[@type = 'fax']", pub_email: "./email",
+        pub_uri: "./uri" }.each do |k, v|
+          n = a.at(ns(v)) and set(k, n.text)
+        end
       n = a.at(ns("./address/formattedAddress")) and
         set(:pub_address, n.children.to_xml)
-      n = a.at(ns("./phone[not(@type = 'fax')]")) and set(:pub_phone, n.text)
-      n = a.at(ns("./phone[@type = 'fax']")) and set(:pub_fax, n.text)
-      n = a.at(ns("./email")) and set(:pub_email, n.text)
-      n = a.at(ns("./uri")) and set(:pub_uri, n.text)
     end
   end
 end