mods_display 0.0.3 → 0.0.4

data/lib/mods_display/fields/imprint.rb

@@ -6,25 +6,32 @@ class ModsDisplay::Imprint < ModsDisplay::Field
       if imprint_display_form(val)
         return_values << imprint_display_form(val)
       else
+        edition = nil
         place = nil
         publisher = nil
         placePub = nil
+        edition = val.edition.map do |e|
+          e.text unless e.text.strip.empty?
+        end.compact.join(" ").strip
         place = val.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|
           p.text unless p.text.strip.empty?
         end.compact.join(" : ").strip unless val.publisher.text.strip.empty?
-        placePub = [place, publisher].compact.join(" : ")
-        placePub = nil if placePub.strip.empty?
         parts = val.children.select do |child|
-          ["dateCreated", "dateIssued", "dateCaptured", "dateOther"].include?(child.name) and !child.attributes.has_key?("encoding")
+          ["dateIssued", "dateOther"].include?(child.name) and !child.attributes.has_key?("encoding")
         end.map do |child|
           child.text.strip unless child.text.strip.empty?
         end.compact.join(", ")
+        edition = nil if edition.strip.empty?
         parts = nil if parts.strip.empty?
-        unless [placePub, parts].compact.join(", ").strip.empty?
-          return_values << ModsDisplay::Values.new(:label => displayLabel(val) || "Imprint", :values => [[placePub, parts].compact.join(", ")])
+        placePub = [place, publisher].compact.join(" : ")
+        placePub = nil if placePub.strip.empty?
+        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(", ")])
         end
         if other_pub_info(val).length > 0
           other_pub_info(val).each do |pub_info|
@@ -56,10 +63,11 @@ class ModsDisplay::Imprint < ModsDisplay::Field
   end
 
   def pub_info_labels
-    {:dateValid     => "Date valid",
+    {:dateCreated   => "Date created",
+     :dateCaptured  => "Date captured",
+     :dateValid     => "Date valid",
      :dateModified  => "Date modified",
      :copyrightDate => "Copyright date",
-     :edition       => "Edition",
      :issuance      => "Issuance",
      :frequency     => "Frequency"
     }

data/lib/mods_display/fields/title.rb

@@ -21,7 +21,7 @@ class ModsDisplay::Title < ModsDisplay::Field
           ["partName", "partNumber"].include?(child.name)
         end.map do |child|
           child.text
-        end.compact.join(", ")
+        end.compact.join(parts_delimiter(val))
         parts = nil if parts.strip.empty?
         return_values << ModsDisplay::Values.new(:label => displayLabel(val) || title_label(val), :values => [[preParts, parts].compact.join(". ")])
       end
@@ -31,6 +31,15 @@ class ModsDisplay::Title < ModsDisplay::Field
 
   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 ", "
+    end
+    ". "
+  end
+
   def title_label(element)
     if (element.attributes["type"].respond_to?(:value) and
         title_labels.has_key?(element.attributes["type"].value))

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fields/imprint_spec.rb

@@ -10,6 +10,7 @@ end
 describe ModsDisplay::Imprint do
   before(:all) do
     @imprint = Stanford::Mods::Record.new.from_str(imprint_mods, false).origin_info
+    @no_edition = Stanford::Mods::Record.new.from_str(no_edition_mods, false).origin_info
     @edition_and_date = Stanford::Mods::Record.new.from_str(origin_info_mods, false).origin_info
     @encoded_date = Stanford::Mods::Record.new.from_str(encoded_date, false).origin_info
     @encoded_only = Stanford::Mods::Record.new.from_str(only_encoded_data, false).origin_info
@@ -26,24 +27,29 @@ describe ModsDisplay::Imprint do
     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.last.label.should == "Edition"
+      fields.last.label.should == "Issuance"
     end
     it "should get multiple labels when we have mixed content" do
-      mods_display_imprint(@mixed).fields.map{|val| val.label }.should == ["Imprint", "Edition"]
+      mods_display_imprint(@mixed).fields.map{|val| val.label }.should == ["Imprint", "Issuance", "Date captured"]
     end
     it "should use the displayLabel when available" do
-       mods_display_imprint(@display_label).fields.map{|val| val.label }.should == ["TheLabel", "EditionLabel", "EditionLabel"]
+       mods_display_imprint(@display_label).fields.map{|val| val.label }.should == ["TheLabel", "IssuanceLabel", "IssuanceLabel"]
     end
   end
 
   describe "fields" do
     it "should return various parts of the imprint" do
-      mods_display_imprint(@imprint).fields.map{|val| val.values }.join(" ").should == "A Place : A Publisher, A Create Date, An Issue Date, A Capture Date, Another Date"
+      mods_display_imprint(@imprint).fields.map{|val| val.values }.join(" ").should == "An edition - A Place : A Publisher, An Issue Date, Another Date"
+    end
+    it "should handle the punctuation when the edition is missing" do
+      values = mods_display_imprint(@no_edition).fields.map{|val| val.values }.join(" ")
+      values.strip.should_not match(/^-/)
+      values.should match(/^A Place/)
     end
     it "should get the text for non-imprint origin info fields" do
       fields = mods_display_imprint(@edition_and_date).fields
       fields.first.values.should == ["A Valid Date"]
-      fields.last.values.should == ["The Edition"]
+      fields.last.values.should == ["The Issuance"]
     end
     it "should omit dates with an encoding attribute" do
       mods_display_imprint(@encoded_date).fields.map{|val| val.values }.join.should_not include("An Encoded Date")
@@ -53,9 +59,10 @@ describe ModsDisplay::Imprint do
     end
     it "should handle mixed mods properly" do
       values = mods_display_imprint(@mixed).fields
-      values.length.should == 2
+      values.length.should == 3
       values.map{|val| val.values}.should include(["A Place : A Publisher"])
-      values.map{|val| val.values}.should include(["The Edition"])
+      values.map{|val| val.values}.should include(["The Issuance"])
+      values.map{|val| val.values}.should include(["The Capture Date"])
     end
   end
   describe "to_html" do
@@ -70,8 +77,9 @@ describe ModsDisplay::Imprint do
     it "should have individual dt/dd pairs for mixed content" do
       html = mods_display_imprint(@mixed).to_html
       html.scan(/<dt title='Imprint'>Imprint:<\/dt>/).length.should == 1
-      html.scan(/<dt title='Edition'>Edition:<\/dt>/).length.should == 1
-      html.scan(/<dd>/).length.should == 2
+      html.scan(/<dt title='Issuance'>Issuance:<\/dt>/).length.should == 1
+      html.scan(/<dt title='Date captured'>Date captured:<\/dt>/).length.should == 1
+      html.scan(/<dd>/).length.should == 3
     end
   end
 

data/spec/fields/title_spec.rb

@@ -7,7 +7,8 @@ end
 describe ModsDisplay::Title do
   before(:all) do
     @title = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Title</title></titleInfo></mods>", false).title_info
-    @title_parts = Stanford::Mods::Record.new.from_str("<mods><titleInfo><nonSort>The</nonSort><title>Title</title><subTitle>For</subTitle><partName>Something</partName><partNumber>62</partNumber></titleInfo></mods>", false).title_info
+    @title_parts = Stanford::Mods::Record.new.from_str("<mods><titleInfo><nonSort>The</nonSort><title>Title</title><subTitle>For</subTitle><partName>Something</partName><partNumber>Part 62</partNumber></titleInfo></mods>", false).title_info
+    @reverse_title_parts = Stanford::Mods::Record.new.from_str("<mods><titleInfo><nonSort>The</nonSort><title>Title</title><subTitle>For</subTitle><partNumber>Part 62</partNumber><partName>Something</partName></titleInfo></mods>", false).title_info
     @display_label = Stanford::Mods::Record.new.from_str("<mods><titleInfo displayLabel='MyTitle'><title>Title</title></titleInfo></mods>", false).title_info
     @display_form = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Title</title><displayForm>The Title of This Item</displayForm></titleInfo></mods>", false).title_info
     @alt_title = Stanford::Mods::Record.new.from_str("<mods><titleInfo type='alternative'><title>Title</title></titleInfo></mods>", false).title_info
@@ -34,7 +35,10 @@ describe ModsDisplay::Title do
   end
   describe "text" do
     it "should construct all the elements in titleInfo" do
-      mods_display_title(@title_parts).fields.first.values.should include "The Title : For. Something, 62"
+      mods_display_title(@title_parts).fields.first.values.should include "The Title : For. Something. Part 62"
+    end
+    it "should use the correct delimiter in the case that a partNumber comes before a partName" do
+      mods_display_title(@reverse_title_parts).fields.first.values.should include "The Title : For. Part 62, Something"
     end
     it "should use the displayForm when available" do
       mods_display_title(@display_form).fields.first.values.should include "The Title of This Item"

data/spec/fixtures/imprint_fixtures.rb

@@ -1,5 +1,18 @@
 module ImprintFixtures
   def imprint_mods
+    <<-MODS
+      <mods>
+        <originInfo>
+          <edition>An edition</edition>
+          <place>A Place</place>
+          <publisher>A Publisher</publisher>
+          <dateIssued>An Issue Date</dateIssued>
+          <dateOther>Another Date</dateOther>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def no_edition_mods
     <<-MODS
       <mods>
         <originInfo>
@@ -20,7 +33,7 @@ module ImprintFixtures
           <dateValid>A Valid Date</dateValid>
         </originInfo>
         <originInfo>
-          <edition>The Edition</edition>
+          <issuance>The Issuance</issuance>
         </originInfo>
       </mods>
     MODS
@@ -50,7 +63,8 @@ module ImprintFixtures
         <originInfo>
           <place>A Place</place>
           <publisher>A Publisher</publisher>
-          <edition>The Edition</edition>
+          <issuance>The Issuance</issuance>
+          <dateCaptured>The Capture Date</dateCaptured>
         </originInfo>
       </mods>
     MODS
@@ -75,13 +89,14 @@ module ImprintFixtures
     <<-MODS
       <mods>
         <originInfo displayLabel="TheLabel">
+          <edition>The edition</edition>
           <place>A Place</place>
           <publisher>A Publisher</publisher>
         </originInfo>
-        <originInfo displayLabel="EditionLabel">
+        <originInfo displayLabel="IssuanceLabel">
           <place>A Place</place>
           <publisher>A Publisher</publisher>
-          <edition>The Edition</edition>
+          <issuance>The Edition</issuance>
         </originInfo>
       </mods>
     MODS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-24 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: -2372385921417665833
+      hash: -1792709584890457737
 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: -2372385921417665833
+      hash: -1792709584890457737
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25