mods_display 0.1.2 → 0.1.3

data/lib/mods_display/fields/imprint.rb

@@ -13,7 +13,7 @@ class ModsDisplay::Imprint < ModsDisplay::Field
         edition = value.edition.map do |e|
           e.text unless e.text.strip.empty?
         end.compact.join(" ").strip
-        place = value.place.map do |p|
+        place = place_terms(value).map do |p|
           p.text unless p.text.strip.empty?
         end.compact.join(" : ").strip unless value.place.text.strip.empty?
         publisher = value.publisher.map do |p|
@@ -150,14 +150,22 @@ class ModsDisplay::Imprint < ModsDisplay::Field
     end
   end
   def normalize_date(date)
-    date.strip.gsub(/^\s*\[*ca\.\s*|\[|\]|\?/, "")
+    date.strip.gsub(/^\[*ca\.\s*|c|\[|\]|\?/, "")
   end
   def other_pub_info(element)
     element.children.select do |child|
       pub_info_parts.include?(child.name.to_sym)
     end
   end
-  
+  def place_terms(element)
+    return [] unless element.respond_to?(:place) and
+                     element.place.respond_to?(:placeTerm)
+    element.place.placeTerm.select do |term|
+      !term.attributes["type"] or
+      !term.attributes["type"].respond_to?(:value) or
+       term.attributes["type"].value != "code"
+    end.compact
+  end
   def imprint_display_form(element)
     display_form = element.children.find do |child|
       child.name == "displayForm"

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/fields/imprint_spec.rb

@@ -20,6 +20,7 @@ describe ModsDisplay::Imprint do
     @open_date_range = Stanford::Mods::Record.new.from_str(open_date_range, false).origin_info
     @dup_qualified_date = Stanford::Mods::Record.new.from_str(dup_qualified_date, false).origin_info
     @dup_unencoded_date = Stanford::Mods::Record.new.from_str(dup_unencoded_date, false).origin_info
+    @dup_copyright_date = Stanford::Mods::Record.new.from_str(dup_copyright_date, false).origin_info
     @dup_date = Stanford::Mods::Record.new.from_str(dup_date, false).origin_info
     @approximate_date = Stanford::Mods::Record.new.from_str(approximate_date, false).origin_info
     @questionable_date = Stanford::Mods::Record.new.from_str(questionable_date, false).origin_info
@@ -27,6 +28,7 @@ describe ModsDisplay::Imprint do
     @three_imprint_dates = Stanford::Mods::Record.new.from_str(three_imprint_dates, false).origin_info
     @qualified_imprint_date = Stanford::Mods::Record.new.from_str(qualified_imprint_date, false).origin_info
     @imprint_date_range = Stanford::Mods::Record.new.from_str(imprint_date_range, false).origin_info
+    @encoded_place = Stanford::Mods::Record.new.from_str(encoded_place, false).origin_info
   end
 
   describe "labels" do
@@ -107,6 +109,11 @@ describe ModsDisplay::Imprint do
         fields.length.should == 1
         fields.first.values.should == ["[ca. 1820]"]
       end
+      it "should handle copyright dates correctly" do
+        fields = mods_display_imprint(@dup_copyright_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["c1820"]
+      end
       it "should only return one when no attributes are present" do
         fields = mods_display_imprint(@dup_date).fields
         fields.length.should == 1
@@ -131,6 +138,13 @@ describe ModsDisplay::Imprint do
       end
     end
   end
+  describe "place processing" do
+    it "should exclude encoded places" do
+      fields = mods_display_imprint(@encoded_place).fields
+      fields.length.should == 1
+      fields.first.values.should == ["[Amsterdam]", "[United States]"]
+    end
+  end
   describe "to_html" do
     it "should return the display form if one is available" do
       html = mods_display_imprint(@display_form).to_html

data/spec/fixtures/imprint_fixtures.rb

@@ -4,7 +4,7 @@ module ImprintFixtures
       <mods>
         <originInfo>
           <edition>An edition</edition>
-          <place>A Place</place>
+          <place><placeTerm>A Place</placeTerm></place>
           <publisher>A Publisher</publisher>
           <dateIssued>An Issue Date</dateIssued>
           <dateOther>Another Date</dateOther>
@@ -16,7 +16,7 @@ module ImprintFixtures
     <<-MODS
       <mods>
         <originInfo>
-          <place>A Place</place>
+          <place><placeTerm>A Place</placeTerm></place>
           <publisher>A Publisher</publisher>
           <dateCreated>A Create Date</dateCreated>
           <dateIssued>An Issue Date</dateIssued>
@@ -42,7 +42,7 @@ module ImprintFixtures
     <<-MODS
       <mods>
         <originInfo>
-          <place>A Place</place>
+          <place><placeTerm>A Place</placeTerm></place>
           <publisher>A Publisher</publisher>
           <issuance>The Issuance</issuance>
           <dateCaptured>The Capture Date</dateCaptured>
@@ -54,12 +54,12 @@ module ImprintFixtures
     <<-MODS
       <mods>
         <originInfo>
-          <place>A Place</place>
+          <place><placeTerm>A Place</placeTerm></place>
           <publisher>A Publisher</publisher>
           <displayForm>The Display Form</displayForm>
         </originInfo>
         <originInfo displayLabel="TheLabel">
-          <place>A Place</place>
+          <place><placeTerm>A Place</placeTerm></place>
           <publisher>A Publisher</publisher>
           <displayForm>The Display Form</displayForm>
         </originInfo>
@@ -71,11 +71,11 @@ module ImprintFixtures
       <mods>
         <originInfo displayLabel="TheLabel">
           <edition>The edition</edition>
-          <place>A Place</place>
+          <place><placeTerm>A Place</placeTerm></place>
           <publisher>A Publisher</publisher>
         </originInfo>
         <originInfo displayLabel="IssuanceLabel">
-          <place>A Place</place>
+          <place><placeTerm>A Place</placeTerm></place>
           <publisher>A Publisher</publisher>
           <issuance>The Edition</issuance>
         </originInfo>
@@ -121,6 +121,16 @@ module ImprintFixtures
       </mods>
     MODS
   end
+  def dup_copyright_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateCreated encoding="marc">1820</dateCreated>
+          <dateCreated>c1820</dateCreated>
+        </originInfo>
+      </mods>
+    MODS
+  end
   def dup_date
     <<-MODS
       <mods>
@@ -189,4 +199,24 @@ module ImprintFixtures
       </mods>
     MODS
   end
+  def encoded_place
+    <<-MODS
+      <mods>
+        <originInfo>
+          <place>
+             <placeTerm type="code">ne</placeTerm>
+           </place>
+           <place>
+             <placeTerm type="text">[Amsterdam]</placeTerm>
+           </place>
+        </originInfo>
+        <originInfo>
+          <place>
+            <placeTerm type="code">us</placeTerm>
+            <placeTerm type="text">[United States]</placeTerm>
+          </place>
+        </originInfo>
+      </mods>
+    MODS
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-16 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: -181009527688708347
+      hash: 1044721319103259075
 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: -181009527688708347
+      hash: 1044721319103259075
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25