mods_display 0.0.5 → 0.1.0

data/lib/mods_display/fields/cartographics.rb

@@ -1,21 +1,21 @@
 class ModsDisplay::Cartographics < ModsDisplay::Field
 
   def fields
-    return nil if @value.nil?
-    return_values = []
-    @value.each do |val|
-      if val.respond_to?(:cartographics)
-        val.cartographics.each do |field|
+    return nil if @values.nil?
+    return_fields = []
+    @values.each do |value|
+      if value.respond_to?(:cartographics)
+        value.cartographics.each do |field|
           scale = field.scale.empty? ? "Scale not given" : field.scale.text
           projection = field.projection.empty? ? nil : field.projection.text
           coordinates = field.coordinates.empty? ? nil : field.coordinates.text
           post_scale = [projection, coordinates].compact.length > 0 ? [projection, coordinates].compact.join(" ") : nil
-          return_values << ModsDisplay::Values.new({:label => (displayLabel(field) || label || "Map data"),
+          return_fields << ModsDisplay::Values.new({:label => (displayLabel(field) || label || "Map data"),
                                                     :values => [[scale, post_scale].compact.join(" ; ")]})
         end
       end
     end
-    return_values
+    collapse_fields(return_fields)
   end
 
 end

data/lib/mods_display/fields/collection.rb

@@ -5,17 +5,17 @@ class ModsDisplay::Collection < ModsDisplay::Field
   end
 
   def fields
-    return_values = []
-    @value.each do |val|
-      if val.respond_to?(:titleInfo) and
-         val.respond_to?(:typeOfResource) and
-         val.typeOfResource.attributes.length > 0 and
-         val.typeOfResource.attributes.first.has_key?("collection") and
-         val.typeOfResource.attributes.first["collection"].value == "yes"
-        return_values << ModsDisplay::Values.new(:label => label, :values => [val.titleInfo.text.strip])
+    return_fields = []
+    @values.each do |value|
+      if value.respond_to?(:titleInfo) and
+         value.respond_to?(:typeOfResource) and
+         value.typeOfResource.attributes.length > 0 and
+         value.typeOfResource.attributes.first.has_key?("collection") and
+         value.typeOfResource.attributes.first["collection"].value == "yes"
+        return_fields << ModsDisplay::Values.new(:label => label, :values => [value.titleInfo.text.strip])
       end
     end
-    return_values
+    collapse_fields(return_fields)
   end
 
 end

data/lib/mods_display/fields/contact.rb

@@ -1,38 +1,16 @@
 class ModsDisplay::Contact < ModsDisplay::Field
   def fields
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    contact_fields.each_with_index do |val, index|
-      current_label = (displayLabel(val) || "Contact")
-      if contact_fields.length == 1
-        return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-      elsif index == (contact_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)
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-        else
-          buffer << val.text
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten)
-        end
-      elsif prev_label and (current_label != prev_label)
-        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
-        buffer = []
-      end
-      buffer << val.text
-      prev_label = current_label
+    return_fields = contact_fields.map do |value|
+      ModsDisplay::Values.new(:label => displayLabel(value) || "Contact", :values => [value.text])
     end
-    return_values
+    collapse_fields(return_fields)
   end
 
-
   private
   def contact_fields
-    @value.select do |val|
-      val.attributes["type"].respond_to?(:value) and
-        val.attributes["type"].value.downcase == "contact"
+    @values.select do |value|
+      value.attributes["type"].respond_to?(:value) and
+        value.attributes["type"].value.downcase == "contact"
     end
   end
 

data/lib/mods_display/fields/description.rb

@@ -1,31 +1,10 @@
 class ModsDisplay::Description < ModsDisplay::Field
 
   def fields
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    description_fields.each_with_index do |val, index|
-      current_label = description_label(val)
-      if description_fields.length == 1
-        return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-      elsif index == (description_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)
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-        else
-          buffer << val.text
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten)
-        end
-      elsif prev_label and (current_label != prev_label)
-        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
-        buffer = []
-      end
-      buffer << val.text
-      prev_label = current_label
+    return_fields = description_fields.map do |value|
+      ModsDisplay::Values.new(:label => description_label(value), :values => [value.text])
     end
-    return_values
+    collapse_fields(return_fields)
   end
 
   def description_label(element)
@@ -35,7 +14,7 @@ class ModsDisplay::Description < ModsDisplay::Field
   private
 
   def description_fields
-    @value.children.select do |child|
+    @values.children.select do |child|
       labels.keys.include?(child.name.to_sym)
     end
   end

data/lib/mods_display/fields/field.rb

@@ -1,50 +1,21 @@
 # encoding: utf-8
 class ModsDisplay::Field
-  def initialize(value, config, klass)
-    @value = value
+  def initialize(values, config, klass)
+    @values = values
     @config = config
     @klass = klass
   end
 
   def fields
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    @value.each_with_index do |val, index|
-      current_label = displayLabel(val)
-      current_text = (text || val.text).strip
-      if @value.length == 1
-        return_values << ModsDisplay::Values.new(:label => current_label, :values => [current_text])
-      elsif index == (@value.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)
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => [current_text])
-        else
-          buffer << current_text
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten)
-        end
-      elsif prev_label and (current_label != prev_label)
-        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
-        buffer = []
-      end
-      buffer << current_text
-      prev_label = current_label
+    return_fields = @values.map do |value|
+      ModsDisplay::Values.new(:label => displayLabel(value) || label, :values => [displayForm(@values) || value.text].flatten)
     end
-    return_values
+    collapse_fields(return_fields)
   end
 
   def label
-    return nil if @value.nil?
-    displayLabel(@value.first)
-  end
-
-  def text
-    return nil if @value.nil?
-    if displayForm(@value)
-      displayForm(@value).text
-    end
+    return nil if @values.nil?
+    displayLabel(@values.first)
   end
 
   def to_html
@@ -78,7 +49,9 @@ class ModsDisplay::Field
   end
 
   def displayForm(element)
-    element.children.find{|c| c.name == "displayForm"}
+    return element unless element # basically return nil
+    display = element.children.find{|c| c.name == "displayForm"}
+    return display.text if display
   end
 
   def displayLabel(element)
@@ -131,4 +104,33 @@ class ModsDisplay::Field
     val
   end
 
+  def collapse_fields(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)
+          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)
+        end
+      elsif prev_label and (current_label != prev_label)
+        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
+        buffer = []
+      end
+      buffer.concat(current_values)
+      prev_label = current_label
+    end
+    return_values
+  end
+
 end

data/lib/mods_display/fields/format.rb

@@ -1,14 +1,11 @@
 class ModsDisplay::Format < ModsDisplay::Field
 
   def fields
-    return [] if (text.nil? and @value.text.strip.empty?)
-    return_values = @value.map{|v| v.text }
-    return_values = [text] unless text.nil?
-    [ModsDisplay::Values.new(:label => label || 'Format', :values => return_values)]
-  end
-
-  def text
-    return super unless super.nil?
+    return [] if @values.text.strip.empty?
+    return_fields = @values.map do |value|
+      ModsDisplay::Values.new(:label => displayLabel(value) || "Format", :values => [displayForm(value) || value.text])
+    end
+    collapse_fields(return_fields)
   end
 
   def to_html

data/lib/mods_display/fields/identifier.rb

@@ -1,42 +1,21 @@
 class ModsDisplay::Identifier < ModsDisplay::Field
-  
+
   def fields
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    @value.each_with_index do |val, index|
-      current_label = (displayLabel(val) || identifier_label(val))
-      if @value.length == 1
-        return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-      elsif index == (@value.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)
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-        else
-          buffer << val.text
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten)
-        end
-      elsif prev_label and (current_label != prev_label)
-        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
-        buffer = []
-      end
-      buffer << val.text
-      prev_label = current_label
+    return_fields = @values.map do |value|
+      ModsDisplay::Values.new(:label => displayLabel(value) || identifier_label(value), :values => [value.text])
     end
-    return_values
+    collapse_fields(return_fields)
   end
-  
+
   private
-  
+
   def identifier_label(element)
     if element.attributes["type"].respond_to?(:value)
       return identifier_labels[element.attributes["type"].value] || element.attributes["type"].value
     end
     "Identifier"
   end
-  
+
   def identifier_labels
     {"local"                     => "Identifier",
      "isbn"                      => "ISBN",

data/lib/mods_display/fields/imprint.rb

@@ -1,27 +1,27 @@
 class ModsDisplay::Imprint < ModsDisplay::Field
 
   def fields
-    return_values = []
-    @value.each do |val|
-      if imprint_display_form(val)
-        return_values << imprint_display_form(val)
+    return_fields = []
+    @values.each do |value|
+      if imprint_display_form(value)
+        return_fields << imprint_display_form(value)
       else
         edition = nil
         place = nil
         publisher = nil
         placePub = nil
-        edition = val.edition.map do |e|
+        edition = value.edition.map do |e|
           e.text unless e.text.strip.empty?
         end.compact.join(" ").strip
-        place = val.place.map do |p|
+        place = value.place.map do |p|
           p.text unless p.text.strip.empty?
-        end.compact.join(" : ").strip unless val.place.text.strip.empty?
-        publisher = val.publisher.map do |p|
+        end.compact.join(" : ").strip unless value.place.text.strip.empty?
+        publisher = value.publisher.map do |p|
           p.text unless p.text.strip.empty?
-        end.compact.join(" : ").strip unless val.publisher.text.strip.empty?
+        end.compact.join(" : ").strip unless value.publisher.text.strip.empty?
         parts = ["dateIssued", "dateOther"].map do |date_field_name|
-          if val.respond_to?(date_field_name.to_sym)
-            parse_dates(val.send(date_field_name.to_sym))
+          if value.respond_to?(date_field_name.to_sym)
+            parse_dates(value.send(date_field_name.to_sym))
           end
         end.flatten.map do |date|
           date.strip unless date.strip.empty?
@@ -33,19 +33,19 @@ class ModsDisplay::Imprint < ModsDisplay::Field
         editionPlace = [edition, placePub].compact.join(" - ")
         editionPlace = nil if editionPlace.strip.empty?
         unless [editionPlace, parts].compact.join(", ").strip.empty?
-          return_values << ModsDisplay::Values.new(:label => displayLabel(val) || "Imprint", :values => [[editionPlace, parts].compact.join(", ")])
+          return_fields << ModsDisplay::Values.new(:label => displayLabel(value) || "Imprint", :values => [[editionPlace, parts].compact.join(", ")])
         end
-        if dates(val).length > 0
-          return_values.concat(dates(val))
+        if dates(value).length > 0
+          return_fields.concat(dates(value))
         end
-        if other_pub_info(val).length > 0
-          other_pub_info(val).each do |pub_info|
-            return_values << ModsDisplay::Values.new(:label => displayLabel(val) || pub_info_labels[pub_info.name.to_sym], :values => [pub_info.text.strip])
+        if other_pub_info(value).length > 0
+          other_pub_info(value).each do |pub_info|
+            return_fields << ModsDisplay::Values.new(:label => displayLabel(value) || pub_info_labels[pub_info.name.to_sym], :values => [pub_info.text.strip])
           end
         end
       end
     end
-    return_values
+    collapse_fields(return_fields)
   end
   def dates(element)
     date_field_keys.map do |date_field|

data/lib/mods_display/fields/language.rb

@@ -1,27 +1,15 @@
 class ModsDisplay::Language < ModsDisplay::Field
-  def label
-    return super unless super.nil?
-    "Language"
-  end
-
   def fields
-    return [] if @value.languageTerm.length < 1 or @value.languageTerm.text.strip.empty?
-    return_values = []
-    @value.each do |val|
-      languages = []
-      val.languageTerm.select do |term|
-        term.attributes["type"].respond_to?(:value) && term.attributes["type"].value == "code"
-      end.each do |term|
-        languages << language_codes[term.text]
+    return_fields = @values.map do |value|
+      if 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) || "Language", :values => [displayForm(value) || language_codes[term.text]].flatten)
+          end
+        end.flatten.compact
       end
-      return_values << ModsDisplay::Values.new(:label => displayLabel(val) || "Language", :values => languages)
-    end
-    return_values
-  end
-
-  def text
-    return super unless super.nil?
-    language_codes[@value.text.strip] || @value.text.strip
+    end.flatten.compact
+    collapse_fields(return_fields)
   end
 
   private

data/lib/mods_display/fields/name.rb

@@ -1,47 +1,26 @@
 class ModsDisplay::Name < ModsDisplay::Field
 
   def fields
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    @value.each_with_index do |val, index|
-      current_label = (displayLabel(val) || name_label(val))
-      people = []
+    return_fields = @values.map do |value|
       role = nil
-      if val.role.length > 0 and val.role.roleTerm.length > 0
-        role = val.role.roleTerm.find do |term|
+      person = nil
+      if value.role.length > 0 and value.role.roleTerm.length > 0
+        role = value.role.roleTerm.find do |term|
           term.attributes["type"].respond_to?(:value) and
           term.attributes["type"].value == "text"
         end
       end
-      if val.displayForm.length > 0
-        people << ModsDisplay::Name::Person.new(:name => val.displayForm.text, :role => role)
+      if value.displayForm.length > 0
+        person = ModsDisplay::Name::Person.new(:name => value.displayForm.text, :role => role)
       else
-        name_parts = val.namePart.map do |name_part|
+        name_parts = value.namePart.map do |name_part|
           name_part.text
         end.join(", ")
-        people << ModsDisplay::Name::Person.new(:name => name_parts, :role => role) unless name_parts.empty?
+        person = ModsDisplay::Name::Person.new(:name => name_parts, :role => role) unless name_parts.empty?
       end
-      if @value.length == 1
-        return_values << ModsDisplay::Values.new(:label => current_label, :values => people.flatten) unless people.empty?
-      elsif index == (@value.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) unless buffer.flatten.empty?
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => people.flatten) unless people.empty?
-        else
-          buffer << people
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten) unless buffer.flatten.empty?
-        end
-      elsif prev_label and (current_label != prev_label)
-        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten) unless buffer.flatten.empty?
-        buffer = []
-      end
-      buffer << people
-      prev_label = current_label
-    end
-    return_values
+      ModsDisplay::Values.new(:label => displayLabel(value) || name_label(value), :values => [person]) if person
+    end.compact
+    collapse_fields(return_fields)
   end
 
   def to_html

data/lib/mods_display/fields/note.rb

@@ -1,41 +1,20 @@
 class ModsDisplay::Note < ModsDisplay::Field
   
   def fields
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    note_fields.each_with_index do |val, index|
-      current_label = (displayLabel(val) || note_label(val))
-      if note_fields.length == 1
-        return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-      elsif index == (note_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)
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-        else
-          buffer << val.text
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten)
-        end
-      elsif prev_label and (current_label != prev_label)
-        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
-        buffer = []
-      end
-      buffer << val.text
-      prev_label = current_label
+    return_fields = note_fields.map do |value|
+      ModsDisplay::Values.new(:label => displayLabel(value) || note_label(value), :values => [value.text])
     end
-    return_values
+    collapse_fields(return_fields)
   end
   
   
   private
 
   def note_fields
-    @value.select do |val|
-      (!val.attributes["type"].respond_to?(:value) or
-         (val.attributes["type"].respond_to?(:value) and
-            val.attributes["type"].value.downcase != "contact"))
+    @values.select do |value|
+      (!value.attributes["type"].respond_to?(:value) or
+         (value.attributes["type"].respond_to?(:value) and
+            value.attributes["type"].value.downcase != "contact"))
     end
   end
 

data/lib/mods_display/fields/related_item.rb

@@ -1,47 +1,25 @@
 class ModsDisplay::RelatedItem < ModsDisplay::Field
 
   def fields
-    return_values = []
-    current_label = nil
-    prev_label = nil
-    buffer = []
-    return_text = ""
-    @value.each_with_index do |val, index|
-      current_label = (displayLabel(val) || "Related item")
-      unless (val.typeOfResource.length > 0 and
-              val.typeOfResource.attributes.length > 0 and
-              val.typeOfResource.attributes.first.has_key?("collection") and
-              val.typeOfResource.attributes.first["collection"].value == "yes")              
-        if val.titleInfo.length > 0
-          title = val.titleInfo.text.strip
+    return_fields = @values.map do |value|
+      unless (value.typeOfResource.length > 0 and
+              value.typeOfResource.attributes.length > 0 and
+              value.typeOfResource.attributes.first.has_key?("collection") and
+              value.typeOfResource.attributes.first["collection"].value == "yes")
+        if value.titleInfo.length > 0
+          title = value.titleInfo.text.strip
           return_text = title
           location = nil
-          location = val.location.url.text if (val.location.length > 0 and
-                                               val.location.url.length > 0)
+          location = value.location.url.text if (value.location.length > 0 and
+                                                 value.location.url.length > 0)
           return_text = "<a href='#{location}'>#{title}</a>" if location and !title.empty?
-        end
-        unless return_text.empty?
-          if @value.length == 1
-            return_values << ModsDisplay::Values.new(:label => current_label, :values => [return_text])
-          elsif index == (@value.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)
-              return_values << ModsDisplay::Values.new(:label => current_label, :values => [return_text])
-            else
-              buffer << return_text
-              return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten)
-            end
-          elsif prev_label and (current_label != prev_label)
-            return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
-            buffer = []
+          unless return_text.empty?
+            ModsDisplay::Values.new(:label => displayLabel(value) || "Related item", :values => [return_text])
           end
-          buffer << return_text
-          prev_label = current_label
         end
       end
-    end
-    return_values
+    end.compact
+    collapse_fields(return_fields)
   end
 
 end

data/lib/mods_display/fields/related_location.rb

@@ -1,13 +1,12 @@
 class ModsDisplay::RelatedLocation < ModsDisplay::Field
 
   def fields
-    return_values = []
-    @value.each do |val|
-      if val.location.length > 0 and val.titleInfo.length < 1
-        return_values << ModsDisplay::Values.new(:label => displayLabel(val), :values => [val.location.text.strip])
+    return_fields = @values.map do |value|
+      if value.location.length > 0 and value.titleInfo.length < 1
+        ModsDisplay::Values.new(:label => displayLabel(value), :values => [value.location.text.strip])
       end
-    end
-    return_values
+    end.compact
+    collapse_fields(return_fields)
   end
 
   def displayLabel(element)

data/lib/mods_display/fields/sub_title.rb

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

data/lib/mods_display/fields/subject.rb

@@ -2,9 +2,9 @@ class ModsDisplay::Subject < ModsDisplay::Field
   
   def fields
     return_values = []
-    @value.each do |val|
+    @values.each do |value|
       return_text = []
-      selected_subjects(val).each do |child|
+      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

data/lib/mods_display/fields/title.rb

@@ -1,29 +1,28 @@
 class ModsDisplay::Title < ModsDisplay::Field
 
-  
   def fields
     return_values = []
-    @value.each do |val|
-      if displayForm(val)
-        return_values << ModsDisplay::Values.new(:label => displayLabel(val) || title_label(val), :values => [displayForm(val).text])
+    @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 = val.nonSort.text.strip unless val.nonSort.text.strip.empty?
-        title = val.title.text.strip unless val.title.text.strip.empty?
-        subTitle = val.subTitle.text unless val.subTitle.text.strip.empty?
+        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 = val.children.select do |child|
+        parts = value.children.select do |child|
           ["partName", "partNumber"].include?(child.name)
         end.map do |child|
           child.text
-        end.compact.join(parts_delimiter(val))
+        end.compact.join(parts_delimiter(value))
         parts = nil if parts.strip.empty?
-        return_values << ModsDisplay::Values.new(:label => displayLabel(val) || title_label(val), :values => [[preParts, parts].compact.join(". ")])
+        return_values << ModsDisplay::Values.new(:label => displayLabel(value) || title_label(value), :values => [[preParts, parts].compact.join(". ")])
       end
     end
     return_values

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/spec/fields/imprint_spec.rb

@@ -42,7 +42,7 @@ describe ModsDisplay::Imprint do
       mods_display_imprint(@mixed).fields.map{|val| val.label }.should == ["Imprint", "Date captured", "Issuance"]
     end
     it "should use the displayLabel when available" do
-       mods_display_imprint(@display_label).fields.map{|val| val.label }.should == ["TheLabel", "IssuanceLabel", "IssuanceLabel"]
+       mods_display_imprint(@display_label).fields.map{|val| val.label }.should == ["TheLabel", "IssuanceLabel"]
     end
   end
 

data/spec/fields/language_spec.rb

@@ -13,14 +13,6 @@ describe ModsDisplay::Language do
     @multi = Stanford::Mods::Record.new.from_str("<mods><language><languageTerm type='code'>ger</languageTerm><languageTerm type='code'>eng</languageTerm></language></mods>", false).language
     @display_form = Stanford::Mods::Record.new.from_str("<mods><language><languageTerm>zzzxxx</languageTerm><displayForm>Klingon</displayForm></language></mods>", false).language
   end
-  describe "label" do
-    it "should default to Language when no displayLabel is available" do
-      mods_display_language(@language).label.should == "Language"
-    end
-    it "should use the displayLabel attribute when present" do
-      mods_display_language(@display_label).label.should == "Lang"
-    end
-  end
   describe "fields" do
     it "should return an array with a label/values object" do
       values = mods_display_language(@display_label).fields
@@ -40,16 +32,4 @@ describe ModsDisplay::Language do
       values.first.values.should == ["German", "English"]
     end
   end
-  describe "text" do
-    it "should return the language code translation" do
-      mods_display_language(@language).text.should == "English"
-    end
-    it "should return the code if the languages table does not have a translation" do
-      mods_display_language(@no_lang).text.should == "zzzxxx"
-    end
-    it "should return a displayForm if there is one" do
-      mods_display_language(@display_form).text.should == "Klingon"
-    end
-  end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3367910035276828963
+      hash: -3982244066691895178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3367910035276828963
+      hash: -3982244066691895178
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25