stanford-mods 1.1.2 → 1.1.3

data/spec/name_spec.rb

@@ -38,7 +38,7 @@ describe "name/author concepts" do
                                 <namePart>plain_other_role_mr</namePart>
                                 <role><roleTerm type='text' authority='marcrelator'>Actor</roleTerm></role>
                             </name>"
-                            
+
       @personal_no_role = "<name><namePart type='personal'>personal_no_role</namePart></name>"
       @personal_creator_code = "<name>
                                     <namePart type='personal'>personal_creator_code</namePart>
@@ -66,77 +66,77 @@ describe "name/author concepts" do
     context "marcrelator role Creator" do
       it "should find role with roleTerm type text" do
         @smods_rec.from_str(@mods_start + @plain_creator_text + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_creator_text'
+        expect(@smods_rec.main_author_w_date).to eq('plain_creator_text')
       end
       it "should find role with roleTerm type code" do
         @smods_rec.from_str(@mods_start + @plain_creator_code + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_creator_code'
+        expect(@smods_rec.main_author_w_date).to eq('plain_creator_code')
       end
       it "should skip names when role isn't marcrelator authority" do
         @smods_rec.from_str(@mods_start + @plain_creator_non_mr + @mods_end)
-        @smods_rec.main_author_w_date.should == nil
+        expect(@smods_rec.main_author_w_date).to be_nil
       end
       it "should skip names without roles in favor of marcrelator role of 'Creator'" do
         @smods_rec.from_str(@mods_start + @personal_no_role + @plain_creator_text + @other_no_role + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_creator_text'
+        expect(@smods_rec.main_author_w_date).to eq('plain_creator_text')
         @smods_rec.from_str(@mods_start + @corp_no_role + @plain_creator_code + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_creator_code'
+        expect(@smods_rec.main_author_w_date).to eq('plain_creator_code')
       end
       it "shouldn't care about name type" do
         @smods_rec.from_str(@mods_start + @personal_creator_code + @corp_creator_text + @mods_end)
-        @smods_rec.main_author_w_date.should == 'personal_creator_code'
+        expect(@smods_rec.main_author_w_date).to eq('personal_creator_code')
         @smods_rec.from_str(@mods_start + @personal_no_role + @corp_creator_text + @mods_end)
-        @smods_rec.main_author_w_date.should == 'corp_creator_text'
+        expect(@smods_rec.main_author_w_date).to eq('corp_creator_text')
       end
     end
-    
+
     context "marcrelator role Author" do
       it "should find role with roleTerm type text" do
         @smods_rec.from_str(@mods_start + @plain_author_text + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_author_text'
+        expect(@smods_rec.main_author_w_date).to eq('plain_author_text')
       end
       it "should find role with roleTerm type code" do
         @smods_rec.from_str(@mods_start + @plain_author_code + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_author_code'
+        expect(@smods_rec.main_author_w_date).to eq('plain_author_code')
       end
       it "should skip names when role isn't marcrelator authority" do
         @smods_rec.from_str(@mods_start + @plain_author_non_mr + @mods_end)
-        @smods_rec.main_author_w_date.should == nil
+        expect(@smods_rec.main_author_w_date).to be_nil
       end
       it "should skip names without roles in favor of marcrelator role of 'Author'" do
         @smods_rec.from_str(@mods_start + @personal_no_role + @plain_author_text + @other_no_role + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_author_text'
+        expect(@smods_rec.main_author_w_date).to eq('plain_author_text')
         @smods_rec.from_str(@mods_start + @corp_no_role + @personal_no_role + @plain_author_code + @mods_end)
-        @smods_rec.main_author_w_date.should == 'plain_author_code'
+        expect(@smods_rec.main_author_w_date).to eq('plain_author_code')
       end
       it "shouldn't care about name type" do
         @smods_rec.from_str(@mods_start + @personal_author_text + @corp_author_code + @mods_end)
-        @smods_rec.main_author_w_date.should == 'personal_author_text'
+        expect(@smods_rec.main_author_w_date).to eq('personal_author_text')
         @smods_rec.from_str(@mods_start + @personal_no_role + @corp_author_code + @mods_end)
-        @smods_rec.main_author_w_date.should == 'corp_author_code'
+        expect(@smods_rec.main_author_w_date).to eq('corp_author_code')
       end
     end
-    
+
     it "should be a String" do
       @smods_rec.from_str(@mods_start + @personal_author_text + @corp_creator_text + @mods_end)
-      @smods_rec.main_author_w_date.should be_an_instance_of(String)
+      expect(@smods_rec.main_author_w_date).to be_an_instance_of(String)
     end
-    
+
     it "should take first name with marcrelator role of 'Creator' or 'Author'" do
       @smods_rec.from_str(@mods_start + @personal_author_text + @corp_creator_text + @mods_end)
-      @smods_rec.main_author_w_date.should == 'personal_author_text'
+      expect(@smods_rec.main_author_w_date).to eq('personal_author_text')
       @smods_rec.from_str(@mods_start + @corp_creator_text + @personal_creator_code + @mods_end)
-      @smods_rec.main_author_w_date.should == 'corp_creator_text'
+      expect(@smods_rec.main_author_w_date).to eq('corp_creator_text')
     end
-    
+
     it "should take the first name without a role if there are no instances of marcrelator role 'Creator' or 'Actor'" do
       @smods_rec.from_str(@mods_start + @plain_author_non_mr + @personal_other_role + @personal_no_role + @plain_no_role + @mods_end)
-      @smods_rec.main_author_w_date.should == 'personal_no_role'
+      expect(@smods_rec.main_author_w_date).to eq('personal_no_role')
     end
-    
+
     it "should be nil if there is no name with marcrelator role of 'Creator' or 'Author' and no name without a role" do
       @smods_rec.from_str(@mods_start + @plain_author_non_mr + @personal_other_role + @mods_end)
-      @smods_rec.main_author_w_date.should == nil
+      expect(@smods_rec.main_author_w_date).to be_nil
     end
 
     it "should use the display name if it is present" do
@@ -153,7 +153,7 @@ describe "name/author concepts" do
       </name>
       </mods>"
       @smods_rec.from_str(m)
-      @smods_rec.main_author_w_date.should == 'q'
+      expect(@smods_rec.main_author_w_date).to eq('q')
     end
     it "should include dates, when available" do
       m = "<mods #{@ns_decl}><name type='personal'>
@@ -161,19 +161,19 @@ describe "name/author concepts" do
         <namePart type='date'>1984-</namePart>
       </name></mods>"
       @smods_rec.from_str(m)
-      @smods_rec.main_author_w_date.should == 'personal, 1984-'
+      expect(@smods_rec.main_author_w_date).to eq('personal, 1984-')
       m = "<mods #{@ns_decl}><name>
         <namePart>plain</namePart>
         <namePart type='date'>1954-</namePart>
       </name></mods>"
       @smods_rec.from_str(m)
-      @smods_rec.main_author_w_date.should == 'plain, 1954-'
+      expect(@smods_rec.main_author_w_date).to eq('plain, 1954-')
       m = "<mods #{@ns_decl}><name type='corporate'>
         <namePart>corporate</namePart>
         <namePart type='date'>1990-</namePart>
       </name></mods>"
       @smods_rec.from_str(m)
-      @smods_rec.main_author_w_date.should == 'corporate, 1990-'
+      expect(@smods_rec.main_author_w_date).to eq('corporate, 1990-')
     end
   end # main_author_w_date
 
@@ -210,33 +210,33 @@ describe "name/author concepts" do
       @addl_authors = @smods_rec.additional_authors_w_dates
     end
     it "should be an Array of Strings" do
-      @addl_authors.should be_an_instance_of(Array)
-      @addl_authors.first.should be_an_instance_of(String)
+      expect(@addl_authors).to be_an_instance_of(Array)
+      expect(@addl_authors.first).to be_an_instance_of(String)
     end
     it "should not include main author" do
-      @addl_authors.should_not include(@smods_rec.main_author_w_date)
+      expect(@addl_authors).not_to include(@smods_rec.main_author_w_date)
     end
     it "should include personal authors that are not main author" do
-      @addl_authors.should include('Crusty The Clown, 1990-')
+      expect(@addl_authors).to include('Crusty The Clown, 1990-')
     end
     it "should include corporate (and other) authors that are not main author" do
-      @addl_authors.should include('Watchful Eye, 1850-')
-      @addl_authors.should include('Exciting Prints')
+      expect(@addl_authors).to include('Watchful Eye, 1850-')
+      expect(@addl_authors).to include('Exciting Prints')
     end
     it "should include plain authors" do
-      @addl_authors.should include('plain')
+      expect(@addl_authors).to include('plain')
     end
     it "should include conference and other typed authors" do
-      @addl_authors.should include('conference')
-      @addl_authors.should include('family')
+      expect(@addl_authors).to include('conference')
+      expect(@addl_authors).to include('family')
     end
     it "should include dates, when available" do
-      @addl_authors.should include('Crusty The Clown, 1990-')
-      @addl_authors.should include('Watchful Eye, 1850-')
+      expect(@addl_authors).to include('Crusty The Clown, 1990-')
+      expect(@addl_authors).to include('Watchful Eye, 1850-')
     end
     it "should not include roles" do
-      @addl_authors.find { |a| a =~ Regexp.new('lithographer') }.should == nil
+      expect(@addl_authors.find { |a| a =~ Regexp.new('lithographer') }).to be_nil
     end
   end # additional_authors_w_dates
-  
-end
+
+end

data/spec/searchworks_basic_spec.rb

@@ -0,0 +1,49 @@
+# require 'spec_helper'
+# not using spec_helper here: testing require
+require 'stanford-mods/searchworks'
+
+describe 'Basic construction' do
+  before(:each) do
+    @dsxml =<<-EOF
+      <mods xmlns="http://www.loc.gov/mods/v3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3"
+        xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd">
+        <titleInfo>
+          <title>Electronic Theses and Dissertations</title>
+        </titleInfo>
+        <abstract>Abstract contents.</abstract>
+        <name type="corporate">
+          <namePart>Stanford University Libraries, Stanford Digital Repository</namePart>
+          <role>
+            <roleTerm authority="marcrelator" type="text">creator</roleTerm>
+          </role>
+        </name>
+        <typeOfResource collection="yes"/>
+        <language>
+          <languageTerm authority="iso639-2b" type="code">eng</languageTerm>
+        </language>
+        <subject>
+          <geographic>First Place</geographic>
+          <geographic>Other Place, Nation;</geographic>
+          <temporal>1890-1910</temporal>
+          <temporal>20th century</temporal>
+          <topic>Topic1: Boring Part</topic>
+        </subject>
+        <subject><temporal>another</temporal></subject>
+        <genre>first</genre>
+        <genre>second</genre>
+        <subject><topic>Topic2: The Interesting Part!</topic></subject>
+      </mods>
+    EOF
+  end
+
+  describe "from_str" do
+    it "should work" do
+      m = Stanford::Mods::Record.new
+      expect(m).not_to be_nil
+      m.from_str(@dsxml)
+      expect(m).not_to be_nil
+    end
+  end
+end
+

data/spec/searchworks_format_spec.rb

@@ -93,7 +93,7 @@ describe "Format fields (searchworks.rb)" do
         end
       end
     end # 'Book'
-  
+
     context "Computer File: typeOfResource 'software, multimedia'" do
       it "no genre (e.g. Dataset)" do
         m = "<mods #{@ns_decl}><typeOfResource>software, multimedia</typeOfResource></mods>"
@@ -121,7 +121,7 @@ describe "Format fields (searchworks.rb)" do
       @smods_rec.from_str(m)
       expect(@smods_rec.format).to eq ['Conference Proceedings']
     end
-  
+
     context "Journal/Periodical: typeOfResource 'text'," do
       it "genre 'article" do
         m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>article</genre></mods>"
@@ -143,7 +143,7 @@ describe "Format fields (searchworks.rb)" do
       @smods_rec.from_str(m)
       expect(@smods_rec.format).to eq ['Image']
     end
-    
+
     it "Manuscript/Archive: typeOfResource 'mixed material'" do
       m = "<mods #{@ns_decl}><typeOfResource>mixed material</typeOfResource></mods>"
       @smods_rec.from_str(m)
@@ -155,7 +155,7 @@ describe "Format fields (searchworks.rb)" do
       @smods_rec.from_str(m)
       expect(@smods_rec.format).to eq ['Map/Globe']
     end
-  
+
     it "Music - Recording: typeOfResource 'sound recording-musical'", :jira => 'GRYPHONDOR-207' do
       m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource></mods>"
       @smods_rec.from_str(m)
@@ -182,7 +182,7 @@ describe "Format fields (searchworks.rb)" do
       @smods_rec.from_str(m)
       expect(@smods_rec.format).to eq ['Other']
     end
-  
+
     context "Sound Recording:" do
       it "typeOfResource 'sound recording-nonmusical', genre 'sound", :jira => 'GRYPHONDOR-207' do
         m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
@@ -269,7 +269,7 @@ describe "Format fields (searchworks.rb)" do
       expect(@smods_rec.format).to eq []
     end
   end # format
-   
+
   context "format_main" do
     it "3D object: typeOfResource 'three dimensional object'" do
       m = "<mods #{@ns_decl}><typeOfResource>three dimensional object</typeOfResource></mods>"
@@ -628,4 +628,4 @@ describe "Format fields (searchworks.rb)" do
       expect(@smods_rec.sw_genre).to eq []
     end
   end # sw_genre
-end
+end

data/spec/searchworks_pub_dates_spec.rb

@@ -7,7 +7,7 @@ describe "Date methods (searchworks.rb)" do
     @smods_rec = Stanford::Mods::Record.new
     @ns_decl = "xmlns='#{Mods::MODS_NS}'"
   end
-  
+
   context "pub_dates" do
     it "should choose the first date" do
       m = "<mods #{@ns_decl}><originInfo>
@@ -17,7 +17,7 @@ describe "Date methods (searchworks.rb)" do
       </originInfo></mods>"
       @smods_rec = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_dates.should == ['1906','1904','1904']
+      expect(@smods_rec.pub_dates).to eq(['1906','1904','1904'])
     end
   end
 
@@ -28,7 +28,7 @@ describe "Date methods (searchworks.rb)" do
       </originInfo></mods>"
       @smods_rec = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '1904'
+      expect(@smods_rec.pub_date).to eq('1904')
     end
     it "should parse a date" do
       m = "<mods #{@ns_decl}><originInfo>
@@ -36,7 +36,7 @@ describe "Date methods (searchworks.rb)" do
       </originInfo></mods>"
       @smods_rec = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '1886'
+      expect(@smods_rec.pub_date).to eq('1886')
     end
     it "should remove question marks and brackets" do
       m = "<mods #{@ns_decl}><originInfo>
@@ -44,7 +44,7 @@ describe "Date methods (searchworks.rb)" do
       </originInfo></mods>"
       @smods_rec = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '1886'
+      expect(@smods_rec.pub_date).to eq('1886')
     end
     it 'should handle an s after the decade' do
       m = "<mods #{@ns_decl}><originInfo>
@@ -52,89 +52,87 @@ describe "Date methods (searchworks.rb)" do
       </originInfo></mods>"
       @smods_rec = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '1890'
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '1684'
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '1865'
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-       @smods_rec.pub_date.should == '1594'
+       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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-       @smods_rec.pub_year.should == '-700'
-       @smods_rec.pub_date.should == '-700'
-       @smods_rec.pub_date_sort.should =='-700'
-       @smods_rec.pub_date_facet.should == '300 B.C.'
+       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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date_facet.should == '19th century'
-      @smods_rec.pub_date_sort.should =='1800'
-      @smods_rec.pub_date.should == '18--'
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '1517'
-      @smods_rec.pub_date_sort.should =='1517'
-      @smods_rec.pub_date_facet.should == '1517'
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '14--'
-      @smods_rec.pub_date_sort.should =='1400'
-      @smods_rec.pub_date_facet.should == '15th century'
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-      @smods_rec.pub_date.should == '966'
-      @smods_rec.pub_date_sort.should =='0966'
-      @smods_rec.pub_date_facet.should == '966'
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-  
-      @smods_rec.pub_date.should == '8--'
-      @smods_rec.pub_date_sort.should =='0800'
-      @smods_rec.pub_date_facet.should == '9th century'
-    end  
+      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 = Stanford::Mods::Record.new
       @smods_rec.from_str(m)
-
-      @smods_rec.pub_date_display.should == '[186-?]'
-      @smods_rec.pub_date.should =='1860'
-      @smods_rec.pub_date_sort.should =='1860'
-      @smods_rec.pub_date_facet.should == '1860'
+      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
   end # pub_date
 
-  context "dates with u notation (198u, 19uu)" do    
+  context "dates with u notation (198u, 19uu)" do
     context "single digit u notation (198u)" do
       before(:all) do
         m = "<mods #{@ns_decl}>
@@ -148,16 +146,16 @@ describe "Date methods (searchworks.rb)" do
       it "get_u_year recognizes notation" do
         dates = ["198u", "9999"]
         uDate = @smods_rec.get_u_year dates
-        uDate.should eql("1980")
+        expect(uDate).to eql("1980")
       end
       it 'pub_date: 198u = 1980' do
-        @smods_rec.pub_date.should == '1980'
+        expect(@smods_rec.pub_date).to eq('1980')
       end
       it "pub_date_sort: 198u = 1980" do
-        @smods_rec.pub_date_sort.should =='1980'
+        expect(@smods_rec.pub_date_sort).to eq('1980')
       end
       it "pub_date_facet: 198u = 1980" do
-        @smods_rec.pub_date_facet.should == '1980'
+        expect(@smods_rec.pub_date_facet).to eq('1980')
       end
     end
     context "double digit u notation (19uu)" do
@@ -173,16 +171,16 @@ describe "Date methods (searchworks.rb)" do
       it "get_u_year recognizes notation" do
         dates = ["19uu", "9999"]
         uDate = @smods_rec.get_u_year dates
-        uDate.should eql("19--")
+        expect(uDate).to eql("19--")
       end
       it 'pub_date: 19uu = 19--' do
-        @smods_rec.pub_date.should == '19--'
+        expect(@smods_rec.pub_date).to eq('19--')
       end
       it "pub_date_sort: 19uu = 1900" do
-        @smods_rec.pub_date_sort.should =='1900'
+        expect(@smods_rec.pub_date_sort).to eq('1900')
       end
       it "pub_date_facet: 19uu = 20th century" do
-        @smods_rec.pub_date_facet.should == '20th century'
+        expect(@smods_rec.pub_date_facet).to eq('20th century')
       end
     end
   end # u notation
@@ -197,20 +195,20 @@ describe "Date methods (searchworks.rb)" do
       @smods_rec.from_str(m)
     end
     it 'should work on normal dates' do
-      @smods_rec.stub(:pub_date).and_return('1945')
-      @smods_rec.pub_date_sort.should == '1945'
+      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
-      @smods_rec.stub(:pub_date).and_return('945')
-      @smods_rec.pub_date_sort.should == '0945'
+      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
-      @smods_rec.stub(:pub_date).and_return('16--')
-      @smods_rec.pub_date_sort.should == '1600'
+      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
-      @smods_rec.stub(:pub_date).and_return('9--')
-      @smods_rec.pub_date_sort.should == '0900'
+      allow(@smods_rec).to receive(:pub_date).and_return('9--')
+      expect(@smods_rec.pub_date_sort).to eq('0900')
     end
   end
 

data/spec/searchworks_spec.rb

@@ -13,21 +13,21 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
       m = "<mods #{@ns_decl}><language><languageTerm authority='iso639-2b' type='code'>per ara, dut</languageTerm></language></mods>"
       @smods_rec.from_str m
       langs = @smods_rec.sw_language_facet
-      langs.size.should == 3
-      langs.should include("Persian")
-      langs.should include("Arabic")
-      langs.should include("Dutch")
-      langs.should_not include("Dutch; Flemish")
+      expect(langs.size).to eq(3)
+      expect(langs).to include("Persian")
+      expect(langs).to include("Arabic")
+      expect(langs).to include("Dutch")
+      expect(langs).not_to include("Dutch; Flemish")
     end
     it "should not have duplicates" do
       m = "<mods #{@ns_decl}><language><languageTerm type='code' authority='iso639-2b'>eng</languageTerm><languageTerm type='text'>English</languageTerm></language></mods>"
       @smods_rec.from_str m
       langs = @smods_rec.sw_language_facet
-      langs.size.should == 1
-      langs.should include("English")
-    end    
+      expect(langs.size).to eq 1
+      expect(langs).to include "English"
+    end
   end
-  
+
   context "sw author methods" do
     before(:all) do
       m = "<mods #{@ns_decl}><name type='personal'>
@@ -60,54 +60,54 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
       @smods_rec.from_str(m)
     end
     it "main author (for author_1xx_search)" do
-      @smods_rec.should_receive(:main_author_w_date) # in stanford-mods.rb
+      expect(@smods_rec).to receive(:main_author_w_date) # in stanford-mods.rb
       @smods_rec.sw_main_author
     end
     it "additional authors (for author_7xx_search)" do
-      @smods_rec.should_receive(:additional_authors_w_dates) # in stanford-mods.rb
+      expect(@smods_rec).to receive(:additional_authors_w_dates) # in stanford-mods.rb
       @smods_rec.sw_addl_authors
     end
     it "person authors (for author_person_facet, author_person_display)" do
-      @smods_rec.should_receive(:personal_names_w_dates) # in Mods gem
+      expect(@smods_rec).to receive(:personal_names_w_dates) # in Mods gem
       @smods_rec.sw_person_authors
     end
     it "non-person authors (for author_other_facet)" do
-      @smods_rec.sw_impersonal_authors.should == ['Watchful Eye, 1850-', 'Exciting Prints', 'plain', 'conference', 'family']
+      expect(@smods_rec.sw_impersonal_authors).to eq(['Watchful Eye, 1850-', 'Exciting Prints', 'plain', 'conference', 'family'])
     end
     it "corporate authors (for author_corp_display)" do
-      @smods_rec.sw_corporate_authors.should == ['Watchful Eye, 1850-', 'Exciting Prints']
+      expect(@smods_rec.sw_corporate_authors).to eq(['Watchful Eye, 1850-', 'Exciting Prints'])
     end
     it "meeting authors (for author_meeting_display)" do
-      @smods_rec.sw_meeting_authors.should == ['conference']
-    end    
+      expect(@smods_rec.sw_meeting_authors).to eq(['conference'])
+    end
     context "sort author" do
       it "should be a String" do
-        @smods_rec.sw_sort_author.should == 'qJerk'
+        expect(@smods_rec.sw_sort_author).to eq('qJerk')
       end
       it "should include the main author, as retrieved by :main_author_w_date" do
-        @smods_rec.should_receive(:main_author_w_date) # in stanford-mods.rb
+        expect(@smods_rec).to receive(:main_author_w_date) # in stanford-mods.rb
         @smods_rec.sw_sort_author
       end
       it "should append the sort title, as retrieved by :sort_title" do
-        @smods_rec.should_receive(:sort_title) # in Mods gem
+        expect(@smods_rec).to receive(:sort_title) # in Mods gem
         @smods_rec.sw_sort_author
       end
       it "should not begin or end with whitespace" do
-        @smods_rec.sw_sort_author.should == @smods_rec.sw_sort_author.strip
+        expect(@smods_rec.sw_sort_author).to eq(@smods_rec.sw_sort_author.strip)
       end
       it "should substitute the java Character.MAX_CODE_POINT for nil main_author so missing main authors sort last" do
         r = Stanford::Mods::Record.new
         r.from_str "<mods #{@ns_decl}><titleInfo><title>Jerk</title></titleInfo></mods>"
-        r.sw_sort_author.should =~ / Jerk$/
-        r.sw_sort_author.should match("\u{10FFFF}")
-        r.sw_sort_author.should match("\xF4\x8F\xBF\xBF")
+        expect(r.sw_sort_author).to match(/ Jerk$/)
+        expect(r.sw_sort_author).to match("\u{10FFFF}")
+        expect(r.sw_sort_author).to match("\xF4\x8F\xBF\xBF")
       end
       it "should not have any punctuation marks" do
         r = Stanford::Mods::Record.new
         r.from_str "<mods #{@ns_decl}><titleInfo><title>J,e.r;;;k</title></titleInfo></mods>"
-        r.sw_sort_author.should =~ / Jerk$/
+        expect(r.sw_sort_author).to match(/ Jerk$/)
       end
     end
   end # context sw author methods
 
-end
+end