mods_display 0.0.1.beta3 → 0.0.1.beta4

data/lib/mods_display/fields/field.rb

@@ -6,8 +6,34 @@ class ModsDisplay::Field
   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
+    end
+    return_values
     @value.map do |val|
-      ModsDisplay::Values.new(:label => displayLabel(val), :values => [text || val.text].flatten)
+      ModsDisplay::Values.new(:label => displayLabel(val) || label, :values => [text || val.text].flatten)
     end
   end
 
@@ -27,12 +53,14 @@ class ModsDisplay::Field
     return nil if fields.empty?
     output = ""
     fields.each do |field|
-      output << "<dt#{label_class} title='#{field.label}'>#{field.label}:</dt>"
-      output << "<dd#{value_class}>"
-        output << field.values.map do |val|
-          @config.link ? link_to_value(val.to_s) : val.to_s
-        end.join(@config.delimiter)
-      output << "</dd>"
+      if field.values.any?{|f| !f.empty? }
+        output << "<dt#{label_class} title='#{field.label}'>#{field.label}:</dt>"
+        output << "<dd#{value_class}>"
+          output << field.values.map do |val|
+            @config.link ? link_to_value(val.to_s) : val.to_s
+          end.join(@config.delimiter)
+        output << "</dd>"
+      end
     end
     output
   end

data/lib/mods_display/fields/location.rb

@@ -1,23 +1,17 @@
 class ModsDisplay::Location < ModsDisplay::Field
-  
-  def fields
-    return_values = []
-    @value.each do |val|
-      return_values << ModsDisplay::Values.new(:label => label || location_label(val), :values => [val.text])
-    end
-    return_values
-  end
-  
+
   private
-  
+
+  def displayLabel(element)
+    super(element) || location_label(element) || "Location"
+  end
+
   def location_label(element)
     if element.attributes["type"].respond_to?(:value) && location_labels.has_key?(element.attributes["type"].value)
       location_labels[element.attributes["type"].value]
-    else
-      "Location"
     end
   end
-  
+
   def location_labels
     {"repository" => "Repository"}
   end

data/lib/mods_display/fields/name.rb

@@ -21,21 +21,21 @@ class ModsDisplay::Name < ModsDisplay::Field
         name_parts = val.namePart.map do |name_part|
           name_part.text
         end.join(", ")
-        people << ModsDisplay::Name::Person.new(:name => name_parts, :role => role)
+        people << 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)
+        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)
-          return_values << ModsDisplay::Values.new(:label => current_label, :values => people.flatten)
+          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)
+          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)
+        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten) unless buffer.flatten.empty?
         buffer = []
       end
       buffer << people

data/lib/mods_display/fields/related_item.rb

@@ -2,7 +2,11 @@ class ModsDisplay::RelatedItem < ModsDisplay::Field
 
   def fields
     return_values = []
-    @value.each do |val|
+    current_label = nil
+    prev_label = nil
+    buffer = []
+    @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
@@ -13,8 +17,26 @@ class ModsDisplay::RelatedItem < ModsDisplay::Field
           location = nil
           location = val.location.url.text if (val.location.length > 0 and
                                                val.location.url.length > 0)
-          return_text = "<a href='#{location}'>#{title}</a>" if location
-          return_values << ModsDisplay::Values.new(:label => displayLabel(val) || "Related Item", :values => [return_text])
+          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 = []
+          end
+          buffer << return_text
+          prev_label = current_label
         end
       end
     end

data/lib/mods_display/fields/related_location.rb

@@ -1,14 +1,17 @@
 class ModsDisplay::RelatedLocation < ModsDisplay::Field
 
-
   def fields
     return_values = []
     @value.each do |val|
-      if val.location.length > 0
-        return_values << ModsDisplay::Values.new(:label => displayLabel(val) || "Location", :values => [val.location.text.strip])
+      if val.location.length > 0 and val.titleInfo.length < 1
+        return_values << ModsDisplay::Values.new(:label => displayLabel(val), :values => [val.location.text.strip])
       end
     end
     return_values
   end
 
+  def displayLabel(element)
+    super(element) || "Location"
+  end
+
 end

data/lib/mods_display/fields/subject.rb

@@ -6,12 +6,12 @@ class ModsDisplay::Subject < ModsDisplay::Field
       return_text = []
       selected_subjects(val).each do |child|
         if self.respond_to?(:"process_#{child.name}")
-          return_text << self.send(:"process_#{child.name}", child)
+          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 }
           else
-            return_text << child.text
+            return_text << child.text unless child.text.empty?
           end
         end
       end

data/lib/mods_display/html.rb

@@ -55,7 +55,7 @@ class ModsDisplay::HTML
   
   def field_config(field_key)
     begin
-      @config.send(field_key)
+      @config.send(field_key_translation[field_key] || field_key)
     rescue
       ModsDisplay::Configuration::Base.new
     end
@@ -84,4 +84,11 @@ class ModsDisplay::HTML
     :identifier      => :identifier,
     :location        => :location}
   end
+
+  def field_key_translation
+    {:relatedLocation => :related_location,
+     :relatedItem => :related_item
+    }
+  end
+
 end

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.0.1.beta3"
+  VERSION = "0.0.1.beta4"
 end

data/spec/fields/name_spec.rb

@@ -16,6 +16,7 @@ end
 describe ModsDisplay::Language do
   before(:all) do
     @name = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart></name></mods>", false).plain_name
+    @blank_name = Stanford::Mods::Record.new.from_str("<mods><name><namePart/><role><roleTerm></roleTerm></role></name></mods>", false).plain_name
     @conf_name = Stanford::Mods::Record.new.from_str("<mods><name type='conference'><namePart>John Doe</namePart></name></mods>", false).plain_name
     @display_form = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><displayForm>Mr. John Doe</displayForm></name></mods>", false).plain_name
     @collapse_label = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart></name><name><namePart>Jane Doe</namePart></name></mods>", false).plain_name
@@ -46,6 +47,9 @@ describe ModsDisplay::Language do
       fields.first.values.first.should be_a(ModsDisplay::Name::Person)
       fields.first.values.first.role.should == "Depicted"
     end
+    it "should not add blank names" do
+      mods_display_name(@blank_name).fields.should == []
+    end
     it "should collapse adjacent matching labels" do
       fields = mods_display_name(@collapse_label).fields
       fields.length.should == 1

data/spec/fields/related_item_spec.rb

@@ -10,6 +10,8 @@ describe ModsDisplay::RelatedItem do
     @linked_item = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo>A Related Item</titleInfo><location><url>http://library.stanford.edu/</url></location></relatedItem></mods>", false).related_item
     @collection = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo>This is a Collection</titleInfo><typeOfResource collection='yes' /></relatedItem></mods>", false).related_item
     @display_label = Stanford::Mods::Record.new.from_str("<mods><relatedItem displayLabel='Special Item'><titleInfo>A Related Item</titleInfo></relatedItem></mods>", false).related_item
+    @blank_item = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo><title></title></titleInfo><location><url></url></location></relatedItem></mods>", false).related_item
+    @multi_items = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo><title>Library</title></titleInfo><location><url>http://library.stanford.edu</url></location></relatedItem><relatedItem><titleInfo><title>SDR</title></titleInfo><location><url>http://purl.stanford.edu</url></location></relatedItem></mods>", false).related_item
   end
   describe "label" do
     it "should default to Related Item" do
@@ -33,5 +35,16 @@ describe ModsDisplay::RelatedItem do
     it "should not return any fields if the described related item is a collection" do
       mods_display_item(@collection).fields.should == []
     end
+    it "should not return empty links when there is no title or link" do
+      mods_display_item(@blank_item).fields.should == []
+    end
+    it "should collapse labels down into the same record" do
+      fields = mods_display_item(@multi_items).fields
+      fields.length.should == 1
+      fields.first.label.should == "Related Item"
+      fields.first.values.length.should == 2
+      fields.first.values.first.should =~ /<a href=.*>Library<\/a>/ or
+      fields.first.values.last.should =~ /<a href=.*>SDR<\/a>/
+    end
   end
 end

data/spec/fields/related_location_spec.rb

@@ -8,6 +8,7 @@ describe ModsDisplay::RelatedLocation do
   before(:all) do
     @location = Stanford::Mods::Record.new.from_str("<mods><relatedItem><location>The Location</location></relatedItem></mods>", false).related_item
     @non_location = Stanford::Mods::Record.new.from_str("<mods><relatedItem><title>No Location</title></relatedItem></mods>", false).related_item
+    @related_item = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo>Do not display as Related Location</titleInfo><location>The Location</location></relatedItem></mods>", false).related_item
     @display_label = Stanford::Mods::Record.new.from_str("<mods><relatedItem displayLabel='Special Location'><location>The Location</location></relatedItem></mods>", false).related_item
   end
   describe "label" do
@@ -27,5 +28,8 @@ describe ModsDisplay::RelatedLocation do
     it "should not return any fields if there is no location" do
       mods_display_related_location(@non_location).fields.should == []
     end
+    it "should not return locations that are already related items" do
+      mods_display_related_location(@related_item).fields.should == []
+    end
   end
 end

data/spec/fields/subject_spec.rb

@@ -20,6 +20,7 @@ end
 describe ModsDisplay::Subject do
   before(:all) do
     @subject = Stanford::Mods::Record.new.from_str(subjects, false).subject
+    @blank_subject = Stanford::Mods::Record.new.from_str(blank_subject, false).subject
     @emdash_subject = Stanford::Mods::Record.new.from_str(emdash_subjects, false).subject
     @geo_subject = Stanford::Mods::Record.new.from_str(hierarchical_geo_subjects, false).subject
     @name_subject = Stanford::Mods::Record.new.from_str(name_subjects, false).subject
@@ -42,6 +43,9 @@ describe ModsDisplay::Subject do
       fields.length.should == 1
       fields.first.values.should == [["United States", "California", "Stanford"]]
     end
+    it "should handle blank subjects properly" do
+      mods_display_subject(@blank_subject).fields.should == []
+    end
   end
 
   describe "name subjects" do

data/spec/fixtures/subjects_fixtures.rb

@@ -10,6 +10,16 @@ module SubjectsFixtures
       </mods>
     XML
   end
+  
+  def blank_subject
+    <<-XML
+      <mods>
+        <subject>
+          <topic/>
+        </subject>
+      </mods>
+    XML
+  end
 
   def emdash_subjects
     <<-XML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta3
+  version: 0.0.1.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2627729319439715150
+      hash: -2208754655843204973
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: