mods_display 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7b58f76634c11ddf5ce7fef2a844fadbf2d2062ff59f44fc3f903f29fea6d64
-  data.tar.gz: c523ccc3a1534e2eab97a0bc755c52922f4efa5387cf8d2982857fc021b72727
+  metadata.gz: cd385f9d4aea6c14524378831877c327c6fdfd2664356e148b457af9c26a5623
+  data.tar.gz: b66857f71c766dc6edb03b8783d1d63486e94c63c8e9a71a0474f6b5a11d44cc
 SHA512:
-  metadata.gz: 70b984e51af9009c0f453d24012574ef6641fbd5d2a9b6d42a4d46386d161314c04533d84e6fe7cee7ea08592bc4a9710f39cc0d2a079fc715c08358377ec1f3
-  data.tar.gz: 33b3ccefd6e79b06f8127421aaa3d6c2cd9241a03c423bed1e0a4f184feb63177781365a7905fbc0094e29d41f6a50f2be1731723bbd6505a808c8deff885367
+  metadata.gz: 6b4760e8eee0c1eef22badaf5087b4095c4c88766c3b128bbaa1e841e2b1aa34294ced0be7199875b6aa57cdf1b3385dd5c11d624f4ce818afcc7fa4f1da25ab
+  data.tar.gz: 93c93c4249b55816c9716b1c632d0b4c5b5a2874365e33139fbbf6cd9421f01d3aa9800d347c72ae7837bcf98ef763650e8151a3cab547cecb287a72ff7a9ace

data/lib/mods_display/fields/name.rb

@@ -7,12 +7,9 @@ module ModsDisplay
     # this returns a hash:
     #  { role1 label => [ ModsDisplay:Name:Person,  ModsDisplay:Name:Person, ...], role2 label => [ ModsDisplay:Name:Person,  ModsDisplay:Name:Person, ...] }
     def fields
-      return_fields = NameValue.for_values(@values).map do |value|
-        person = if value.displayForm_nodeset.length.positive?
-                   ModsDisplay::Name::Person.new(name: element_text(value.displayForm_nodeset), name_identifiers: value.nameIdentifier_nodeset)
-                 elsif !(name_parts = name_parts(value)).empty?
-                   ModsDisplay::Name::Person.new(name: name_parts, name_identifiers: value.nameIdentifier_nodeset)
-                 end
+      return_fields = @values.map do |value|
+        name_parts = ModsDisplay::NameFormatter.format(value)
+        person = name_parts ? ModsDisplay::Name::Person.new(name: name_parts, name_identifiers: value.xpath('mods:nameIdentifier', mods: MODS_NS)) : nil
         # The person may have multiple roles, so we have to divide them up into an array
         role_labels(value).collect do |role_label|
           ModsDisplay::Values.new(label: displayLabel(value) || role_label, values: [person]) if person
@@ -51,7 +48,7 @@ module ModsDisplay
       default_label = I18n.t('mods_display.associated_with')
       return [default_label] unless element.xpath('mods:role/mods:roleTerm', mods: MODS_NS).present?
 
-      element.role_nodeset.collect do |role|
+      element.xpath('mods:role', mods: MODS_NS).collect do |role|
         codes, text = role.xpath('mods:roleTerm', mods: MODS_NS).partition { |term| term['type'] == 'code' }
 
         # prefer mappable role term codes
@@ -69,40 +66,6 @@ module ModsDisplay
       element_text(element).capitalize.sub(/[.,:;]+$/, '')
     end
 
-    def name_parts(element)
-      output = [unqualified_name_parts(element),
-                qualified_name_parts(element, 'family'),
-                qualified_name_parts(element, 'given')].flatten.compact.join(', ')
-      terms = qualified_name_parts(element, 'termsOfAddress')
-      unless terms.empty?
-        term_delimiter = ', '
-        term_delimiter = ' ' if name_part_begins_with_roman_numeral?(terms.first)
-        output = [output, terms.join(', ')].flatten.compact.join(term_delimiter)
-      end
-      dates = qualified_name_parts(element, 'date')
-      output = [output, dates].flatten.compact.join(', ') unless dates.empty?
-      output
-    end
-
-    def unqualified_name_parts(element)
-      element.namePart_nodeset.map do |part|
-        element_text(part) unless part.attributes['type']
-      end.compact
-    end
-
-    def qualified_name_parts(element, type)
-      element.namePart_nodeset.map do |part|
-        element_text(part) if part.get_attribute('type') == type
-      end.compact
-    end
-
-    def name_part_begins_with_roman_numeral?(part)
-      first_part = part.split(/\s|,/).first.strip
-      first_part.chars.all? do |char|
-        %w[I X C L V].include? char
-      end
-    end
-
     # Consolidate all names under label headings
     def consolidate_under_labels(fields)
       results = {}
@@ -162,27 +125,5 @@ module ModsDisplay
         orcid.first&.text
       end
     end
-
-    class NameValue < SimpleDelegator
-      def self.for_values(values)
-        values.map { |value| new(value) }
-      end
-
-      def nameIdentifier_nodeset
-        @nameIdentifier_nodeset ||= xpath('mods:nameIdentifier', mods: MODS_NS)
-      end
-
-      def displayForm_nodeset
-        @displayForm_nodeset ||= xpath('mods:displayForm', mods: MODS_NS)
-      end
-
-      def namePart_nodeset
-        @namePart_nodeset ||= xpath('mods:namePart', mods: MODS_NS)
-      end
-
-      def role_nodeset
-        @role_nodeset ||= xpath('mods:role', mods: MODS_NS)
-      end
-    end
   end
 end

data/lib/mods_display/name_formatter.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module ModsDisplay
+  class NameFormatter
+    def self.format(element)
+      new(element).format
+    end
+
+    def initialize(element)
+      @element = element
+    end
+
+    def format
+      return element_text(display_form_nodeset) if display_form_nodeset.present?
+      return name_parts if name_parts.present?
+
+      nil
+    end
+
+    private
+
+    attr_reader :element
+
+    def name_parts
+      @name_parts ||= begin
+        output = [unqualified_name_parts(name_part_nodeset),
+                  qualified_name_parts(name_part_nodeset, 'family'),
+                  qualified_name_parts(name_part_nodeset, 'given')].flatten.compact.join(', ')
+        terms = qualified_name_parts(name_part_nodeset, 'termsOfAddress')
+        unless terms.empty?
+          term_delimiter = ', '
+          term_delimiter = ' ' if name_part_begins_with_roman_numeral?(terms.first)
+          output = [output, terms.join(', ')].flatten.compact.join(term_delimiter)
+        end
+        dates = qualified_name_parts(name_part_nodeset, 'date')
+        output = [output, dates].flatten.compact.join(', ') unless dates.empty?
+        output
+      end
+    end
+
+    def unqualified_name_parts(name_part_nodeset)
+      name_part_nodeset.map do |part|
+        element_text(part) unless part.attributes['type']
+      end.compact
+    end
+
+    def qualified_name_parts(name_part_nodeset, type)
+      name_part_nodeset.map do |part|
+        element_text(part) if part.get_attribute('type') == type
+      end.compact
+    end
+
+    def name_part_begins_with_roman_numeral?(part)
+      first_part = part.split(/\s|,/).first.strip
+      first_part.chars.all? do |char|
+        %w[I X C L V].include? char
+      end
+    end
+
+    def element_text(element)
+      element.text.strip
+    end
+
+    def name_part_nodeset
+      @name_part_nodeset ||= element.xpath('mods:namePart', mods: MODS_NS)
+    end
+
+    def display_form_nodeset
+      @display_form_nodeset ||= element.xpath('mods:displayForm', mods: MODS_NS)
+    end
+  end
+end

data/lib/mods_display/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ModsDisplay
-  VERSION = '1.3.5'
+  VERSION = '1.4.0'
 end

data/lib/mods_display.rb

@@ -5,6 +5,7 @@ require 'mods_display/html'
 require 'mods_display/country_codes'
 require 'mods_display/relator_codes'
 require 'mods_display/related_item_concerns'
+require 'mods_display/name_formatter'
 require 'mods_display/fields/field'
 require 'mods_display/fields/abstract'
 require 'mods_display/fields/access_condition'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Jessie Keck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -223,6 +223,7 @@ files:
 - lib/mods_display/fields/title.rb
 - lib/mods_display/fields/values.rb
 - lib/mods_display/html.rb
+- lib/mods_display/name_formatter.rb
 - lib/mods_display/related_item_concerns.rb
 - lib/mods_display/relator_codes.rb
 - lib/mods_display/version.rb