mods_display 0.3.3 → 0.3.4

data/lib/mods_display/fields/language.rb

@@ -1,21 +1,23 @@
-class ModsDisplay::Language < ModsDisplay::Field
-  def fields
-    return_fields = @values.map do |value|
-      if value.respond_to?(:languageTerm)
+module ModsDisplay
+  class Language < Field
+    def fields
+      return_fields = @values.map do |value|
+        next unless value.respond_to?(:languageTerm)
         value.languageTerm.map do |term|
-          if term.attributes["type"].respond_to?(:value) and term.attributes["type"].value == "code"
-            ModsDisplay::Values.new(:label => displayLabel(value) || displayLabel(term) || I18n.t('mods_display.language'), :values => [displayForm(value) || language_codes[term.text]].flatten)
-          end
+          next unless term.attributes['type'].respond_to?(:value) && term.attributes['type'].value == 'code'
+          ModsDisplay::Values.new(
+            label: displayLabel(value) || displayLabel(term) || I18n.t('mods_display.language'),
+            values: [displayForm(value) || language_codes[term.text]].flatten
+          )
         end.flatten.compact
-      end
-    end.flatten.compact
-    collapse_fields(return_fields)
-  end
+      end.flatten.compact
+      collapse_fields(return_fields)
+    end
 
-  private
+    private
 
-  def language_codes
-    SEARCHWORKS_LANGUAGES
+    def language_codes
+      SEARCHWORKS_LANGUAGES
+    end
   end
-
-end
+end

data/lib/mods_display/fields/location.rb

@@ -1,41 +1,42 @@
-class ModsDisplay::Location < ModsDisplay::Field
-
-  def fields
-    return_fields = []
-    @values.each do |location|
-      location.children.each do |child|
-        if location_field_keys.include? child.name.to_sym
+module ModsDisplay
+  class Location < Field
+    def fields
+      return_fields = []
+      @values.each do |location|
+        location.children.each do |child|
+          next unless location_field_keys.include?(child.name.to_sym)
           if child.name.to_sym == :url
             loc_label = displayLabel(location) || I18n.t('mods_display.location')
-            value = "<a href='#{child.text}'>#{(displayLabel(child) || child.text).gsub(/:$/,'')}</a>"
+            value = "<a href='#{child.text}'>#{(displayLabel(child) || child.text).gsub(/:$/, '')}</a>"
           else
             loc_label = location_label(child) || displayLabel(location) || I18n.t('mods_display.location')
             value = child.text
           end
-          return_fields << ModsDisplay::Values.new(:label  => loc_label || displayLabel(location) || I18n.t('mods_display.location'),
-                                                   :values => [value])
+          return_fields << ModsDisplay::Values.new(
+            label: loc_label || displayLabel(location) || I18n.t('mods_display.location'),
+            values: [value]
+          )
         end
       end
+      collapse_fields(return_fields)
     end
-    collapse_fields(return_fields)
-  end
 
-  private
+    private
 
-  def location_field_keys
-    [:physicalLocation, :url, :shelfLocation, :holdingSimple, :holdingExternal]
-  end
+    def location_field_keys
+      [:physicalLocation, :url, :shelfLocation, :holdingSimple, :holdingExternal]
+    end
 
-  def location_label(element)
-    if displayLabel(element)
-      displayLabel(element)
-    elsif element.attributes["type"].respond_to?(:value) && location_labels.has_key?(element.attributes["type"].value)
-      location_labels[element.attributes["type"].value]
+    def location_label(element)
+      if displayLabel(element)
+        displayLabel(element)
+      elsif element.attributes['type'].respond_to?(:value) && location_labels.key?(element.attributes['type'].value)
+        location_labels[element.attributes['type'].value]
+      end
     end
-  end
 
-  def location_labels
-    {"repository" => I18n.t('mods_display.repository')}
+    def location_labels
+      { 'repository' => I18n.t('mods_display.repository') }
+    end
   end
-
-end
+end

data/lib/mods_display/fields/name.rb

@@ -1,25 +1,26 @@
-class ModsDisplay::Name < ModsDisplay::Field
-  include ModsDisplay::RelatorCodes
-  def fields
-    return_fields = @values.map do |value|
-      roles = process_role(value)
-      person = nil
-      if value.displayForm.length > 0
-        person = ModsDisplay::Name::Person.new(:name => value.displayForm.text, :roles => roles)
-      elsif !name_parts(value).empty?
-        person = ModsDisplay::Name::Person.new(:name => name_parts(value), :roles => roles)
-      end
-      ModsDisplay::Values.new(:label => displayLabel(value) || name_label(value), :values => [person]) if person
-    end.compact
-    collapse_fields(return_fields)
-  end
+module ModsDisplay
+  class Name < Field
+    include ModsDisplay::RelatorCodes
+    def fields
+      return_fields = @values.map do |value|
+        roles = process_role(value)
+        person = nil
+        if value.displayForm.length > 0
+          person = ModsDisplay::Name::Person.new(name: value.displayForm.text, roles: roles)
+        elsif !name_parts(value).empty?
+          person = ModsDisplay::Name::Person.new(name: name_parts(value), roles: roles)
+        end
+        ModsDisplay::Values.new(label: displayLabel(value) || name_label(value), values: [person]) if person
+      end.compact
+      collapse_fields(return_fields)
+    end
 
-  def to_html
-    return nil if fields.empty? or @config.ignore?
-    output = ""
-    fields.each do |field|
-      output << "<dt#{label_class} #{sanitized_field_title(field.label)}>#{field.label}</dt>"
-      output << "<dd#{value_class}>"
+    def to_html
+      return nil if fields.empty? || @config.ignore?
+      output = ''
+      fields.each do |field|
+        output << "<dt#{label_class} #{sanitized_field_title(field.label)}>#{field.label}</dt>"
+        output << "<dd#{value_class}>"
         output << field.values.map do |val|
           if @config.link
             txt = link_to_value(val.name)
@@ -29,132 +30,126 @@ class ModsDisplay::Name < ModsDisplay::Field
             val.to_s
           end
         end.join(@config.delimiter)
-      output << "</dd>"
+        output << '</dd>'
+      end
+      output
     end
-    output
-  end
 
-  private
+    private
 
-  def name_label(element)
-    if !has_role?(element) || is_primary?(element) || has_author_or_creator_roles?(element)
-      I18n.t('mods_display.author_creator')
-    else
-      I18n.t('mods_display.contributor')
+    def name_label(element)
+      if !role?(element) || primary?(element) || author_or_creator_roles?(element)
+        I18n.t('mods_display.author_creator')
+      else
+        I18n.t('mods_display.contributor')
+      end
     end
-  end
 
-  def has_role?(element)
-    element.respond_to?(:role) and !element.role.empty?
-  end
+    def role?(element)
+      element.respond_to?(:role) && !element.role.empty?
+    end
 
-  def is_primary?(element)
-    element.attributes["usage"].respond_to?(:value) and
-    element.attributes["usage"].value == "primary"
-  end
+    def primary?(element)
+      element.attributes['usage'].respond_to?(:value) &&
+        element.attributes['usage'].value == 'primary'
+    end
 
-  def has_author_or_creator_roles?(element)
-    begin
-      ["author", "aut", "creator", "cre", ""].include?(element.role.roleTerm.text.downcase)
+    def author_or_creator_roles?(element)
+      ['author', 'aut', 'creator', 'cre', ''].include?(element.role.roleTerm.text.downcase)
     rescue
       false
     end
-  end
 
-  def name_parts(element)
-    output = ""
-    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 = ", "
-      if name_part_begins_with_roman_numeral?(terms.first)
-        term_delimiter = " "
+    def name_parts(element)
+      output = ''
+      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
-      output = [output, terms.join(", ")].flatten.compact.join(term_delimiter)
+      dates = qualified_name_parts(element, 'date')
+      unless dates.empty?
+        output = [output, qualified_name_parts(element, 'date')].flatten.compact.join(', ')
+      end
+      output
     end
-    dates = qualified_name_parts(element, "date")
-    unless dates.empty?
-      output = [output, qualified_name_parts(element, "date")].flatten.compact.join(", ")
+
+    def unqualified_name_parts(element)
+      element.namePart.map do |part|
+        part.text unless part.attributes['type']
+      end.compact
     end
-    output
-  end
 
-  def unqualified_name_parts(element)
-    element.namePart.map do |part|
-      part.text unless part.attributes["type"]
-    end.compact
-  end
+    def qualified_name_parts(element, type)
+      element.namePart.map do |part|
+        if part.attributes['type'].respond_to?(:value) &&
+           part.attributes['type'].value == type
+          part.text
+        end
+      end.compact
+    end
 
-  def qualified_name_parts(element, type)
-    element.namePart.map do |part|
-      if part.attributes["type"].respond_to?(:value) and
-         part.attributes["type"].value == type
-           part.text
+    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.compact
-  end
-
-  def name_part_begins_with_roman_numeral?(part)
-    first_part = part.split(/\s|,/).first.strip
-    first_part.chars.all? do |char|
-      ["I", "X", "C", "L", "V"].include? char
     end
-  end
 
-  def process_role(element)
-    if element.role.length > 0 and element.role.roleTerm.length > 0
+    def process_role(element)
+      return unless element.role.length > 0 && element.role.roleTerm.length > 0
       if unencoded_role_term?(element)
         unencoded_role_term(element)
       else
         element.role.roleTerm.map do |term|
-          if term.attributes["type"].respond_to?(:value) and
-             term.attributes["type"].value == "code" and
-             term.attributes["authority"].respond_to?(:value) and
-             term.attributes["authority"].value == "marcrelator" and
-             relator_codes.include?(term.text.strip)
-               relator_codes[term.text.strip]
-          end
+          next unless term.attributes['type'].respond_to?(:value) &&
+                      term.attributes['type'].value == 'code' &&
+                      term.attributes['authority'].respond_to?(:value) &&
+                      term.attributes['authority'].value == 'marcrelator' &&
+                      relator_codes.include?(term.text.strip)
+          relator_codes[term.text.strip]
         end.compact
       end
     end
-  end
 
-  def unencoded_role_term(element)
-    roles = element.role.map do |role|
-      role.roleTerm.find do |term|
-        term.attributes["type"].respond_to?(:value) and
-        term.attributes["type"].value == "text"
+    def unencoded_role_term(element)
+      roles = element.role.map do |role|
+        role.roleTerm.find do |term|
+          term.attributes['type'].respond_to?(:value) &&
+          term.attributes['type'].value == 'text'
+        end
+      end.compact
+      roles = element.role.map do |role|
+        role.roleTerm.find do |term|
+          !term.attributes['type'].respond_to?(:value)
+        end
+      end.compact if roles.empty?
+      roles.map { |t| t.text.strip }
+    end
+
+    def unencoded_role_term?(element)
+      element.role.roleTerm.any? do |term|
+        !term.attributes['type'].respond_to?(:value) ||
+          term.attributes['type'].value == 'text'
       end
-    end.compact
-    roles = element.role.map do |role|
-      role.roleTerm.find do |term|
-        !term.attributes["type"].respond_to?(:value)
+    end
+
+    class Person
+      attr_accessor :name, :roles
+      def initialize(data)
+        @name =  data[:name]
+        @roles = data[:roles] && !data[:roles].empty? ? data[:roles] : nil
       end
-    end.compact if roles.empty?
-    roles.map{|t| t.text.strip }
-  end
 
-  def unencoded_role_term?(element)
-    element.role.roleTerm.any? do |term|
-      !term.attributes["type"].respond_to?(:value) or
-       term.attributes["type"].value == "text"
-    end
-  end
-  
-  class Person
-    attr_accessor :name, :roles
-    def initialize(data)
-      @name =  data[:name]
-      @roles = data[:roles] && !data[:roles].empty? ? data[:roles] : nil
-    end
-    
-    def to_s
-      text = @name.dup
-      text << " (#{@roles.join(', ')})" if @roles
-      text
+      def to_s
+        text = @name.dup
+        text << " (#{@roles.join(', ')})" if @roles
+        text
+      end
     end
   end
-
-end
+end

data/lib/mods_display/fields/note.rb

@@ -1,41 +1,40 @@
-class ModsDisplay::Note < ModsDisplay::Field
-  
-  def fields
-    return_fields = note_fields.map do |value|
-      ModsDisplay::Values.new(:label => displayLabel(value) || note_label(value), :values => [value.text])
+module ModsDisplay
+  class Note < Field
+    def fields
+      return_fields = note_fields.map do |value|
+        ModsDisplay::Values.new(label: displayLabel(value) || note_label(value), values: [value.text])
+      end
+      collapse_fields(return_fields)
     end
-    collapse_fields(return_fields)
-  end
-  
-  
-  private
 
-  def note_fields
-    @values.select do |value|
-      (!value.attributes["type"].respond_to?(:value) or
-         (value.attributes["type"].respond_to?(:value) and
-            value.attributes["type"].value.downcase != "contact"))
+    private
+
+    def note_fields
+      @values.select do |value|
+        (!value.attributes['type'].respond_to?(:value) ||
+           (value.attributes['type'].respond_to?(:value) &&
+              value.attributes['type'].value.downcase != 'contact'))
+      end
     end
-  end
 
-  def note_label(element)
-    if element.attributes["type"].respond_to?(:value)
-      return note_labels[element.attributes["type"].value] || "#{element.attributes["type"].value.capitalize}:"
+    def note_label(element)
+      if element.attributes['type'].respond_to?(:value)
+        return note_labels[element.attributes['type'].value] || "#{element.attributes['type'].value.capitalize}:"
+      end
+      I18n.t('mods_display.note')
     end
-    I18n.t('mods_display.note')
-  end
 
-  def note_labels
-    {"statement of responsibility" => I18n.t('mods_display.statement_of_responsibility'),
-     "date/sequential designation" => I18n.t('mods_display.date_sequential_designation'),
-     "publications"                => I18n.t('mods_display.publications'),
-     "references"                  => I18n.t('mods_display.references'),
-     "bibliography"                => I18n.t('mods_display.bibliography'),
-     "preferred citation"          => I18n.t('mods_display.preferred_citation'),
-     "biographical/historical"     => I18n.t('mods_display.biographical_historical'),
-     "creation/production credits" => I18n.t('mods_display.creation_production_credits'),
-     "citation/reference"          => I18n.t('mods_display.citation_reference')
-     }
+    def note_labels
+      { 'statement of responsibility' => I18n.t('mods_display.statement_of_responsibility'),
+        'date/sequential designation' => I18n.t('mods_display.date_sequential_designation'),
+        'publications'                => I18n.t('mods_display.publications'),
+        'references'                  => I18n.t('mods_display.references'),
+        'bibliography'                => I18n.t('mods_display.bibliography'),
+        'preferred citation'          => I18n.t('mods_display.preferred_citation'),
+        'biographical/historical'     => I18n.t('mods_display.biographical_historical'),
+        'creation/production credits' => I18n.t('mods_display.creation_production_credits'),
+        'citation/reference'          => I18n.t('mods_display.citation_reference')
+       }
+    end
   end
-
-end
+end