stanford-mods 2.6.4 → 3.1.0

data/spec/searchworks_subject_raw_spec.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 describe "Searchworks mixin for Stanford::Mods::Record" do
   before(:all) do
-    @smods_rec = Stanford::Mods::Record.new
     @ns_decl = "xmlns='#{Mods::MODS_NS}'"
   end
 
@@ -18,7 +17,10 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
       @temporal = 'temporal'
       @s_title = 'title in subject'
       @topic = 'topic'
-      m = "<mods #{@ns_decl}>
+    end
+
+    let(:m) do
+      "<mods #{@ns_decl}>
         <genre>#{@genre}</genre>
         <subject><cartographics><coordinates>#{@cart_coord}</coordinates></cartographics></subject>
         <subject><genre>#{@s_genre}</genre></subject>
@@ -31,26 +33,30 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
         <subject><titleInfo><title>#{@s_title}</title></titleInfo></subject>
         <subject><topic>#{@topic}</topic></subject>
       </mods>"
+    end
+
+    before do
+      @smods_rec = Stanford::Mods::Record.new
       @smods_rec.from_str m
-      @sw_geographic_search = @smods_rec.sw_geographic_search
-      @sw_subject_titles    = @smods_rec.sw_subject_titles
-      @sw_subject_names     = @smods_rec.sw_subject_names
     end
 
-    context "sw_subject_names" do
+    context "subject_names" do
+      subject(:subject_names) do
+        @smods_rec.send(:subject_names)
+      end
       it "should contain <subject><name><namePart> values" do
-        expect(@sw_subject_names).to include(@s_name)
+        expect(subject_names).to include(@s_name)
       end
       it "should not contain non-name subject subelements" do
-        expect(@sw_subject_names).not_to include(@cart_coord)
-        expect(@sw_subject_names).not_to include(@s_genre)
-        expect(@sw_subject_names).not_to include(@geo)
-        expect(@sw_subject_names).not_to include(@geo_code)
-        expect(@sw_subject_names).not_to include(@hier_geo_country)
-        expect(@sw_subject_names).not_to include(@occupation)
-        expect(@sw_subject_names).not_to include(@temporal)
-        expect(@sw_subject_names).not_to include(@topic)
-        expect(@sw_subject_names).not_to include(@s_title)
+        expect(subject_names).not_to include(@cart_coord)
+        expect(subject_names).not_to include(@s_genre)
+        expect(subject_names).not_to include(@geo)
+        expect(subject_names).not_to include(@geo_code)
+        expect(subject_names).not_to include(@hier_geo_country)
+        expect(subject_names).not_to include(@occupation)
+        expect(subject_names).not_to include(@temporal)
+        expect(subject_names).not_to include(@topic)
+        expect(subject_names).not_to include(@s_title)
       end
       it "should not contain subject/name/role" do
         m = "<mods #{@ns_decl}>
@@ -63,7 +69,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               	</role>
               </name></subject></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_names.find { |sn| sn =~ /cre/ }).to be_nil
+        expect(@smods_rec.send(:subject_names).find { |sn| sn =~ /cre/ }).to be_nil
       end
       it "should not contain subject/name/affiliation" do
         m = "<mods #{@ns_decl}>
@@ -73,7 +79,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               	<affiliation>Chemistry Dept., American University</affiliation>
               </name></subject></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_names.find { |sn| sn =~ /Chemistry/ }).to be_nil
+        expect(@smods_rec.send(:subject_names).find { |sn| sn =~ /Chemistry/ }).to be_nil
       end
       it "should not contain subject/name/description" do
         m = "<mods #{@ns_decl}>
@@ -82,7 +88,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               	<description>American artist, 20th c.</description>
               </name></subject></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_names.find { |sn| sn =~ /artist/ }).to be_nil
+        expect(@smods_rec.send(:subject_names).find { |sn| sn =~ /artist/ }).to be_nil
       end
       it "should not include top level name element" do
         m = "<mods #{@ns_decl}>
@@ -91,7 +97,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               	<description>American artist, 20th c.</description>
               </name></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_names).to eq([])
+        expect(@smods_rec.send(:subject_names)).to eq([])
       end
       it "should have one value for each name element" do
         m = "<mods #{@ns_decl}>
@@ -104,59 +110,57 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               </subject>
               </mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_names).to eq(['first', 'second', 'third'])
+        expect(@smods_rec.send(:subject_names)).to eq(['first', 'second', 'third'])
       end
       it "should be an empty Array if there are no values in the mods" do
         m = "<mods #{@ns_decl}><note>notit</note></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_names).to eq([])
+        expect(@smods_rec.send(:subject_names)).to eq([])
       end
       it "should be an empty Array if there are empty values in the mods" do
         m = "<mods #{@ns_decl}><subject><name><namePart/></name></subject><note>notit</note></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_names).to eq([])
+        expect(@smods_rec.send(:subject_names)).to eq([])
       end
       context "combining subelements" do
-        before(:all) do
-          m = "<mods #{@ns_decl}>
-                <subject>
-                  <name>
-                    <namePart>first</namePart>
-                    <namePart>second</namePart>
-                  </name>
-                </subject>
-              </mods>"
-          @smods_rec.from_str m
+        let(:m) do
+          "<mods #{@ns_decl}>
+            <subject>
+              <name>
+                <namePart>first</namePart>
+                <namePart>second</namePart>
+              </name>
+            </subject>
+          </mods>"
         end
 
         it "uses a ', ' as the separator by default" do
-          expect(@smods_rec.sw_subject_names).to eq ['first, second']
-        end
-        it "honors any string value passed in for the separator" do
-          expect(@smods_rec.sw_subject_names(' --')).to eq(['first --second'])
+          expect(@smods_rec.send(:subject_names)).to eq ['first, second']
         end
       end
-    end # sw_subject_names
+    end
+
+    context "subject_titles" do
+      subject(:subject_titles) { @smods_rec.send(:subject_titles) }
 
-    context "sw_subject_titles" do
       it "should contain <subject><titleInfo> subelement values" do
-        expect(@sw_subject_titles).to include(@s_title)
+        expect(subject_titles).to include(@s_title)
       end
       it "should not contain non-name subject subelements" do
-        expect(@sw_subject_titles).not_to include(@cart_coord)
-        expect(@sw_subject_titles).not_to include(@s_genre)
-        expect(@sw_subject_titles).not_to include(@geo)
-        expect(@sw_subject_titles).not_to include(@geo_code)
-        expect(@sw_subject_titles).not_to include(@hier_geo_country)
-        expect(@sw_subject_titles).not_to include(@s_name)
-        expect(@sw_subject_titles).not_to include(@occupation)
-        expect(@sw_subject_titles).not_to include(@temporal)
-        expect(@sw_subject_titles).not_to include(@topic)
+        expect(subject_titles).not_to include(@cart_coord)
+        expect(subject_titles).not_to include(@s_genre)
+        expect(subject_titles).not_to include(@geo)
+        expect(subject_titles).not_to include(@geo_code)
+        expect(subject_titles).not_to include(@hier_geo_country)
+        expect(subject_titles).not_to include(@s_name)
+        expect(subject_titles).not_to include(@occupation)
+        expect(subject_titles).not_to include(@temporal)
+        expect(subject_titles).not_to include(@topic)
       end
       it "should not include top level titleInfo element" do
         m = "<mods #{@ns_decl}><titleInfo><title>Oklahoma</title></titleInfo></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_titles).to eq([])
+        expect(@smods_rec.send(:subject_titles)).to eq([])
       end
       it "should have one value for each titleInfo element" do
         m = "<mods #{@ns_decl}>
@@ -169,37 +173,34 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               </subject>
               </mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_titles).to eq(['first', 'second', 'third'])
+        expect(@smods_rec.send(:subject_titles)).to eq(['first', 'second', 'third'])
       end
       it "should be an empty Array if there are no values in the mods" do
         m = "<mods #{@ns_decl}><note>notit</note></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_titles).to eq([])
+        expect(@smods_rec.send(:subject_titles)).to eq([])
       end
       it "should be an empty Array if there are empty values in the mods" do
         m = "<mods #{@ns_decl}><subject><titleInfo><title/></titleInfo></subject><note>notit</note></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_subject_titles).to eq([])
+        expect(@smods_rec.send(:subject_titles)).to eq([])
       end
       context "combining subelements" do
-        before(:all) do
-          m = "<mods #{@ns_decl}>
-                <subject>
-                  <titleInfo>
-                    <title>first</title>
-                    <subTitle>second</subTitle>
-                  </titleInfo>
-                </subject>
-              </mods>"
-          @smods_rec.from_str m
+        let(:m) do
+          "<mods #{@ns_decl}>
+            <subject>
+              <titleInfo>
+                <title>first</title>
+                <subTitle>second</subTitle>
+              </titleInfo>
+            </subject>
+          </mods>"
         end
 
         it "uses a ' ' as the separator by default" do
-          expect(@smods_rec.sw_subject_titles).to eq ['first second']
-        end
-        it "honors any string value passed in for the separator" do
-          expect(@smods_rec.sw_subject_titles(' --')).to eq(['first --second'])
+          expect(@smods_rec.send(:subject_titles)).to eq ['first second']
         end
+
         it "includes all subelements in the order of occurrence" do
           m = "<mods #{@ns_decl}>
                 <subject>
@@ -213,52 +214,54 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
                 </subject>
               </mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_subject_titles).to eq(['1 2 3 4 5'])
+          expect(@smods_rec.send(:subject_titles)).to eq(['1 2 3 4 5'])
         end
       end
-    end # sw_subject_titles
+    end # subject_titles
 
     context "sw_geographic_search" do
+      subject(:geographic_search) { @smods_rec.geographic_search }
+
       it "should contain subject <geographic> subelement data" do
-        expect(@sw_geographic_search).to include(@geo)
+        expect(geographic_search).to include(@geo)
       end
       it "should contain subject <hierarchicalGeographic> subelement data" do
-        expect(@sw_geographic_search).to include(@hier_geo_country)
+        expect(geographic_search).to include(@hier_geo_country)
       end
       it "should contain translation of <geographicCode> subelement data with translated authorities" do
         m = "<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_geographic_search).to include('Estonia')
+        expect(@smods_rec.geographic_search).to include('Estonia')
       end
       it "should not contain other subject element data" do
-        expect(@sw_geographic_search).not_to include(@genre)
-        expect(@sw_geographic_search).not_to include(@cart_coord)
-        expect(@sw_geographic_search).not_to include(@s_genre)
-        expect(@sw_geographic_search).not_to include(@s_name)
-        expect(@sw_geographic_search).not_to include(@occupation)
-        expect(@sw_geographic_search).not_to include(@temporal)
-        expect(@sw_geographic_search).not_to include(@topic)
-        expect(@sw_geographic_search).not_to include(@s_title)
+        expect(geographic_search).not_to include(@genre)
+        expect(geographic_search).not_to include(@cart_coord)
+        expect(geographic_search).not_to include(@s_genre)
+        expect(geographic_search).not_to include(@s_name)
+        expect(geographic_search).not_to include(@occupation)
+        expect(geographic_search).not_to include(@temporal)
+        expect(geographic_search).not_to include(@topic)
+        expect(geographic_search).not_to include(@s_title)
       end
       it "should be [] if there are no values in the MODS" do
         m = "<mods #{@ns_decl}><note>notit</note></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_geographic_search).to eq([])
+        expect(@smods_rec.geographic_search).to eq([])
       end
       it "should not be empty Array if there are only subject/geographic elements" do
         m = "<mods #{@ns_decl}><subject><geographic>#{@geo}</geographic></subject></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_geographic_search).to eq([@geo])
+        expect(@smods_rec.geographic_search).to eq([@geo])
       end
       it "should not be empty Array if there are only subject/hierarchicalGeographic" do
         m = "<mods #{@ns_decl}><subject><hierarchicalGeographic><country>#{@hier_geo_country}</country></hierarchicalGeographic></subject></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_geographic_search).to eq([@hier_geo_country])
+        expect(@smods_rec.geographic_search).to eq([@hier_geo_country])
       end
       it "should not be empty Array if there are only subject/geographicCode elements" do
         m = "<mods #{@ns_decl}><subject><geographicCode authority='marcgac'>e-er</geographicCode></subject></mods>"
         @smods_rec.from_str m
-        expect(@smods_rec.sw_geographic_search).to eq(['Estonia'])
+        expect(@smods_rec.geographic_search).to eq(['Estonia'])
       end
       context "geographic subelement" do
         it "should have a separate value for each geographic element" do
@@ -270,12 +273,12 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
                 <subject><geographic>Washington (D.C.)</geographic></subject>
               </mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search).to eq(['Mississippi', 'Tippah County', 'Washington (D.C.)'])
+          expect(@smods_rec.geographic_search).to eq(['Mississippi', 'Tippah County', 'Washington (D.C.)'])
         end
         it "should be empty Array if there are only empty values in the MODS" do
           m = "<mods #{@ns_decl}><subject><geographic/></subject><note>notit</note></mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search).to eq([])
+          expect(@smods_rec.geographic_search).to eq([])
         end
       end
 
@@ -289,16 +292,16 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
                 <subject><hierarchicalGeographic><area>third</area></hierarchicalGeographic></subject>
               </mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search).to eq(['first', 'second', 'third'])
+          expect(@smods_rec.geographic_search).to eq(['first', 'second', 'third'])
         end
         it "should be empty Array if there are only empty values in the MODS" do
           m = "<mods #{@ns_decl}><subject><hierarchicalGeographic/></subject><note>notit</note></mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search).to eq([])
+          expect(@smods_rec.geographic_search).to eq([])
         end
         context "combining subelements" do
-          before(:all) do
-            m = "<mods #{@ns_decl}>
+          let(:m) do
+            "<mods #{@ns_decl}>
             <subject>
               <hierarchicalGeographic>
               	<country>Canada</country>
@@ -306,28 +309,26 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               	<city>Vancouver</city>
               </hierarchicalGeographic>
             </subject></mods>"
-            @smods_rec.from_str m
           end
 
           it "uses a space as the separator by default" do
-            expect(@smods_rec.sw_geographic_search).to eq ['Canada British Columbia Vancouver']
-          end
-          it "honors any string value passed in for the separator" do
-            expect(@smods_rec.sw_geographic_search(' --')).to eq(['Canada --British Columbia --Vancouver'])
+            expect(@smods_rec.geographic_search).to eq ['Canada British Columbia Vancouver']
           end
         end
       end # hierarchicalGeographic
 
       context "geographicCode subelement" do
-        before(:all) do
-          m = "<mods #{@ns_decl}>
+        let(:m) do
+          "<mods #{@ns_decl}>
             <subject><geographicCode authority='marcgac'>n-us-md</geographicCode></subject>
             <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
             <subject><geographicCode authority='marccountry'>mg</geographicCode></subject>
             <subject><geographicCode authority='iso3166'>us</geographicCode></subject>
           </mods>"
-          @smods_rec.from_str m
-          @geo_search_from_codes = @smods_rec.sw_geographic_search
+        end
+
+        before do
+          @geo_search_from_codes = @smods_rec.geographic_search
         end
 
         it "should not add untranslated values" do
@@ -354,12 +355,12 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
                 <subject><geographicCode authority='marcgac'>n-us-md</geographicCode></subject>
               </mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search).to eq(['Estonia', 'Madagascar', 'Maryland'])
+          expect(@smods_rec.geographic_search).to eq(['Estonia', 'Madagascar', 'Maryland'])
         end
         it "should be empty Array if there are only empty values in the MODS" do
           m = "<mods #{@ns_decl}><subject><geographicCode/></subject><note>notit</note></mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search).to eq([])
+          expect(@smods_rec.geographic_search).to eq([])
         end
         it "should add the translated value if it wasn't present already" do
           m = "<mods #{@ns_decl}>
@@ -367,8 +368,8 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
             <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
           </mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search.size).to eq(2)
-          expect(@smods_rec.sw_geographic_search).to include('Estonia')
+          expect(@smods_rec.geographic_search.size).to eq(2)
+          expect(@smods_rec.geographic_search).to include('Estonia')
         end
         it "should not add the translated value if it was already present" do
           m = "<mods #{@ns_decl}>
@@ -376,8 +377,8 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
             <subject><geographicCode authority='marcgac'>e-er</geographicCode></subject>
           </mods>"
           @smods_rec.from_str m
-          expect(@smods_rec.sw_geographic_search.size).to eq(1)
-          expect(@smods_rec.sw_geographic_search).to eq(['Estonia'])
+          expect(@smods_rec.geographic_search.size).to eq(1)
+          expect(@smods_rec.geographic_search).to eq(['Estonia'])
         end
       end
     end # sw_geographic_search

data/spec/searchworks_subject_spec.rb

@@ -26,11 +26,14 @@ describe "Subject fields (searchworks.rb)" do
           <subject><titleInfo><title>#{@s_title}</title></titleInfo></subject>
           <subject><topic>#{@topic}</topic></subject>
         </mods>"
+    m_no_subject = "<mods #{@ns_decl}><note>notit</note></mods>"
+    @ng_mods_no_subject = Nokogiri::XML(m_no_subject)
+  end
+
+  before(:each) do
     @smods_rec = Stanford::Mods::Record.new
     @smods_rec.from_str(@subject_mods)
     @ng_mods = Nokogiri::XML(@subject_mods)
-    m_no_subject = "<mods #{@ns_decl}><note>notit</note></mods>"
-    @ng_mods_no_subject = Nokogiri::XML(m_no_subject)
   end
 
   context "search fields" do
@@ -39,7 +42,7 @@ describe "Subject fields (searchworks.rb)" do
         m = "<mods #{@ns_decl}></mods>"
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(m)
-        expect(@smods_rec.topic_search).to be_nil
+        expect(@smods_rec.topic_search).to eq []
       end
       it "should contain subject <topic> subelement data" do
         expect(@smods_rec.topic_search).to include(@topic)
@@ -74,48 +77,21 @@ describe "Subject fields (searchworks.rb)" do
           @smods_rec.from_str(m)
           expect(@smods_rec.topic_search).to eq(['first', 'second', 'third'])
         end
-        it "should be nil if there are only empty values in the MODS" do
+        it "should be empty if there are only empty values in the MODS" do
           m = "<mods #{@ns_decl}><subject><topic/></subject><note>notit</note></mods>"
           @smods_rec = Stanford::Mods::Record.new
           @smods_rec.from_str(m)
-          expect(@smods_rec.topic_search).to be_nil
+          expect(@smods_rec.topic_search).to eq []
         end
       end
     end # topic_search
 
-    context "geographic_search" do
-      it "should call sw_geographic_search (from stanford-mods gem)" do
-        m = "<mods #{@ns_decl}><subject><geographic>#{@geo}</geographic></subject></mods>"
-        @smods_rec = Stanford::Mods::Record.new
-        @smods_rec.from_str(m)
-        expect(@smods_rec).to receive(:sw_geographic_search)
-        @smods_rec.geographic_search
-      end
-      it "should log an info message when it encounters a geographicCode encoding it doesn't translate" do
-        m = "<mods #{@ns_decl}><subject><geographicCode authority='iso3166'>ca</geographicCode></subject></mods>"
-        @smods_rec = Stanford::Mods::Record.new
-        @smods_rec.from_str(m)
-        expect(@smods_rec.sw_logger).to receive(:info).with(/ has subject geographicCode element with untranslated encoding \(iso3166\): <geographicCode authority=.*>ca<\/geographicCode>/)
-        @smods_rec.geographic_search
-      end
-    end # geographic_search
-
     context "subject_other_search" do
-      it "should call sw_subject_names (from stanford-mods gem)" do
-        smods_rec = Stanford::Mods::Record.new
-        smods_rec.from_str(@subject_mods)
-        expect(smods_rec).to receive(:sw_subject_names)
-        smods_rec.subject_other_search
-      end
-      it "should call sw_subject_titles (from stanford-mods gem)" do
-        expect(@smods_rec).to receive(:sw_subject_titles)
-        @smods_rec.subject_other_search
-      end
       it "should be nil if there are no values in the MODS" do
         m = "<mods #{@ns_decl}></mods>"
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(m)
-        expect(@smods_rec.subject_other_search).to be_nil
+        expect(@smods_rec.subject_other_search).to eq []
       end
       it "should contain subject <name> SUBelement data" do
         expect(@smods_rec.subject_other_search).to include(@s_name)
@@ -173,7 +149,7 @@ describe "Subject fields (searchworks.rb)" do
           m = "<mods #{@ns_decl}><subject><occupation/></subject><note>notit</note></mods>"
           @smods_rec = Stanford::Mods::Record.new
           @smods_rec.from_str(m)
-          expect(@smods_rec.subject_other_search).to be_nil
+          expect(@smods_rec.subject_other_search).to eq []
         end
       end
     end # subject_other_search
@@ -182,7 +158,7 @@ describe "Subject fields (searchworks.rb)" do
       it "should be nil if there are no values in the MODS" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@ng_mods_no_subject.to_s)
-        expect(@smods_rec.subject_other_subvy_search).to be_nil
+        expect(@smods_rec.subject_other_subvy_search).to eq []
       end
       it "should contain subject <temporal> subelement data" do
         expect(@smods_rec.subject_other_subvy_search).to include(@temporal)
@@ -226,18 +202,11 @@ describe "Subject fields (searchworks.rb)" do
           @smods_rec.from_str(m)
           expect(@smods_rec.subject_other_subvy_search).to eq(['1890-1910', '20th century', 'another'])
         end
-        it "should log an info message when it encounters an encoding it doesn't translate" do
-          m = "<mods #{@ns_decl}><subject><temporal encoding='iso8601'>197505</temporal></subject></mods>"
-          @smods_rec = Stanford::Mods::Record.new
-          @smods_rec.from_str(m)
-          expect(@smods_rec.sw_logger).to receive(:info).with(/ has subject temporal element with untranslated encoding: <temporal encoding=.*>197505<\/temporal>/)
-          @smods_rec.subject_other_subvy_search
-        end
         it "should be nil if there are only empty values in the MODS" do
           m = "<mods #{@ns_decl}><subject><temporal/></subject><note>notit</note></mods>"
           @smods_rec = Stanford::Mods::Record.new
           @smods_rec.from_str(m)
-          expect(@smods_rec.subject_other_subvy_search).to be_nil
+          expect(@smods_rec.subject_other_subvy_search).to eq []
         end
       end
 
@@ -258,20 +227,16 @@ describe "Subject fields (searchworks.rb)" do
           m = "<mods #{@ns_decl}><subject><genre/></subject><note>notit</note></mods>"
           @smods_rec = Stanford::Mods::Record.new
           @smods_rec.from_str(m)
-          expect(@smods_rec.subject_other_subvy_search).to be_nil
+          expect(@smods_rec.subject_other_subvy_search).to eq []
         end
       end
     end # subject_other_subvy_search
 
     context "subject_all_search" do
-      before :each do
-        allow(@smods_rec.sw_logger).to receive(:info).with(/ has subject geographicCode element with untranslated encoding \(iso3166\): <geographicCode authority=.*>us<\/geographicCode>/)
-      end
-
       it "should be nil if there are no values in the MODS" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@ng_mods_no_subject.to_s)
-        expect(@smods_rec.subject_all_search).to be_nil
+        expect(@smods_rec.subject_all_search).to eq []
       end
       it "should not contain cartographic sub element" do
         expect(@smods_rec.subject_all_search).not_to include(@cart_coord)
@@ -283,7 +248,6 @@ describe "Subject fields (searchworks.rb)" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@subject_mods)
         ## need to re-allow/expect :info message with newly assigned object
-        expect(@smods_rec.sw_logger).to receive(:info).with(/ has subject geographicCode element with untranslated encoding \(iso3166\): <geographicCode authority=.*>us<\/geographicCode>/)
         expect(@smods_rec.subject_all_search).to include(@s_genre)
         expect(@smods_rec.subject_all_search).to include(@geo)
         expect(@smods_rec.subject_all_search).to include(@hier_geo_country)
@@ -327,7 +291,7 @@ describe "Subject fields (searchworks.rb)" do
       it "should be nil if there are no values" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@ng_mods_no_subject.to_s)
-        expect(@smods_rec.topic_facet).to be_nil
+        expect(@smods_rec.topic_facet).to eq []
       end
     end
 
@@ -351,10 +315,10 @@ describe "Subject fields (searchworks.rb)" do
         expect(@smods_rec.geographic_facet).to include('backslash')
         expect(@smods_rec.geographic_facet).to include('internal, punct;uation')
       end
-      it "should be nil if there are no values" do
+      it "should be empty if there are no values" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@ng_mods_no_subject.to_s)
-        expect(@smods_rec.geographic_facet).to be_nil
+        expect(@smods_rec.geographic_facet).to eq []
       end
     end
 
@@ -373,10 +337,10 @@ describe "Subject fields (searchworks.rb)" do
         expect(@smods_rec.era_facet).to include('backslash')
         expect(@smods_rec.era_facet).to include('internal, punct;uation')
       end
-      it "should be nil if there are no values" do
+      it "should be empty if there are no values" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@ng_mods_no_subject.to_s)
-        expect(@smods_rec.era_facet).to be_nil
+        expect(@smods_rec.era_facet).to eq []
       end
     end
   end # facet fields

data/spec/searchworks_title_spec.rb

@@ -3,7 +3,7 @@ describe 'title fields (searchworks.rb)' do
   before(:all) do
     @smods_rec = Stanford::Mods::Record.new
     @ns_decl = "xmlns='#{Mods::MODS_NS}'"
-    m = "<mods #{@ns_decl}><titleInfo><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle><nonSort>The</nonSort></titleInfo></mods>"
+    m = "<mods #{@ns_decl}><titleInfo><nonSort>The</nonSort><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle></titleInfo></mods>"
     @smods_rec.from_str m
   end
 
@@ -19,7 +19,7 @@ describe 'title fields (searchworks.rb)' do
 
   context 'blank title node' do
     it 'should deal with a second blank titleInfo node' do
-      m = "<mods #{@ns_decl}><titleInfo> </titleInfo><otherStuff>goes here</otherStuff><titleInfo><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle><nonSort>The</nonSort></titleInfo></mods>"
+      m = "<mods #{@ns_decl}><titleInfo> </titleInfo><otherStuff>goes here</otherStuff><titleInfo><nonSort>The</nonSort><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle>></titleInfo></mods>"
       smods_rec_blank_node = Stanford::Mods::Record.new
       smods_rec_blank_node.from_str m
       expect(smods_rec_blank_node.sw_short_title).to eq 'The Jerk'
@@ -113,7 +113,7 @@ describe 'title fields (searchworks.rb)' do
               <subTitle>a history</subTitle>
             </titleInfo></mods>"
           @smods_rec.from_str(m)
-          expect(@smods_rec.sw_full_title).to eq 'The Olympics : a history.'
+          expect(@smods_rec.sw_full_title).to eq 'The Olympics: a history.'
         end #
         # "end subtitle with period" - see above
         it 'subtitle already ends with period' do
@@ -389,7 +389,7 @@ describe 'title fields (searchworks.rb)' do
             <subTitle>a history</subTitle>
           </titleInfo></mods>"
         @smods_rec.from_str(m)
-        expect(@smods_rec.sw_title_display).to eq 'The Olympics : a history'
+        expect(@smods_rec.sw_title_display).to eq 'The Olympics: a history'
       end #
       # "end subtitle with period" - see above
       it 'subtitle already ends with period' do
@@ -680,7 +680,7 @@ describe 'title fields (searchworks.rb)' do
     end
     it 'additional titles' do
       expect(@mccarthy_smods_rec.sw_addl_titles).to eql []
-      expect(@insp_general_smods_rec.sw_addl_titles).to eql []
+      expect(@insp_general_smods_rec.sw_addl_titles).to eql ['Semiannual report to Congress (Online)']
       expect(@cfb_smods_rec.sw_addl_titles).to eql []
       expect(@all_smods_rec.sw_addl_titles).to eql []
     end

data/stanford-mods.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'mods', '~> 2.2'
+  gem.add_dependency 'mods', '~> 3.0', '>= 3.0.1'
   # active_support for .ordinalize, eg. 1 -> 1st, 2 -> 2nd for centuries
   gem.add_dependency 'activesupport'