mods_display 0.3.3 → 0.3.4

data/lib/mods_display/fields/related_item.rb

@@ -1,84 +1,82 @@
-class ModsDisplay::RelatedItem < ModsDisplay::Field
-
-  def fields
-    return_fields = @values.map do |value|
-      unless related_item_is_a_collection?(value)
+module ModsDisplay
+  class RelatedItem < Field
+    def fields
+      return_fields = @values.map do |value|
+        next if related_item_is_a_collection?(value)
         case
-          when related_item_is_a_location?(value)
-            process_location value
-          when related_item_is_a_reference?(value)
-            process_reference value
-          else
-            process_related_item(value)
+        when related_item_is_a_location?(value)
+          process_location value
+        when related_item_is_a_reference?(value)
+          process_reference value
+        else
+          process_related_item(value)
         end
-      end
-    end.compact
-    collapse_fields(return_fields)
-  end
+      end.compact
+      collapse_fields(return_fields)
+    end
 
-  private
+    private
 
-  def process_location(item)
-    ModsDisplay::Values.new(:label => related_item_label(item), :values => [item.location.text.strip])
-  end
+    def process_location(item)
+      ModsDisplay::Values.new(label: related_item_label(item), values: [item.location.text.strip])
+    end
 
-  def process_reference(item)
-    ModsDisplay::Values.new(:label => related_item_label(item), :values => [reference_title(item)])
-  end
+    def process_reference(item)
+      ModsDisplay::Values.new(label: related_item_label(item), values: [reference_title(item)])
+    end
 
-  def process_related_item(item)
-    if item.titleInfo.length > 0
+    def process_related_item(item)
+      return unless item.titleInfo.length > 0
       title = item.titleInfo.text.strip
       return_text = title
       location = nil
-      location = item.location.url.text if (item.location.length > 0 and
-                                            item.location.url.length > 0)
-      return_text = "<a href='#{location}'>#{title}</a>" if location and !title.empty?
-      unless return_text.empty?
-        ModsDisplay::Values.new(:label => related_item_label(item), :values => [return_text])
-      end
+      location = item.location.url.text if item.location.length > 0 &&
+                                           item.location.url.length > 0
+      return_text = "<a href='#{location}'>#{title}</a>" if location && !title.empty?
+
+      ModsDisplay::Values.new(label: related_item_label(item), values: [return_text]) unless return_text.empty?
     end
-  end
 
-  def reference_title(item)
-    [item.titleInfo,
-     item.originInfo.dateOther,
-     item.part.detail.number,
-     item.note].flatten.compact.map!(&:text).map!(&:strip).join(" ")
-  end
+    def reference_title(item)
+      [item.titleInfo,
+       item.originInfo.dateOther,
+       item.part.detail.number,
+       item.note].flatten.compact.map!(&:text).map!(&:strip).join(' ')
+    end
 
-  def related_item_is_a_collection?(item)
-    item.respond_to?(:titleInfo) and
-    item.respond_to?(:typeOfResource) and
-    item.typeOfResource.attributes.length > 0 and
-    item.typeOfResource.attributes.first.has_key?("collection") and
-    item.typeOfResource.attributes.first["collection"].value == "yes"
-  end
+    def related_item_is_a_collection?(item)
+      item.respond_to?(:titleInfo) &&
+        item.respond_to?(:typeOfResource) &&
+        item.typeOfResource.attributes.length > 0 &&
+        item.typeOfResource.attributes.first.key?('collection') &&
+        item.typeOfResource.attributes.first['collection'].value == 'yes'
+    end
 
-  def related_item_is_a_location?(item)
-    !related_item_is_a_collection?(item) and
-    !related_item_is_a_reference?(item) and
-     item.location.length > 0 and
-     item.titleInfo.length < 1
-  end
+    def related_item_is_a_location?(item)
+      !related_item_is_a_collection?(item) &&
+        !related_item_is_a_reference?(item) &&
+        item.location.length > 0 &&
+        item.titleInfo.length < 1
+    end
 
-  def related_item_is_a_reference?(item)
-    !related_item_is_a_collection?(item) and
-     item.attributes["type"].respond_to?(:value) and
-     item.attributes["type"].value == "isReferencedBy"
-  end
+    def related_item_is_a_reference?(item)
+      !related_item_is_a_collection?(item) &&
+        item.attributes['type'].respond_to?(:value) &&
+        item.attributes['type'].value == 'isReferencedBy'
+    end
 
-  def related_item_label(item)
-    if displayLabel(item)
-      return displayLabel(item)
-    else
-      case
-      when related_item_is_a_location?(item)
-        return I18n.t('mods_display.location')
-      when related_item_is_a_reference?(item)
-        return I18n.t('mods_display.referenced_by')
+    def related_item_label(item)
+      if displayLabel(item)
+        return displayLabel(item)
+      else
+        case
+        when related_item_is_a_location?(item)
+          return I18n.t('mods_display.location')
+        when related_item_is_a_reference?(item)
+          return I18n.t('mods_display.referenced_by')
+        end
+        I18n.t('mods_display.related_item')
       end
-      I18n.t('mods_display.related_item')
     end
   end
-end
+end

data/lib/mods_display/fields/resource_type.rb

@@ -1,14 +1,16 @@
-class ModsDisplay::ResourceType < ModsDisplay::Field
-
-  def fields
-    return_fields = @values.map do |value|
-      ModsDisplay::Values.new(:label => displayLabel(value) || label, :values => [value.text.strip.capitalize].flatten)
+module ModsDisplay
+  class ResourceType < Field
+    def fields
+      return_fields = @values.map do |value|
+        ModsDisplay::Values.new(label: displayLabel(value) || label, values: [value.text.strip.capitalize].flatten)
+      end
+      collapse_fields(return_fields)
     end
-    collapse_fields(return_fields)
-  end
 
-  private
-  def displayLabel(element)
-    super(element) || I18n.t('mods_display.type_of_resource')
+    private
+
+    def displayLabel(element)
+      super(element) || I18n.t('mods_display.type_of_resource')
+    end
   end
-end
+end

data/lib/mods_display/fields/sub_title.rb

@@ -1,5 +1,7 @@
-class ModsDisplay::SubTitle < ModsDisplay::Field
-  def fields
-    ModsDisplay::Title.new(@values[1, @values.length], @config, @klass).fields
+module ModsDisplay
+  class SubTitle < Field
+    def fields
+      ModsDisplay::Title.new(@values[1, @values.length], @config, @klass).fields
+    end
   end
-end
+end

data/lib/mods_display/fields/subject.rb

@@ -1,39 +1,38 @@
-class ModsDisplay::Subject < ModsDisplay::Field
-  
-  def fields
-    return_fields = []
-    @values.each do |value|
-      return_values = []
-      label = displayLabel(value) || I18n.t('mods_display.subject')
-      return_text = []
-      selected_subjects(value).each do |child|
-        if self.respond_to?(:"process_#{child.name}")
-          return_text << self.send(:"process_#{child.name}", child) unless self.send(:"process_#{child.name}", child).to_s.empty?
-        else
-          if child.text.include?("--")
-            return_text << child.text.split("--").map{|t| t.strip }
+module ModsDisplay
+  class Subject < Field
+    def fields
+      return_fields = []
+      @values.each do |value|
+        return_values = []
+        label = displayLabel(value) || I18n.t('mods_display.subject')
+        return_text = []
+        selected_subjects(value).each do |child|
+          if self.respond_to?(:"process_#{child.name}")
+            method_send = send(:"process_#{child.name}", child)
+            return_text << method_send unless method_send.to_s.empty?
           else
-            return_text << child.text unless child.text.empty?
+            if child.text.include?('--')
+              return_text << child.text.split('--').map(&:strip)
+            else
+              return_text << child.text unless child.text.empty?
+            end
           end
         end
+        return_values << return_text.flatten unless return_text.empty?
+        unless return_values.empty?
+          return_fields << ModsDisplay::Values.new(label: label, values: return_values)
+        end
       end
-      unless return_text.empty?
-        return_values << return_text.flatten
-      end
-      unless return_values.empty?
-        return_fields << ModsDisplay::Values.new(:label => label, :values => return_values)
-      end
+      collapse_subjects return_fields
     end
-    collapse_subjects return_fields
-  end
-  
-  # Would really like to clean this up, but it works and is tested for now.
-  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}>"
+
+    # Would really like to clean this up, but it works and is tested for now.
+    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}>"
         subs = []
         field.values.each do |subjects|
           buffer = []
@@ -44,7 +43,7 @@ class ModsDisplay::Subject < ModsDisplay::Field
             else
               buffer << val
             end
-            if @config.link and @config.hierarchical_link
+            if @config.link && @config.hierarchical_link
               if val.is_a?(ModsDisplay::Name::Person)
                 txt = link_to_value(val.name, buffer.join(' '))
                 txt << " (#{val.roles.join(', ')})" if val.roles
@@ -66,72 +65,75 @@ class ModsDisplay::Subject < ModsDisplay::Field
           end
           subs << sub_parts.join(@config.delimiter)
         end
-        output << subs.join("<br/>")
-      output << "</dd>"
+        output << subs.join('<br/>')
+        output << '</dd>'
+      end
+      output
     end
-    output
-  end
 
-  def process_hierarchicalGeographic(element)
-    values_from_subjects(element)
-  end
-  
-  def process_name(element)
-    ModsDisplay::Name.new([element], @config, @klass).fields.first.values.first
-  end
-  
-  private
+    def process_hierarchicalGeographic(element)
+      values_from_subjects(element)
+    end
+
+    def process_name(element)
+      name = ModsDisplay::Name.new([element], @config, @klass).fields.first
+
+      name.values.first if name
+    end
 
-  def values_from_subjects(element)
-    return_values = []
-    selected_subjects(element).each do |child|
-      if child.text.include?("--")
-        return_values << child.text.split("--").map{|t| t.strip }
-      else
-        return_values << child.text.strip
+    private
+
+    def values_from_subjects(element)
+      return_values = []
+      selected_subjects(element).each do |child|
+        if child.text.include?('--')
+          return_values << child.text.split('--').map(&:strip)
+        else
+          return_values << child.text.strip
+        end
       end
+      return_values
     end
-    return_values
-  end
-  
-  def selected_subjects(element=@value)
-    element.children.select do |child|
-      !omit_elements.include?(child.name.to_sym)
+
+    def selected_subjects(element = @value)
+      element.children.select do |child|
+        !omit_elements.include?(child.name.to_sym)
+      end
     end
-  end
-  
-  def omit_elements
-    [:cartographics, :geographicCode, :text]
-  end
 
-  # Providing subject specific collapsing method so we can
-  # collapse the labels w/o flattening all the subject fields.
-  def collapse_subjects(display_fields)
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    display_fields.each_with_index do |field, index|
-      current_label = field.label
-      current_values = field.values
-      if display_fields.length == 1
-        return_values << ModsDisplay::Values.new(:label => current_label, :values => current_values)
-      elsif index == (display_fields.length-1)
-        # need to deal w/ when we have a last element but we have separate labels in the buffer.
-        if current_label != prev_label
-          return_values << ModsDisplay::Values.new(:label => prev_label, :values => [buffer.flatten(1)])
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => current_values)
-        else
-          buffer.concat(current_values)
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten(0))
+    def omit_elements
+      [:cartographics, :geographicCode, :text]
+    end
+
+    # Providing subject specific collapsing method so we can
+    # collapse the labels w/o flattening all the subject fields.
+    def collapse_subjects(display_fields)
+      return_values = []
+      current_label = nil
+      prev_label = nil
+      buffer = []
+      display_fields.each_with_index do |field, index|
+        current_label = field.label
+        current_values = field.values
+        if display_fields.length == 1
+          return_values << ModsDisplay::Values.new(label: current_label, values: current_values)
+        elsif index == (display_fields.length - 1)
+          # need to deal w/ when we have a last element but we have separate labels in the buffer.
+          if current_label != prev_label
+            return_values << ModsDisplay::Values.new(label: prev_label, values: [buffer.flatten(1)])
+            return_values << ModsDisplay::Values.new(label: current_label, values: current_values)
+          else
+            buffer.concat(current_values)
+            return_values << ModsDisplay::Values.new(label: current_label, values: buffer.flatten(0))
+          end
+        elsif prev_label && (current_label != prev_label)
+          return_values << ModsDisplay::Values.new(label: prev_label, values: buffer.flatten(0))
+          buffer = []
         end
-      elsif prev_label and (current_label != prev_label)
-        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten(0))
-        buffer = []
+        buffer.concat(current_values)
+        prev_label = current_label
       end
-      buffer.concat(current_values)
-      prev_label = current_label
+      return_values
     end
-    return_values
   end
-end
+end

data/lib/mods_display/fields/title.rb

@@ -1,59 +1,64 @@
-class ModsDisplay::Title < ModsDisplay::Field
-
-  def fields
-    return_values = []
-    if @values
-      @values.each do |value|
-        if displayForm(value)
-          return_values << ModsDisplay::Values.new(:label => displayLabel(value) || title_label(value), :values => [displayForm(value)])
-        else
-          nonSort = nil
-          title = nil
-          subTitle = nil
-          nonSort = value.nonSort.text.strip unless value.nonSort.text.strip.empty?
-          title = value.title.text.strip unless value.title.text.strip.empty?
-          subTitle = value.subTitle.text unless value.subTitle.text.strip.empty?
-          preSubTitle = [nonSort, title].compact.join(" ")
-          preSubTitle = nil if preSubTitle.strip.empty?
-          preParts = [preSubTitle, subTitle].compact.join(" : ")
-          preParts = nil if preParts.strip.empty?
-          parts = value.children.select do |child|
-            ["partName", "partNumber"].include?(child.name)
-          end.map do |child|
-            child.text
-          end.compact.join(parts_delimiter(value))
-          parts = nil if parts.strip.empty?
-          return_values << ModsDisplay::Values.new(:label => displayLabel(value) || title_label(value), :values => [[preParts, parts].compact.join(". ")])
+module ModsDisplay
+  class Title < Field
+    def fields
+      return_values = []
+      if @values
+        @values.each do |value|
+          if displayForm(value)
+            return_values << ModsDisplay::Values.new(
+              label: displayLabel(value) || title_label(value),
+              values: [displayForm(value)]
+            )
+          else
+            nonSort = nil
+            title = nil
+            subTitle = nil
+            nonSort = value.nonSort.text.strip unless value.nonSort.text.strip.empty?
+            title = value.title.text.strip unless value.title.text.strip.empty?
+            subTitle = value.subTitle.text unless value.subTitle.text.strip.empty?
+            preSubTitle = [nonSort, title].compact.join(' ')
+            preSubTitle = nil if preSubTitle.strip.empty?
+            preParts = compact_and_join_with_delimiter([preSubTitle, subTitle], ' : ')
+            preParts = nil if preParts.strip.empty?
+            parts = value.children.select do |child|
+              %w(partName partNumber).include?(child.name)
+            end.map(&:text).compact.join(parts_delimiter(value))
+            parts = nil if parts.strip.empty?
+            return_values << ModsDisplay::Values.new(
+              label: displayLabel(value) || title_label(value),
+              values: [compact_and_join_with_delimiter([preParts, parts], '. ')]
+            )
+          end
         end
       end
+      collapse_fields(return_values)
     end
-    collapse_fields(return_values)
-  end
 
-  private
+    private
 
-  def parts_delimiter(element)
-    children = element.children.to_a
-    # index will retun nil which is not comparable so we call 100 if the element isn't present (thus meaning it's at the end of the list)
-    if (children.index{ |c| c.name == "partNumber" } || 100) < (children.index{|c| c.name == "partName"} || 100)
-      return ", "
+    def parts_delimiter(element)
+      children = element.children.to_a
+      # index will retun nil which is not comparable so we call 100
+      # if the element isn't present (thus meaning it's at the end of the list)
+      if (children.index { |c| c.name == 'partNumber' } || 100) < (children.index { |c| c.name == 'partName' } || 100)
+        return ', '
+      end
+      '. '
     end
-    ". "
-  end
 
-  def title_label(element)
-    if (element.attributes["type"].respond_to?(:value) and
-        title_labels.has_key?(element.attributes["type"].value))
-      return title_labels[element.attributes["type"].value]
+    def title_label(element)
+      if element.attributes['type'].respond_to?(:value) &&
+         title_labels.key?(element.attributes['type'].value)
+        return title_labels[element.attributes['type'].value]
+      end
+      I18n.t('mods_display.title')
     end
-    I18n.t('mods_display.title')
-  end
 
-  def title_labels
-    {"abbreviated" => I18n.t('mods_display.abbreviated_title'),
-     "translated"  => I18n.t('mods_display.translated_title'),
-     "alternative" => I18n.t('mods_display.alternative_title'),
-     "uniform"     => I18n.t('mods_display.uniform_title')}
+    def title_labels
+      { 'abbreviated' => I18n.t('mods_display.abbreviated_title'),
+        'translated'  => I18n.t('mods_display.translated_title'),
+        'alternative' => I18n.t('mods_display.alternative_title'),
+        'uniform'     => I18n.t('mods_display.uniform_title') }
+    end
   end
-
-end
+end