stanford-mods 1.3.3 → 1.3.4

data/spec/searchworks_pub_dates_spec.rb

@@ -3,209 +3,212 @@ require 'spec_helper'
 
 describe "Date methods (searchworks.rb)" do
 
-  before(:all) do
-    @ns_decl = "xmlns='#{Mods::MODS_NS}'"
-  end
+  let(:ns_decl) { "xmlns='#{Mods::MODS_NS}'" }
 
   context "pub_dates" do
-    it "should choose the first date" do
-      m = "<mods #{@ns_decl}><originInfo>
-      <dateCreated>1904</dateCreated>
-      <dateCreated>1904</dateCreated>
-      <dateIssued>1906</dateIssued>
-      </originInfo></mods>"
-      @smods_rec = Stanford::Mods::Record.new
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_dates).to eq(['1906','1904','1904'])
+    it "puts dateIssued values before dateCreated values" do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateCreated>1904</dateCreated>
+          <dateCreated>1904</dateCreated>
+          <dateIssued>1906</dateIssued>
+        </originInfo></mods>"
+      smods_rec = Stanford::Mods::Record.new
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_dates).to eq(['1906', '1904', '1904'])
     end
   end
 
   context "pub_date" do
-    before :each do
-      @smods_rec = Stanford::Mods::Record.new
-    end
+    let(:smods_rec) { Stanford::Mods::Record.new }
 
-    it "should choose the first date" do
-      m = "<mods #{@ns_decl}><originInfo>
-      <dateCreated>1904</dateCreated>
-      </originInfo></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1904')
-    end
-    it "should parse a date" do
-      m = "<mods #{@ns_decl}><originInfo>
-      <dateCreated>Aug. 3rd, 1886</dateCreated>
-      </originInfo></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1886')
-    end
-    it "should remove question marks and brackets" do
-      m = "<mods #{@ns_decl}><originInfo>
-      <dateCreated>Aug. 3rd, [18]86?</dateCreated>
-      </originInfo></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1886')
-    end
-    it 'should handle an s after the decade' do
-      m = "<mods #{@ns_decl}><originInfo>
-      <dateCreated>early 1890s</dateCreated>
-      </originInfo></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1890')
-    end
-    it 'should choose a date ending with CE if there are multiple dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>7192 AM (li-Adam) / 1684 CE</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1684')
-    end
-    it 'should handle hyphenated range dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>1282 AH / 1865-6 CE</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1865')
-    end
-    it 'should work with multiple 4 digit dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateCreated>Text dated June 4, 1594; miniatures added by 1596</dateCreated></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1594')
-    end
-    it 'should work on 3 digit BC dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateCreated>300 B.C.</dateCreated></originInfo>"
-      @smods_rec.from_str(m)
-       expect(@smods_rec.pub_year).to eq('-700')
-       expect(@smods_rec.pub_date).to eq('-700')
-       expect(@smods_rec.pub_date_sort).to eq('-700')
-       expect(@smods_rec.pub_date_facet).to eq('300 B.C.')
-    end
-    it 'should handle century based dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>13th century AH / 19th CE</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date_facet).to eq('19th century')
-      expect(@smods_rec.pub_date_sort).to eq('1800')
-      expect(@smods_rec.pub_date).to eq('18--')
-    end
-    it 'should handle multiple CE dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>6 Dhu al-Hijjah 923 AH / 1517 CE -- 7 Rabi I 924 AH / 1518 CE</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('1517')
-      expect(@smods_rec.pub_date_sort).to eq('1517')
-      expect(@smods_rec.pub_date_facet).to eq('1517')
-    end
-    it 'should handle this case from walters' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>Late 14th or early 15th century CE</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('14--')
-      expect(@smods_rec.pub_date_sort).to eq('1400')
-      expect(@smods_rec.pub_date_facet).to eq('15th century')
-    end
-    it 'should work on 3 digit dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>966 CE</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('966')
-      expect(@smods_rec.pub_date_sort).to eq('0966')
-      expect(@smods_rec.pub_date_facet).to eq('966')
-    end
-    it 'should work on 3 digit dates' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>3rd century AH / 9th CE</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date).to eq('8--')
-      expect(@smods_rec.pub_date_sort).to eq('0800')
-      expect(@smods_rec.pub_date_facet).to eq('9th century')
-    end
-    it 'should use the dateIssued without marc encoding for pub_date_display and the one with marc encoding for indexing, sorting and faceting' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>[186-?]</dateIssued><dateIssued encoding=\"marc\">1860</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date_display).to eq('[186-?]')
-      expect(@smods_rec.pub_date).to eq('1860')
-      expect(@smods_rec.pub_date_sort).to eq('1860')
-      expect(@smods_rec.pub_date_facet).to eq('1860')
-    end
-    it 'should use the dateIssued without marc encoding for pub_date_display and the one with marc encoding for indexing, sorting and faceting' do
-      m = "<mods #{@ns_decl}><originInfo><dateIssued>1860?]</dateIssued><dateIssued encoding=\"marc\">186?</dateIssued><issuance>monographic</issuance></originInfo>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.pub_date_display).to eq('1860?]')
-      expect(@smods_rec.pub_date).to eq('1860')
-      expect(@smods_rec.pub_date_sort).to eq('1860')
-      expect(@smods_rec.pub_date_facet).to eq('1860')
+    it "uses dateCreated if no dateIssued" do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateCreated>1904</dateCreated>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1904')
+    end
+    it "parses date" do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateCreated>Aug. 3rd, 1886</dateCreated>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1886')
+    end
+    it "ignores question marks and square brackets" do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateCreated>Aug. 3rd, [18]86?</dateCreated>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1886')
+    end
+    it 'handles an s after the decade' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateCreated>early 1890s</dateCreated>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1890')
+    end
+    it 'chooses date ending with CE if there are other choices' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>7192 AM (li-Adam) / 1684 CE</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1684')
+    end
+    it 'handles 1865-6 (hyphenated range dates)' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>1282 AH / 1865-6 CE</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1865')
+    end
+    it 'takes first occurring 4 digit date in string' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateCreated>Text dated June 4, 1594; miniatures added by 1596</dateCreated>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1594')
+    end
+    it '3 digit BC dates are "B.C." in pub_date_facet and negative in pub_date_sort, pub_year, and pub_date' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateCreated>300 B.C.</dateCreated>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_year).to eq('-700')
+      expect(smods_rec.pub_date).to eq('-700')
+      expect(smods_rec.pub_date_sort).to eq('-700')
+      expect(smods_rec.pub_date_facet).to eq('300 B.C.')
+    end
+    it '"19th CE" becomes 1800 for pub_date_sort, 19th centruy for pub_date_facet' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>13th century AH / 19th CE</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date_facet).to eq('19th century')
+      expect(smods_rec.pub_date_sort).to eq('1800')
+      expect(smods_rec.pub_date).to eq('18--')
+    end
+    it 'takes first of multiple CE dates' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>6 Dhu al-Hijjah 923 AH / 1517 CE -- 7 Rabi I 924 AH / 1518 CE</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('1517')
+      expect(smods_rec.pub_date_sort).to eq('1517')
+      expect(smods_rec.pub_date_facet).to eq('1517')
+    end
+    it 'handles "Late 14th or early 15th century CE" from walters' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>Late 14th or early 15th century CE</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('14--')
+      expect(smods_rec.pub_date_sort).to eq('1400')
+      expect(smods_rec.pub_date_facet).to eq('15th century')
+    end
+    it 'explicit 3 digit dates have correct pub_date_sort and pub_date_facet' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>966 CE</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('966')
+      expect(smods_rec.pub_date_sort).to eq('0966')
+      expect(smods_rec.pub_date_facet).to eq('966')
+    end
+    it 'single digit century dates have correct pub_date_sort and pub_date_facet' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>3rd century AH / 9th CE</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date).to eq('8--')
+      expect(smods_rec.pub_date_sort).to eq('0800')
+      expect(smods_rec.pub_date_facet).to eq('9th century')
+    end
+    it 'uses dateIssued without marc encoding for pub_date_display and the one with marc encoding for indexing, sorting and faceting' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>[186-?]</dateIssued><dateIssued encoding=\"marc\">1860</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date_display).to eq('[186-?]')
+      expect(smods_rec.pub_date).to eq('1860')
+      expect(smods_rec.pub_date_sort).to eq('1860')
+      expect(smods_rec.pub_date_facet).to eq('1860')
+    end
+    it 'uses dateIssued without marc encoding for pub_date_display and the one with marc encoding for indexing, sorting and faceting' do
+      m = "<mods #{ns_decl}><originInfo>
+          <dateIssued>1860?]</dateIssued><dateIssued encoding=\"marc\">186?</dateIssued>
+        </originInfo></mods>"
+      smods_rec.from_str(m)
+      expect(smods_rec.pub_date_display).to eq('1860?]')
+      expect(smods_rec.pub_date).to eq('1860')
+      expect(smods_rec.pub_date_sort).to eq('1860')
+      expect(smods_rec.pub_date_facet).to eq('1860')
     end
   end # pub_date
 
   context "dates with u notation (198u, 19uu)" do
     context "single digit u notation (198u)" do
-      before(:all) do
-        m = "<mods #{@ns_decl}>
+      let(:smods_rec) do
+        m = "<mods #{ns_decl}>
         <originInfo>
           <dateIssued encoding=\"marc\" point=\"start\" keyDate=\"yes\">198u</dateIssued>
           <dateIssued encoding=\"marc\" point=\"end\">9999</dateIssued>
         </originInfo></mods>"
-        @smods_rec = Stanford::Mods::Record.new
-        @smods_rec.from_str(m)
-      end
-      it "get_u_year recognizes notation" do
-        dates = ["198u", "9999"]
-        uDate = @smods_rec.get_u_year dates
-        expect(uDate).to eql("1980")
+        smr = Stanford::Mods::Record.new
+        smr.from_str(m)
+        smr
       end
       it 'pub_date: 198u = 1980' do
-        expect(@smods_rec.pub_date).to eq('1980')
+        expect(smods_rec.pub_date).to eq('1980')
       end
       it "pub_date_sort: 198u = 1980" do
-        expect(@smods_rec.pub_date_sort).to eq('1980')
+        expect(smods_rec.pub_date_sort).to eq('1980')
       end
       it "pub_date_facet: 198u = 1980" do
-        expect(@smods_rec.pub_date_facet).to eq('1980')
+        expect(smods_rec.pub_date_facet).to eq('1980')
       end
     end
     context "double digit u notation (19uu)" do
-      before(:all) do
-        m = "<mods #{@ns_decl}>
+      let(:smods_rec) do
+        m = "<mods #{ns_decl}>
         <originInfo>
           <dateIssued encoding=\"marc\" point=\"start\" keyDate=\"yes\">19uu</dateIssued>
           <dateIssued encoding=\"marc\" point=\"end\">9999</dateIssued>
         </originInfo></mods>"
-        @smods_rec = Stanford::Mods::Record.new
-        @smods_rec.from_str(m)
-      end
-      it "get_u_year recognizes notation" do
-        dates = ["19uu", "9999"]
-        uDate = @smods_rec.get_u_year dates
-        expect(uDate).to eql("19--")
+        smr = Stanford::Mods::Record.new
+        smr.from_str(m)
+        smr
       end
       it 'pub_date: 19uu = 19--' do
-        expect(@smods_rec.pub_date).to eq('19--')
+        expect(smods_rec.pub_date).to eq('19--')
       end
       it "pub_date_sort: 19uu = 1900" do
-        expect(@smods_rec.pub_date_sort).to eq('1900')
+        expect(smods_rec.pub_date_sort).to eq('1900')
       end
       it "pub_date_facet: 19uu = 20th century" do
-        expect(@smods_rec.pub_date_facet).to eq('20th century')
+        expect(smods_rec.pub_date_facet).to eq('20th century')
       end
     end
   end # u notation
 
-
   context 'pub_date_sort' do
-    before :all do
-      m = "<mods #{@ns_decl}><originInfo>
-      <dateCreated>Aug. 3rd, 1886</dateCreated>
-      </originInfo></mods>"
-      @smods_rec = Stanford::Mods::Record.new
-      @smods_rec.from_str(m)
-    end
-    it 'should work on normal dates' do
-      allow(@smods_rec).to receive(:pub_date).and_return('1945')
-      expect(@smods_rec.pub_date_sort).to eq('1945')
-    end
-    it 'should work on 3 digit dates' do
-      allow(@smods_rec).to receive(:pub_date).and_return('945')
-      expect(@smods_rec.pub_date_sort).to eq('0945')
-    end
-    it 'should work on century dates' do
-      allow(@smods_rec).to receive(:pub_date).and_return('16--')
-      expect(@smods_rec.pub_date_sort).to eq('1600')
-    end
-    it 'should work on 3 digit century dates' do
-      allow(@smods_rec).to receive(:pub_date).and_return('9--')
-      expect(@smods_rec.pub_date_sort).to eq('0900')
+    let(:smods_rec) { Stanford::Mods::Record.new }
+    it 'four digits' do
+      allow(smods_rec).to receive(:pub_date).and_return('1945')
+      expect(smods_rec.pub_date_sort).to eq('1945')
+    end
+    it '3 digits' do
+      allow(smods_rec).to receive(:pub_date).and_return('945')
+      expect(smods_rec.pub_date_sort).to eq('0945')
+    end
+    it '16--' do
+      allow(smods_rec).to receive(:pub_date).and_return('16--')
+      expect(smods_rec.pub_date_sort).to eq('1600')
+    end
+    it '9--' do
+      allow(smods_rec).to receive(:pub_date).and_return('9--')
+      expect(smods_rec.pub_date_sort).to eq('0900')
     end
   end
 

data/spec/spec_helper.rb

@@ -1,10 +1,21 @@
 require 'coveralls'
 Coveralls.wear!
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 require 'stanford-mods'
 
-# RSpec.configure do |config|
-# end
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
+  #config.order = :random
+end

data/stanford-mods.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'mods', '~> 2.0.2'
+  # active_support for .ordinalize, eg. 1 -> 1st, 2 -> 2nd for centuries
+  gem.add_dependency 'activesupport'
 
   # Runtime dependencies
   # gem.add_runtime_dependency 'nokogiri'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +120,20 @@ files:
 - Rakefile
 - config/mappings_hash.rb
 - lib/stanford-mods.rb
+- lib/stanford-mods/date_parsing.rb
 - lib/stanford-mods/geo_spatial.rb
 - lib/stanford-mods/name.rb
+- lib/stanford-mods/origin_info.rb
 - lib/stanford-mods/physical_location.rb
 - lib/stanford-mods/searchworks.rb
 - lib/stanford-mods/searchworks_languages.rb
+- lib/stanford-mods/searchworks_subjects.rb
 - lib/stanford-mods/version.rb
+- spec/date_parsing_spec.rb
+- spec/fixtures/spotlight_pub_date_data.rb
 - spec/geo_spatial_spec.rb
 - spec/name_spec.rb
+- spec/origin_info_spec.rb
 - spec/physical_location_spec.rb
 - spec/searchworks_basic_spec.rb
 - spec/searchworks_format_spec.rb
@@ -148,8 +168,11 @@ signing_key:
 specification_version: 4
 summary: Stanford specific wrangling of MODS metadata
 test_files:
+- spec/date_parsing_spec.rb
+- spec/fixtures/spotlight_pub_date_data.rb
 - spec/geo_spatial_spec.rb
 - spec/name_spec.rb
+- spec/origin_info_spec.rb
 - spec/physical_location_spec.rb
 - spec/searchworks_basic_spec.rb
 - spec/searchworks_format_spec.rb