mods_display 0.0.1.beta6 → 0.0.1

data/README.md

@@ -24,7 +24,7 @@ Include the `ModelExtension` into your model.
       include ModsDisplay::ModelExtension
     end
 
-Configure the source of the MODS xml string
+Configure the source of the MODS XML in your model.  You can pass a string of XML to the mods_xml_source method, however it will also accept a block where you can call methods on self (so if the MODS XML string is held in MyClass#mods):
 
     class MyClass
       ....
@@ -56,6 +56,7 @@ In the class that you include the `ModsDisplay::ControllerExtension` you can con
 
 * label_class
 * value_class
+* ignore!
 * delimiter
 * link
 
@@ -74,6 +75,20 @@ Both label_ and value_class accept strings to put in as a class.
       end
     end
 
+### Ignore!
+
+In certain cases an application may need to explicitly remove a portion of the MODS metadata from the display (Contact being a prime example).  You can accomplish this by using the ignore! option.
+
+    class MyController
+      include ModsDisplay::ControllerExtension
+      
+      configure_mods_display do
+        contact do
+          ignore!
+        end
+      end
+    end
+
 ### Delimiter
 
 The delimiter configuration option accepts a string which will be used to delimit multiple multiple values within a single label.
@@ -84,7 +99,7 @@ The delimiter configuration option accepts a string which will be used to delimi
       end
     end
 
-Note: The default is a comma and a space (", ")
+Note: Different MODS elements will have different default delimiters (mainly varying between a comma+space or a HTML line-break).
 
 ### Link
 
@@ -126,6 +141,17 @@ Once installed, the class that included the `ControllerExtension` (`MyController
 
     render_mods_display(@model) # where @model.is_a?(MyClass)
 
+The basic render call will return the top-level ModsDisplay::HTML class object.  Any String method (e.g. #html_safe) you call on this top-level object will be sent down to the #to_html method which will return the HTML for all the metadata in the MODS document.
+
+    render_mods_display(@model).to_html
+    
+You can abstract the main title by calling #title on the top-level HTML method
+
+    render_mods_display(@model).title
+    
+When getting JUST the main title out of the metadata, it will be useful to get the rest of the metadata without the main title.  You can accomplish this by calling #body on the top-level HTML object.
+
+    render_mods_display(@model).body
 
 ## Contributing
 

data/lib/mods_display.rb

@@ -4,15 +4,20 @@ require "mods_display/html"
 require "mods_display/model_extension"
 require "mods_display/configuration"
 require "mods_display/configuration/base"
+require "mods_display/configuration/name"
+require "mods_display/configuration/note"
+require "mods_display/configuration/related_item"
 require "mods_display/configuration/subject"
 require "mods_display/fields/field"
 require "mods_display/fields/abstract"
 require "mods_display/fields/audience"
 require "mods_display/fields/collection"
+require "mods_display/fields/contact"
 require "mods_display/fields/contents"
 require "mods_display/fields/cartographics"
 require "mods_display/fields/description"
 require "mods_display/fields/format"
+require "mods_display/fields/genre"
 require "mods_display/fields/identifier"
 require "mods_display/fields/imprint"
 require "mods_display/fields/language"
@@ -21,6 +26,7 @@ require "mods_display/fields/name"
 require "mods_display/fields/note"
 require "mods_display/fields/related_item"
 require "mods_display/fields/related_location"
+require "mods_display/fields/resource_type"
 require "mods_display/fields/subject"
 require "mods_display/fields/sub_title"
 require "mods_display/fields/title"

data/lib/mods_display/configuration.rb

@@ -14,7 +14,15 @@ class ModsDisplay::Configuration
   end
 
   def name &name
-    @name ||= ModsDisplay::Configuration::Base.new(&name || Proc.new{})
+    @name ||= ModsDisplay::Configuration::Name.new(&name || Proc.new{})
+  end
+
+  def type_of_resource &type_of_resource
+    @type_of_resource ||= ModsDisplay::Configuration::Base.new(&type_of_resource || Proc.new{})
+  end
+
+  def genre &genre
+    @genre ||= ModsDisplay::Configuration::Base.new(&genre || Proc.new{})
   end
 
   def format &format
@@ -50,7 +58,11 @@ class ModsDisplay::Configuration
   end
 
   def note &note
-    @note ||= ModsDisplay::Configuration::Base.new(&note || Proc.new{})
+    @note ||= ModsDisplay::Configuration::Note.new(&note || Proc.new{})
+  end
+
+  def contact &contact
+    @contact ||= ModsDisplay::Configuration::Base.new(&contact || Proc.new{})
   end
 
   def collection &collection
@@ -62,7 +74,7 @@ class ModsDisplay::Configuration
   end
 
   def related_item &related_item
-    @related_item ||= ModsDisplay::Configuration::Base.new(&related_item || Proc.new{})
+    @related_item ||= ModsDisplay::Configuration::RelatedItem.new(&related_item || Proc.new{})
   end
 
   def subject &subject

data/lib/mods_display/configuration/base.rb

@@ -20,4 +20,12 @@ class ModsDisplay::Configuration::Base
     @link ||= [method_name, args]
   end
 
+  def ignore!
+    @ignore = true
+  end
+
+  def ignore?
+    @ignore || false
+  end
+
 end

data/lib/mods_display/configuration/name.rb

@@ -0,0 +1,5 @@
+class ModsDisplay::Configuration::Name < ModsDisplay::Configuration::Base
+  def delimiter delimiter="<br/>"
+    @delimiter ||= delimiter
+  end
+end

data/lib/mods_display/configuration/note.rb

@@ -0,0 +1,5 @@
+class ModsDisplay::Configuration::Note < ModsDisplay::Configuration::Base
+  def delimiter delimiter="<br/>"
+    @delimiter ||= delimiter
+  end
+end

data/lib/mods_display/configuration/related_item.rb

@@ -0,0 +1,5 @@
+class ModsDisplay::Configuration::RelatedItem < ModsDisplay::Configuration::Base
+  def delimiter delimiter="<br/>"
+    @delimiter ||= delimiter
+  end
+end

data/lib/mods_display/fields/abstract.rb

@@ -1,7 +1,8 @@
 class ModsDisplay::Abstract < ModsDisplay::Field
 
-  def label
-    super || "Abstract"
+  private
+  def displayLabel(element)
+    super(element) || "Abstract"
   end
 
 end

data/lib/mods_display/fields/audience.rb

@@ -1,7 +1,8 @@
 class ModsDisplay::Audience < ModsDisplay::Field
 
-  def label
-    super || "Target audience"
+  private
+  def displayLabel(element)
+    super(element) || "Target audience"
   end
 
 end

data/lib/mods_display/fields/cartographics.rb

@@ -10,7 +10,7 @@ class ModsDisplay::Cartographics < ModsDisplay::Field
           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_values << ModsDisplay::Values.new({:label => (displayLabel(field) || label || "Map data"),
                                                     :values => [[scale, post_scale].compact.join(" ; ")]})
         end
       end

data/lib/mods_display/fields/contact.rb

@@ -0,0 +1,39 @@
+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
+    end
+    return_values
+  end
+
+
+  private
+  def contact_fields
+    @value.select do |val|
+      val.attributes["type"].respond_to?(:value) and
+        val.attributes["type"].value.downcase == "contact"
+    end
+  end
+
+end

data/lib/mods_display/fields/contents.rb

@@ -1,7 +1,8 @@
 class ModsDisplay::Contents < ModsDisplay::Field
 
-  def label
-    super || "Table of Contents"
+  private
+  def displayLabel(element)
+    super(element) || "Table of contents"
   end
 
 end

data/lib/mods_display/fields/description.rb

@@ -29,7 +29,7 @@ class ModsDisplay::Description < ModsDisplay::Field
   end
 
   def description_label(element)
-    label || displayLabel(element) || labels[element.name.to_sym] || "Physical Description"
+    label || displayLabel(element) || labels[element.name.to_sym] || "Physical description"
   end
 
   private
@@ -43,7 +43,7 @@ class ModsDisplay::Description < ModsDisplay::Field
   def labels
     {:form          => "Form",
      :extent        => "Extent",
-     :digitalOrigin => "Digital Origin",
+     :digitalOrigin => "Digital origin",
      :note          => "Note"
      }
   end

data/lib/mods_display/fields/field.rb

@@ -33,9 +33,6 @@ class ModsDisplay::Field
       prev_label = current_label
     end
     return_values
-    @value.map do |val|
-      ModsDisplay::Values.new(:label => displayLabel(val) || label, :values => [text || val.text].flatten)
-    end
   end
 
   def label
@@ -51,7 +48,7 @@ class ModsDisplay::Field
   end
 
   def to_html
-    return nil if fields.empty?
+    return nil if fields.empty? or @config.ignore?
     output = ""
     fields.each do |field|
       if field.values.any?{|f| !f.empty? }

data/lib/mods_display/fields/format.rb

@@ -12,6 +12,7 @@ class ModsDisplay::Format < ModsDisplay::Field
   end
 
   def to_html
+    return nil if @config.ignore?
     output = ""
     fields.each do |field|
       output << "<dt#{label_class} title='#{field.label}'>#{field.label}:</dt>"

data/lib/mods_display/fields/genre.rb

@@ -0,0 +1,9 @@
+class ModsDisplay::Genre < ModsDisplay::Field
+
+
+  private
+  
+  def displayLabel(element)
+    super(element) || "Genre"
+  end
+end

data/lib/mods_display/fields/identifier.rb

@@ -46,15 +46,15 @@ class ModsDisplay::Identifier < ModsDisplay::Field
      "hdl"                       => "Handle",
      "isrc"                      => "ISRC",
      "ismn"                      => "ISMN",
-     "issue number"              => "Issue Number",
+     "issue number"              => "Issue number",
      "lccn"                      => "LCCN",
-     "matrix number"             => "Matrix Number",
-     "music publisher"           => "Music Publisher",
-     "music plate"               => "Music Plate",
+     "matrix number"             => "Matrix number",
+     "music publisher"           => "Music publisher",
+     "music plate"               => "Music plate",
      "sici"                      => "SICI",
      "upc"                       => "UPC",
-     "videorecording identifier" => "Videorecording Identifier",
-     "stock number"              => "Stock Number"}
+     "videorecording identifier" => "Videorecording identifier",
+     "stock number"              => "Stock number"}
   end
 
 end

data/lib/mods_display/fields/imprint.rb

@@ -56,9 +56,9 @@ class ModsDisplay::Imprint < ModsDisplay::Field
   end
 
   def pub_info_labels
-    {:dateValid     => "Date Valid",
-     :dateModified  => "Date Modified",
-     :copyrightDate => "Copyright Date",
+    {:dateValid     => "Date valid",
+     :dateModified  => "Date modified",
+     :copyrightDate => "Copyright date",
      :edition       => "Edition",
      :issuance      => "Issuance",
      :frequency     => "Frequency"

data/lib/mods_display/fields/name.rb

@@ -45,7 +45,7 @@ class ModsDisplay::Name < ModsDisplay::Field
   end
 
   def to_html
-    return nil if fields.empty?
+    return nil if fields.empty? or @config.ignore?
     output = ""
     fields.each do |field|
       output << "<dt#{label_class} title='#{field.label}'>#{field.label}:</dt>"
@@ -87,9 +87,9 @@ class ModsDisplay::Name < ModsDisplay::Field
 
   def name_labels
     {"personal"   => "Author/Creator",
-     "corporate"  => "Corporate Author",
+     "corporate"  => "Corporate author",
      "conference" => "Meeting",
-     "family"     => "Family Author"}
+     "family"     => "Family author"}
   end
   
   class Person

data/lib/mods_display/fields/note.rb

@@ -5,11 +5,11 @@ class ModsDisplay::Note < ModsDisplay::Field
     current_label = nil
     prev_label = nil
     buffer = []
-    @value.each_with_index do |val, index|
+    note_fields.each_with_index do |val, index|
       current_label = (displayLabel(val) || note_label(val))
-      if @value.length == 1
+      if note_fields.length == 1
         return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
-      elsif index == (@value.length-1)
+      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)
@@ -30,17 +30,26 @@ class ModsDisplay::Note < ModsDisplay::Field
   
   
   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"))
+    end
+  end
+
   def note_label(element)
     if element.attributes["type"].respond_to?(:value)
-      return note_labels[element.attributes["type"].value] || element.attributes["type"].value
+      return note_labels[element.attributes["type"].value] || element.attributes["type"].value.capitalize
     end
     "Note"
   end
-  
+
   def note_labels
-    {"statement of responsibility" => "Statement of Responsibility",
-     "date/sequential designation" => "Date/Sequential Designation",
+    {"statement of responsibility" => "Statement of responsibility",
+     "date/sequential designation" => "Date/Sequential designation",
+     "publications"                => "Publications",
      "references"                  => "References",
      "bibliography"                => "Bibliography",
      "preferred citation"          => "Preferred citation"}

data/lib/mods_display/fields/related_item.rb

@@ -5,8 +5,9 @@ class ModsDisplay::RelatedItem < ModsDisplay::Field
     current_label = nil
     prev_label = nil
     buffer = []
+    return_text = ""
     @value.each_with_index do |val, index|
-      current_label = (displayLabel(val) || "Related Item")
+      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

data/lib/mods_display/fields/resource_type.rb

@@ -0,0 +1,7 @@
+class ModsDisplay::ResourceType < ModsDisplay::Field
+
+  private
+  def displayLabel(element)
+    super(element) || "Type of resource"
+  end
+end

data/lib/mods_display/fields/subject.rb

@@ -25,7 +25,7 @@ class ModsDisplay::Subject < ModsDisplay::Field
   
   # Would really like to clean this up, but it works and is tested for now.
   def to_html
-    return nil if fields.empty?
+    return nil if fields.empty? or @config.ignore?
     output = ""
     fields.each do |field|
       output << "<dt#{label_class} title='#{field.label}'>#{field.label}:</dt>"

data/lib/mods_display/fields/title.rb

@@ -40,10 +40,10 @@ class ModsDisplay::Title < ModsDisplay::Field
   end
 
   def title_labels
-    {"abbreviated" => "Abbreviated Title",
-     "translated"  => "Translated Title",
-     "alternative" => "Alternative Title",
-     "uniform"     => "Uniform Title"}
+    {"abbreviated" => "Abbreviated title",
+     "translated"  => "Translated title",
+     "alternative" => "Alternative title",
+     "uniform"     => "Uniform title"}
   end
 
 end

data/lib/mods_display/html.rb

@@ -64,14 +64,15 @@ class ModsDisplay::HTML
   end
   
   def mods_display_fields
-    [:title, :name, :format, :imprint, :language, :description, :cartographics, :abstract, :contents, :audience, :note, :collection, :relatedLocation, :relatedItem, :subject, :identifier, :location]
+    [:title, :name, :language, :imprint, :resourceType, :genre, :description, :cartographics, :abstract, :contents, :audience, :note, :contact, :collection, :relatedLocation, :relatedItem, :subject, :identifier, :location]
   end
   
   def mods_display_field_mapping
    {:title           => :title_info,
     :subTitle        => :title_info,
     :name            => :plain_name,
-    :format          => :typeOfResource,
+    :resourceType    => :typeOfResource,
+    :genre           => :genre,
     :imprint         => :origin_info,
     :language        => :language,
     :description     => :physical_description,
@@ -80,6 +81,7 @@ class ModsDisplay::HTML
     :contents        => :tableOfContents,
     :audience        => :targetAudience,
     :note            => :note,
+    :contact         => :note,
     :collection      => :related_item,
     :relatedLocation => :related_item,
     :relatedItem     => :related_item,
@@ -90,6 +92,7 @@ class ModsDisplay::HTML
 
   def field_key_translation
     {:subTitle        => :sub_title,
+     :resourceType    => :resource_type,
      :relatedLocation => :related_location,
      :relatedItem     => :related_item
     }

data/lib/mods_display/version.rb

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

data/spec/configuration/base_spec.rb

@@ -26,4 +26,14 @@ describe ModsDisplay::Configuration::Base do
       ModsDisplay::Configuration::Base.new.delimiter.should == ", "
     end
   end
+  describe "ignore" do
+    it "should be set to true if the #ignore! method is called" do
+      ModsDisplay::Configuration::Base.new do
+        ignore!
+      end.ignore?.should be_true
+    end
+    it "should be false by default" do
+      ModsDisplay::Configuration::Base.new.ignore?.should be_false
+    end
+  end
 end

data/spec/fields/abstract_spec.rb

@@ -9,6 +9,14 @@ describe ModsDisplay::Abstract do
     @link = Stanford::Mods::Record.new.from_str("<mods><abstract>A link to the library (http://library.stanford.edu) should appear here</abstract></mods>", false).abstract
     @email = Stanford::Mods::Record.new.from_str("<mods><abstract>A link to an email address jdoe@example.com should appear here</abstract></mods>", false).abstract
   end
+  
+  describe "labels" do
+    it "should get a default 'Abstract' label" do
+      fields = mods_display_abstract(@link).fields
+      fields.length.should == 1
+      fields.first.label.should == "Abstract"
+    end
+  end
 
   describe "links" do
     it "should turn URLs into links" do

data/spec/fields/contact_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+def mods_display_contact(mods_record)
+  ModsDisplay::Contact.new(mods_record, ModsDisplay::Configuration::Base.new, mock("controller"))
+end
+
+describe ModsDisplay::Contact do
+  before(:all) do
+    @contact_note = Stanford::Mods::Record.new.from_str("<mods><note type='contact'>jdoe@example.com</note><note>Note Field</note></mods>", false).note
+  end
+  it "should only get contact fields" do
+    fields = mods_display_contact(@contact_note).fields
+    fields.length.should == 1
+    fields.first.values.should include("jdoe@example.com")
+  end
+  it "should not get any non-contact fields" do
+    fields = mods_display_contact(@contact_note).fields
+    fields.length.should == 1
+    fields.first.values.should_not include("Note Field")
+  end
+end

data/spec/fields/contents_spec.rb

@@ -11,7 +11,7 @@ describe ModsDisplay::Contents do
   end
   describe "label" do
     it "should have a default label" do
-      mods_display_contents(@contents).label.should == "Table of Contents"
+      mods_display_contents(@contents).label.should == "Table of contents"
     end
     it "should use the displayLabel attribute when one is available" do
       mods_display_contents(@display_label).label.should == "Special Label"

data/spec/fields/description_spec.rb

@@ -12,7 +12,7 @@ describe ModsDisplay::Description do
     @mixed = Stanford::Mods::Record.new.from_str("<mods><physicalDescription><form>Form Note</form><extent>Extent Note</extent></physicalDescription></mods>", false).physical_description
   end
   describe "labels" do
-    it "should use the dislayLabel if one is provided" do
+    it "should use the displayLabel if one is provided" do
       mods_display_description(@display_label).fields.first.label.should == "SpecialLabel"
     end
     it "should get the default label for a child element" do

data/spec/fields/genre_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+def mods_display_genre(mods_record)
+  ModsDisplay::Genre.new(mods_record, ModsDisplay::Configuration::Base.new, mock("controller"))
+end
+
+describe ModsDisplay::Abstract do
+  before(:all) do
+    @genre = Stanford::Mods::Record.new.from_str("<mods><genre>Map Data</abstract></genre>", false).genre
+    @display_label = Stanford::Mods::Record.new.from_str("<mods><genre displayLabel='Special label'>Catographic</genre></mods>", false).genre
+  end
+  describe "labels" do
+    it "should return a default 'Genre' label" do
+      fields = mods_display_genre(@genre).fields
+      fields.length.should == 1
+      fields.first.label.should == "Genre"
+    end
+    it "should use a display label when one is available" do
+      fields = mods_display_genre(@display_label).fields
+      fields.length.should == 1
+      fields.first.label.should == "Special label"
+    end
+  end
+end

data/spec/fields/identifier_spec.rb

@@ -20,7 +20,7 @@ describe ModsDisplay::Note do
       mods_display_id(@display_label).fields.first.label.should == "Special Label"
     end
     it "should use get a label from a list of translations" do
-      mods_display_id(@issue_label).fields.first.label.should == "Issue Number"
+      mods_display_id(@issue_label).fields.first.label.should == "Issue number"
     end
     it "should use use the raw type attribute if one is present" do
       mods_display_id(@type_label).fields.first.label.should == "Some other Type"
@@ -36,7 +36,7 @@ describe ModsDisplay::Note do
       fields.first.values.length.should == 2
       fields.first.values.should == ["12345", "54321"]
       
-      fields[1].label.should == "Issue Number"
+      fields[1].label.should == "Issue number"
       fields[1].values.length.should == 1
       fields[1].values.should == ["12345"]
       

data/spec/fields/imprint_spec.rb

@@ -25,7 +25,7 @@ describe ModsDisplay::Imprint do
     end
     it "should get the label from non-imprint origin info fields" do
       fields = mods_display_imprint(@edition_and_date).fields
-      fields.first.label.should == "Date Valid"
+      fields.first.label.should == "Date valid"
       fields.last.label.should == "Edition"
     end
     it "should get multiple labels when we have mixed content" do

data/spec/fields/note_spec.rb

@@ -9,7 +9,8 @@ describe ModsDisplay::Note do
     @note = Stanford::Mods::Record.new.from_str("<mods><note>Note Field</note></mods>", false).note
     @display_label = Stanford::Mods::Record.new.from_str("<mods><note displayLabel='Special Label'>Note Field</note></mods>", false).note
     @sor_label = Stanford::Mods::Record.new.from_str("<mods><note type='statement of responsibility'>Note Field</note></mods>", false).note
-    @type_label = Stanford::Mods::Record.new.from_str("<mods><note type='Some other Type'>Note Field</note></mods>", false).note
+    @contact_note = Stanford::Mods::Record.new.from_str("<mods><note type='contact'>jdoe@example.com</note><note>Note Field</note></mods>", false).note
+    @type_label = Stanford::Mods::Record.new.from_str("<mods><note type='some other Type'>Note Field</note></mods>", false).note
     @complex_label = Stanford::Mods::Record.new.from_str("<mods><note>Note Field</note><note>2nd Note Field</note><note type='statement of responsibility'>SoR</note><note>Another Note</note></mods>", false).note
   end
   describe "label" do
@@ -20,10 +21,10 @@ describe ModsDisplay::Note do
       mods_display_note(@display_label).fields.first.label.should == "Special Label"
     end
     it "should use get a label from a list of translations" do
-      mods_display_note(@sor_label).fields.first.label.should == "Statement of Responsibility"
+      mods_display_note(@sor_label).fields.first.label.should == "Statement of responsibility"
     end
-    it "should use use the raw type attribute if one is present" do
-      mods_display_note(@type_label).fields.first.label.should == "Some other Type"
+    it "should use use the capitalized type attribute if one is present" do
+      mods_display_note(@type_label).fields.first.label.should == "Some other type"
     end
   end
   
@@ -40,7 +41,7 @@ describe ModsDisplay::Note do
       fields.first.values.length == 2
       fields.first.values.should == ["Note Field", "2nd Note Field"]
       
-      fields[1].label == "Statement of Responsibility"
+      fields[1].label == "Statement of responsibility"
       fields[1].values.length == 1
       fields[1].values.should == ["SoR"]
       
@@ -48,6 +49,11 @@ describe ModsDisplay::Note do
       fields.last.values.length == 1
       fields.last.values.should == ["Another Note"]
     end
+    it "should not include any contact fields" do
+      fields = mods_display_note(@contact_note).fields
+      fields.length.should == 1
+      fields.first.values.should == ["Note Field"]
+    end
   end
   
 end

data/spec/fields/related_item_spec.rb

@@ -15,7 +15,7 @@ describe ModsDisplay::RelatedItem do
   end
   describe "label" do
     it "should default to Related Item" do
-      mods_display_item(@item).fields.first.label.should == "Related Item"
+      mods_display_item(@item).fields.first.label.should == "Related item"
     end
     it "should get the displayLabel if available" do
       mods_display_item(@display_label).fields.first.label.should == "Special Item"
@@ -41,7 +41,7 @@ describe ModsDisplay::RelatedItem do
     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.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>/

data/spec/fields/resource_type_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+def mods_display_resource_type(mods_record)
+  ModsDisplay::ResourceType.new(mods_record, ModsDisplay::Configuration::Base.new, mock("controller"))
+end
+
+describe ModsDisplay::ResourceType do
+  before(:all) do
+    @type = Stanford::Mods::Record.new.from_str("<mods><typeOfResource>Resource Type</typeOfResource></mods>", false).typeOfResource
+    @display_label = Stanford::Mods::Record.new.from_str("<mods><typeOfResource displayLabel='Special label'>Resource Type</typeOfResource></mods>", false).typeOfResource
+  end
+  it "should default to a label of 'Type of resource'" do
+    fields = mods_display_resource_type(@type).fields
+    fields.length.should == 1
+    fields.first.label.should == "Type of resource"
+  end
+  it "should use the displayLabel attribute when present" do
+    fields = mods_display_resource_type(@display_label).fields
+    fields.length.should == 1
+    fields.first.label.should == "Special label"
+  end
+end

data/spec/fields/title_spec.rb

@@ -17,7 +17,7 @@ describe ModsDisplay::Title do
       mods_display_title(@title).fields.first.label.should == "Title"
     end
     it "should return an appropriate label from the type attribute" do
-      mods_display_title(@alt_title).fields.first.label.should == "Alternative Title"
+      mods_display_title(@alt_title).fields.first.label.should == "Alternative title"
     end
     it "should return the label held in the displayLabel attribute of the titleInfo element when available" do
       mods_display_title(@display_label).fields.first.label.should == "MyTitle"

data/spec/integration/configuration_spec.rb

@@ -9,6 +9,9 @@ class TestConfigController
       value_class 'value-class'
       link :link_to_title, "%value%"
     end
+    contact do
+      ignore!
+    end
   end
   
   def link_to_title(title)
@@ -18,7 +21,7 @@ end
 
 describe "Configuration" do
   before(:all) do
-    xml = "<mods><titleInfo><title>The Title of this Item</title></titleInfo></mods>"
+    xml = "<mods><titleInfo><title>The Title of this Item</title></titleInfo><note type='contact'>jdoe@example.com</note></mods>"
     model = TestModel.new
     model.modsxml = xml
     controller = TestConfigController.new
@@ -33,5 +36,7 @@ describe "Configuration" do
   it "should apply the link" do
     @html.scan(/<a href='\/path\/to\/title\?The Title of this Item'>The Title of this Item<\a>/)
   end
-  
+  it "should ignore fields if requested" do
+    @html.scan(/jdoe@example\.com/).length.should == 0
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta6
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Jessie Keck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -75,16 +75,21 @@ files:
 - lib/mods_display.rb
 - lib/mods_display/configuration.rb
 - lib/mods_display/configuration/base.rb
+- lib/mods_display/configuration/name.rb
+- lib/mods_display/configuration/note.rb
+- lib/mods_display/configuration/related_item.rb
 - lib/mods_display/configuration/subject.rb
 - lib/mods_display/controller_extension.rb
 - lib/mods_display/fields/abstract.rb
 - lib/mods_display/fields/audience.rb
 - lib/mods_display/fields/cartographics.rb
 - lib/mods_display/fields/collection.rb
+- lib/mods_display/fields/contact.rb
 - lib/mods_display/fields/contents.rb
 - lib/mods_display/fields/description.rb
 - lib/mods_display/fields/field.rb
 - lib/mods_display/fields/format.rb
+- lib/mods_display/fields/genre.rb
 - lib/mods_display/fields/identifier.rb
 - lib/mods_display/fields/imprint.rb
 - lib/mods_display/fields/language.rb
@@ -93,6 +98,7 @@ files:
 - lib/mods_display/fields/note.rb
 - lib/mods_display/fields/related_item.rb
 - lib/mods_display/fields/related_location.rb
+- lib/mods_display/fields/resource_type.rb
 - lib/mods_display/fields/sub_title.rb
 - lib/mods_display/fields/subject.rb
 - lib/mods_display/fields/title.rb
@@ -106,9 +112,11 @@ files:
 - spec/fields/audience_spec.rb
 - spec/fields/cartographics_spec.rb
 - spec/fields/collection_spec.rb
+- spec/fields/contact_spec.rb
 - spec/fields/contents_spec.rb
 - spec/fields/description_spec.rb
 - spec/fields/format_spec.rb
+- spec/fields/genre_spec.rb
 - spec/fields/identifier_spec.rb
 - spec/fields/imprint_spec.rb
 - spec/fields/language_spec.rb
@@ -117,6 +125,7 @@ files:
 - spec/fields/note_spec.rb
 - spec/fields/related_item_spec.rb
 - spec/fields/related_location_spec.rb
+- spec/fields/resource_type_spec.rb
 - spec/fields/sub_title_spec.rb
 - spec/fields/subject_spec.rb
 - spec/fields/title_spec.rb
@@ -142,16 +151,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2853420712234504554
+      hash: -2016190750318240142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -2016190750318240142
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: The MODS Display gem allows implementers to configure a customized display
@@ -163,9 +175,11 @@ test_files:
 - spec/fields/audience_spec.rb
 - spec/fields/cartographics_spec.rb
 - spec/fields/collection_spec.rb
+- spec/fields/contact_spec.rb
 - spec/fields/contents_spec.rb
 - spec/fields/description_spec.rb
 - spec/fields/format_spec.rb
+- spec/fields/genre_spec.rb
 - spec/fields/identifier_spec.rb
 - spec/fields/imprint_spec.rb
 - spec/fields/language_spec.rb
@@ -174,6 +188,7 @@ test_files:
 - spec/fields/note_spec.rb
 - spec/fields/related_item_spec.rb
 - spec/fields/related_location_spec.rb
+- spec/fields/resource_type_spec.rb
 - spec/fields/sub_title_spec.rb
 - spec/fields/subject_spec.rb
 - spec/fields/title_spec.rb