spotlight-dor-resources 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802c000f217f5bffac45eeb8cd3622426f952c2b
-  data.tar.gz: b14c29105325cb00da514397812df7a5c333e14e
+  metadata.gz: 534c3d40d1d186aca706291383b277b9cb0e0cf5
+  data.tar.gz: 53c135866d04b314fea7bfb3bf9928552bd1ee85
 SHA512:
-  metadata.gz: 1f3834e96cdbb9edf59100b3bb782af5731d51151eaa7e55363ae617267fc1a937744eb84e9299e58c2192ef2fed1403c875b8740e25dc1ad8c9dbc5eb01f06d
-  data.tar.gz: 0f24b3fccaa36d56e215f1f8bd4582971e371f7194976691f545d449ae55b77fb457fc6b23851ce47a19e14777acfaa7a05e5024e83beaeb592c5eddd3905123
+  metadata.gz: b938262cb1da8a5fc3fc1e6c683ec34d502306bd3b0ccbf917d19141907203226af358649bad002e00ade0539a83793756e6e7a6f7bfd0c9fc093ed7f2b8a468
+  data.tar.gz: d377966f349fc1e1d627985e095729a7a76cbb1d24eb4afbd003c5375be501da5e50c72f93391e6136dddb8ac274aa657ceda00b98e3b69dae5f87c7b293cbb6

data/app/models/spotlight/resources/dor_resource.rb

@@ -59,6 +59,9 @@ module Spotlight::Resources
     rescue RuntimeError => e
       logger.error("Error processing #{resource.druid}: #{e}")
       nil
+    rescue => e
+      logger.error("Error processing #{resource.druid}: #{e}")
+      raise e
     end
 
     ##

data/lib/spotlight/dor/indexer.rb

@@ -26,11 +26,16 @@ module Spotlight::Dor
 
     private
 
+    # Functionality grouped when code was moved to the StanfordMods gem
     concerning :StanfordMods do
       included do
         before_index :add_author_no_collector
+        before_index :add_box
         before_index :add_collector
+        before_index :add_folder
         before_index :add_genre
+        before_index :add_location
+        before_index :add_series
       end
 
       # add author_no_collector_ssim solr field containing the person authors, excluding collectors
@@ -39,92 +44,30 @@ module Spotlight::Dor
         insert_field solr_doc, 'author_no_collector', sdb.smods_rec.non_collector_person_authors, :symbol # _ssim field
       end
 
+      def add_box(sdb, solr_doc)
+        solr_doc['box_ssi'] = sdb.smods_rec.box
+      end
+
       # add collector_ssim solr field containing the collector per MODS names (via stanford-mods gem)
       def add_collector(sdb, solr_doc)
         insert_field solr_doc, 'collector', sdb.smods_rec.collectors_w_dates, :symbol # _ssim field
       end
 
+      def add_folder(sdb, solr_doc)
+        solr_doc['folder_ssi'] = sdb.smods_rec.folder
+      end
+
       # add plain MODS <genre> element data, not the SearchWorks genre values
       def add_genre(sdb, solr_doc)
         insert_field solr_doc, 'genre', sdb.smods_rec.genre.content, :symbol # this is a _ssim field
       end
-    end
 
-    concerning :PhysicalLocation do
-      included do
-        before_index :add_box
-        before_index :add_folder
-        before_index :add_location
-        before_index :add_series
-      end
-
-      # add the box number to solr_doc as box_ssi field (note: single valued!)
-      #   data in location/physicalLocation or in relatedItem/location/physicalLocation
-      # TODO:  push this up to stanford-mods gem?  or should it be hierarchical series/box/folder?
-      def add_box(sdb, solr_doc)
-        # see spec for data from actual collections
-        #   _location.physicalLocation should find top level and relatedItem
-        box_num = sdb.smods_rec._location.physicalLocation.map do |node|
-          val = node.text
-          # note that this will also find Flatbox or Flat-box
-          match_data = val.match(/Box ?:? ?([^,|(Folder)]+)/i)
-          match_data[1].strip if match_data.present?
-        end.compact
-
-        solr_doc['box_ssi'] = box_num.first
-      end
-
-      # add the folder number to solr_doc as folder_ssi field (note: single valued!)
-      #   data in location/physicalLocation or in relatedItem/location/physicalLocation
-      # TODO:  push this up to stanford-mods gem?  or should it be hierarchical series/box/folder?
-      def add_folder(sdb, solr_doc)
-        # see spec for data from actual collections
-        #   _location.physicalLocation should find top level and relatedItem
-        folder_num = sdb.smods_rec._location.physicalLocation.map do |node|
-          val = node.text
-
-          match_data = if val =~ /\|/
-                         # we assume the data is pipe-delimited, and may contain commas within values
-                         val.match(/Folder ?:? ?([^|]+)/)
-                       else
-                         # the data should be comma-delimited, and may not contain commas within values
-                         val.match(/Folder ?:? ?([^,]+)/)
-                       end
-
-          match_data[1].strip if match_data.present?
-        end.compact
-
-        solr_doc['folder_ssi'] = folder_num.first
-      end
-
-      # add the physicalLocation as location_ssi field (note: single valued!)
-      #   but only if it has series, box or folder data
-      #   data in location/physicalLocation or in relatedItem/location/physicalLocation
-      # TODO:  push this up to stanford-mods gem?  or should it be hierarchical series/box/folder?
       def add_location(sdb, solr_doc)
-        # see spec for data from actual collections
-        #   _location.physicalLocation should find top level and relatedItem
-        loc = sdb.smods_rec._location.physicalLocation.map do |node|
-          node.text if node.text.match(/.*(Series)|(Accession)|(Folder)|(Box).*/i)
-        end.compact
-
-        solr_doc['location_ssi'] = loc.first
+        solr_doc['location_ssi'] = sdb.smods_rec.location
       end
 
-      # add the series/accession 'number' to solr_doc as series_ssi field (note: single valued!)
-      #   data in location/physicalLocation or in relatedItem/location/physicalLocation
-      # TODO:  push this up to stanford-mods gem?  or should it be hierarchical series/box/folder?
       def add_series(sdb, solr_doc)
-        # see spec for data from actual collections
-        #   _location.physicalLocation should find top level and relatedItem
-        series_num = sdb.smods_rec._location.physicalLocation.map do |node|
-          val = node.text
-          # feigenbaum uses 'Accession'
-          match_data = val.match(/(?:(?:Series)|(?:Accession)):? ([^,|]+)/i)
-          match_data[1].strip if match_data.present?
-        end.compact
-
-        solr_doc['series_ssi'] = series_num.first
+        solr_doc['series_ssi'] = sdb.smods_rec.series
       end
     end
 

data/lib/spotlight/dor/resources/version.rb

@@ -2,7 +2,7 @@ module Spotlight
   module Dor
     # :nodoc:
     module Resources
-      VERSION = '0.3.0'
+      VERSION = '0.3.1'
     end
   end
 end

data/spec/lib/spotlight/dor/indexer_spec.rb

@@ -7,37 +7,6 @@ describe Spotlight::Dor::Indexer do
   let(:r) { Harvestdor::Indexer::Resource.new(double, fake_druid) }
   let(:sdb) { GDor::Indexer::SolrDocBuilder.new(r, Logger.new(StringIO.new)) }
   let(:solr_doc) { {} }
-  let(:mods_loc_phys_loc) do
-    Nokogiri::XML <<-EOF
-      <mods xmlns="#{Mods::MODS_NS}">
-        <location>
-          <physicalLocation>#{example}</physicalLocation>
-        </location>
-      </mods>
-    EOF
-  end
-  let(:mods_rel_item_loc_phys_loc) do
-    Nokogiri::XML <<-EOF
-      <mods xmlns="#{Mods::MODS_NS}">
-        <relatedItem>
-          <location>
-            <physicalLocation>#{example}</physicalLocation>
-          </location>
-        </relatedItem>
-      </mods>
-    EOF
-  end
-
-  let(:mods_loc_multiple_phys_loc) do
-    Nokogiri::XML <<-EOF
-      <mods xmlns="#{Mods::MODS_NS}">
-        <location>
-          <physicalLocation>Irrelevant Data</physicalLocation>
-          <physicalLocation>#{example}</physicalLocation>
-        </location>
-      </mods>
-    EOF
-  end
 
   before do
     # reduce log noise
@@ -185,6 +154,41 @@ describe Spotlight::Dor::Indexer do
       end
     end
 
+    describe '#add_box' do
+      before do
+        allow(r).to receive(:mods).and_return(mods)
+        subject.send(:add_box, sdb, solr_doc)
+      end
+      context 'with a record without a box' do
+        let(:mods) do
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+            </mods>
+          EOF
+        end
+
+        it 'is blank' do
+          expect(solr_doc['box_ssi']).to be_blank
+        end
+      end
+      context 'with a record with a box' do
+        let(:mods) do
+          # e.g. from https://purl.stanford.edu/vw282gv1740
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+              <location>
+                <physicalLocation>Series 1, Box 10, Folder 8</physicalLocation>
+              </location>
+            </mods>
+          EOF
+        end
+
+        it 'extracts the box' do
+          expect(solr_doc['box_ssi']).to eq('10')
+        end
+      end
+    end # add_box
+
     describe '#add_collector' do
       before do
         allow(r).to receive(:mods).and_return(mods)
@@ -212,6 +216,41 @@ describe Spotlight::Dor::Indexer do
       end
     end
 
+    describe '#add_folder' do
+      before do
+        allow(r).to receive(:mods).and_return(mods)
+        subject.send(:add_folder, sdb, solr_doc)
+      end
+      context 'with a record without a folder' do
+        let(:mods) do
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+            </mods>
+          EOF
+        end
+
+        it 'is blank' do
+          expect(solr_doc['folder_ssi']).to be_blank
+        end
+      end
+      context 'with a record with a folder' do
+        let(:mods) do
+          # e.g. from https://purl.stanford.edu/vw282gv1740
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+              <location>
+                <physicalLocation>Series 1, Box 10, Folder 8</physicalLocation>
+              </location>
+            </mods>
+          EOF
+        end
+
+        it 'extracts the folder' do
+          expect(solr_doc['folder_ssi']).to eq('8')
+        end
+      end
+    end # add_folder
+
     describe '#add_genre' do
       before do
         allow(r).to receive(:mods).and_return(mods)
@@ -246,276 +285,94 @@ describe Spotlight::Dor::Indexer do
         end
       end
     end
-  end
 
-  describe '#add_series' do
-    # example string as key, expected series name as value
-    {
-      # feigenbaum
-      'Call Number: SC0340, Accession 2005-101': '2005-101',
-      'Call Number: SC0340, Accession 2005-101, Box : 39, Folder: 9': '2005-101',
-      'Call Number: SC0340, Accession 2005-101, Box: 2, Folder: 3': '2005-101',
-      'Call Number: SC0340, Accession: 1986-052': '1986-052',
-      'Call Number: SC0340, Accession: 1986-052, Box 3 Folder 38': '1986-052',
-      'Call Number: SC0340, Accession: 2005-101, Box : 50, Folder: 31': '2005-101',
-      'Call Number: SC0340, Accession: 1986-052, Box: 5, Folder: 1': '1986-052',
-      'SC0340, Accession 1986-052': '1986-052',
-      'SC0340, Accession 2005-101, Box 18': '2005-101',
-      'Call Number: SC0340, Accession 2005-101, Box: 42A, Folder: 24': '2005-101',
-      'Call Number: SC0340, Accession: 1986-052, Box: 42A, Folder: 59': '1986-052',
-      'SC0340': nil,
-      'SC0340, 1986-052, Box 18': nil,
-      'Stanford University. Libraries. Department of Special Collections and University Archives': nil,
-      # shpc (actually in <relatedItem><location><physicalLocation>)
-      'Series Biographical Photographs | Box 42 | Folder Abbot, Nathan': 'Biographical Photographs',
-      'Series General Photographs | Box 42 | Folder Administration building--Outer Quad': 'General Photographs',
-      # menuez
-      'MSS Photo 451, Series 1, Box 32, Folder 11, Sleeve 32-11-2, Frame B32-F11-S2-6': '1',
-      'Series 1, Box 10, Folder 8': '1',
-      # fuller
-      'Collection: M1090 , Series: 4 , Box: 5 , Folder: 10': '4',
-      # hummel (actually in <relatedItem><location><physicalLocation>)
-      'Box 42 | Folder 3': nil,
-      'Flat-box 228 | Volume 1': nil
-    }.each do |example, expected|
-      describe "for example '#{example}'" do
-        let(:example) { example }
-        context 'in /location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_phys_loc)
-            subject.send(:add_series, sdb, solr_doc)
-          end
-          it "has the expected series name '#{expected}'" do
-            expect(solr_doc['series_ssi']).to eq expected
-          end
-        end
-        context 'in /relatedItem/location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_rel_item_loc_phys_loc)
-            subject.send(:add_series, sdb, solr_doc)
-          end
-          it "has the expected series name '#{expected}'" do
-            expect(solr_doc['series_ssi']).to eq expected
-          end
-        end
-        context 'with multiple physicalLocation elements' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_multiple_phys_loc)
-            subject.send(:add_series, sdb, solr_doc)
-          end
-          it "has the expected series name '#{expected}'" do
-            expect(solr_doc['series_ssi']).to eq expected
-          end
+    describe '#add_location' do
+      before do
+        allow(r).to receive(:mods).and_return(mods)
+        subject.send(:add_location, sdb, solr_doc)
+      end
+      context 'with a record without a location' do
+        let(:mods) do
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+            </mods>
+          EOF
         end
-      end # for example
-    end # each
-  end # add_series
 
-  describe '#add_box' do
-    # example string as key, expected box name as value
-    {
-      # feigenbaum
-      'Call Number: SC0340, Accession 2005-101, Box : 1, Folder: 1': '1',
-      'Call Number: SC0340, Accession 2005-101, Box: 39, Folder: 9': '39',
-      'Call Number: SC0340, Accession: 1986-052, Box 3 Folder 38': '3',
-      'Call Number: SC0340, Accession: 2005-101, Box : 50, Folder: 31': '50',
-      'Call Number: SC0340, Accession: 1986-052, Box: 5, Folder: 1': '5',
-      'SC0340, 1986-052, Box 18': '18',
-      'SC0340, Accession 2005-101, Box 18': '18',
-      'Call Number: SC0340, Accession 2005-101, Box: 42A, Folder: 24': '42A',
-      'Call Number: SC0340, Accession: 1986-052, Box: 42A, Folder: 59': '42A',
-      'Call Number: SC0340, Accession 2005-101': nil,
-      'Call Number: SC0340, Accession: 1986-052': nil,
-      'SC0340': nil,
-      'SC0340, Accession 1986-052': nil,
-      'Stanford University. Libraries. Department of Special Collections and University Archives': nil,
-      # shpc (actually in <relatedItem><location><physicalLocation>)
-      'Series Biographical Photographs | Box 42 | Folder Abbot, Nathan': '42',
-      'Series General Photographs | Box 42 | Folder Administration building--Outer Quad': '42',
-      # menuez
-      'MSS Photo 451, Series 1, Box 32, Folder 11, Sleeve 32-11-2, Frame B32-F11-S2-6': '32',
-      'Series 1, Box 10, Folder 8': '10',
-      # fuller
-      'Collection: M1090 , Series: 1 , Box: 5 , Folder: 42': '5',
-      # hummel (actually in <relatedItem><location><physicalLocation>)
-      'Box 42 | Folder 3': '42',
-      'Flat-box 228 | Volume 1': '228'
-    }.each do |example, expected|
-      describe "for example '#{example}'" do
-        let(:example) { example }
-        context 'in /location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_phys_loc)
-            subject.send(:add_box, sdb, solr_doc)
-          end
-          it "has the expected box label '#{expected}'" do
-            expect(solr_doc['box_ssi']).to eq expected
-          end
+        it 'is blank' do
+          expect(solr_doc['location_ssi']).to be_blank
         end
-        context 'in /relatedItem/location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_rel_item_loc_phys_loc)
-            subject.send(:add_box, sdb, solr_doc)
-          end
-          it "has the expected box label '#{expected}'" do
-            expect(solr_doc['box_ssi']).to eq expected
-          end
+      end
+      context 'with a record with a location' do
+        let(:mods) do
+          # e.g. from https://purl.stanford.edu/vw282gv1740
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+              <location>
+                <physicalLocation>Series 1, Box 10, Folder 8</physicalLocation>
+              </location>
+            </mods>
+          EOF
         end
 
-        context 'with multiple physicalLocation elements' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_multiple_phys_loc)
-            subject.send(:add_box, sdb, solr_doc)
-          end
-          it "has the expected box label '#{expected}'" do
-            expect(solr_doc['box_ssi']).to eq expected
-          end
-        end
-      end # for example
-    end # each
-  end # add_box
-
-  describe '#add_folder' do
-    # example string as key, expected folder name as value
-    {
-      # feigenbaum
-      'Call Number: SC0340, Accession 2005-101, Box : 1, Folder: 42': '42',
-      'Call Number: SC0340, Accession 2005-101, Box: 2, Folder: 42': '42',
-      'Call Number: SC0340, Accession: 1986-052, Box 3 Folder 42': '42',
-      'Call Number: SC0340, Accession: 2005-101, Box : 4, Folder: 42': '42',
-      'Call Number: SC0340, Accession: 1986-052, Box: 5, Folder: 42': '42',
-      'Call Number: SC0340, Accession 2005-101, Box: 4A, Folder: 42': '42',
-      'Call Number: SC0340, Accession: 1986-052, Box: 5A, Folder: 42': '42',
-      'Call Number: SC0340, Accession 2005-101': nil,
-      'Call Number: SC0340, Accession: 1986-052': nil,
-      'SC0340': nil,
-      'SC0340, 1986-052, Box 18': nil,
-      'SC0340, Accession 2005-101': nil,
-      'SC0340, Accession 2005-101, Box 18': nil,
-      'Stanford University. Libraries. Department of Special Collections and University Archives': nil,
-      # menuez
-      'MSS Photo 451, Series 1, Box 32, Folder 42, Sleeve 32-11-2, Frame B32-F11-S2-6': '42',
-      'Series 1, Box 10, Folder 42': '42',
-      # fuller
-      'Collection: M1090 , Series: 4 , Box: 5 , Folder: 42': '42',
-      # hummel (actually in <relatedItem><location><physicalLocation>)
-      'Box 1 | Folder 42': '42',
-      'Flat-box 228 | Volume 1': nil,
-      # shpc (actually in <relatedItem><location><physicalLocation>)
-      'Series Biographical Photographs | Box 1 | Folder Abbot, Nathan': 'Abbot, Nathan',
-      'Series General Photographs | Box 1 | Folder Administration building--Outer Quad': 'Administration building--Outer Quad',
-      # hypothetical
-      'Folder: 42, Sheet: 15': '42'
-    }.each do |example, expected|
-      describe "for example '#{example}'" do
-        let(:example) { example }
-        context 'in /location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_phys_loc)
-            subject.send(:add_folder, sdb, solr_doc)
-          end
-          it "has the expected folder label '#{expected}'" do
-            expect(solr_doc['folder_ssi']).to eq expected
-          end
-        end
-        context 'in /relatedItem/location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_rel_item_loc_phys_loc)
-            subject.send(:add_folder, sdb, solr_doc)
-          end
-          it "has the expected folder label '#{expected}'" do
-            expect(solr_doc['folder_ssi']).to eq expected
-          end
+        it 'extracts the location' do
+          expect(solr_doc['location_ssi']).to eq('Series 1, Box 10, Folder 8')
         end
+      end
+    end # add_location
 
-        context 'with multiple physicalLocation elements' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_multiple_phys_loc)
-            subject.send(:add_folder, sdb, solr_doc)
-          end
-          it "has the expected folder label '#{expected}'" do
-            expect(solr_doc['folder_ssi']).to eq expected
-          end
+    describe '#add_series' do
+      before do
+        allow(r).to receive(:mods).and_return(mods)
+        subject.send(:add_series, sdb, solr_doc)
+      end
+      context 'with a record without a series' do
+        let(:mods) do
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+            </mods>
+          EOF
         end
-      end # for example
-    end # each
-  end # add_folder
 
-  # rubocop:disable Metrics/LineLength
-  describe '#add_location' do
-    # example string as key, expected box name as value
-    {
-      # feigenbaum
-      'Call Number: SC0340, Accession 2005-101, Box : 1, Folder: 1': 'Call Number: SC0340, Accession 2005-101, Box : 1, Folder: 1',
-      'Call Number: SC0340, Accession 2005-101': 'Call Number: SC0340, Accession 2005-101',
-      'SC0340, 1986-052, Box 18': 'SC0340, 1986-052, Box 18',
-      'SC0340, Accession 2005-101, Box 18': 'SC0340, Accession 2005-101, Box 18',
-      'SC0340': nil,
-      'SC0340, Accession 1986-052': 'SC0340, Accession 1986-052',
-      'Stanford University. Libraries. Department of Special Collections and University Archives': nil,
-      # shpc (actually in <relatedItem><location><physicalLocation>)
-      'Series Biographical Photographs | Box 42 | Folder Abbot, Nathan': 'Series Biographical Photographs | Box 42 | Folder Abbot, Nathan',
-      'Series General Photographs | Box 42 | Folder Administration building--Outer Quad': 'Series General Photographs | Box 42 | Folder Administration building--Outer Quad',
-      # menuez
-      'MSS Photo 451, Series 1, Box 32, Folder 11, Sleeve 32-11-2, Frame B32-F11-S2-6': 'MSS Photo 451, Series 1, Box 32, Folder 11, Sleeve 32-11-2, Frame B32-F11-S2-6',
-      'Series 1, Box 10, Folder 8': 'Series 1, Box 10, Folder 8',
-      # fuller
-      'Collection: M1090 , Series: 1 , Box: 5 , Folder: 42': 'Collection: M1090 , Series: 1 , Box: 5 , Folder: 42',
-      # hummel (actually in <relatedItem><location><physicalLocation>)
-      'Box 42 | Folder 3': 'Box 42 | Folder 3',
-      'Flat-box 228 | Volume 1': 'Flat-box 228 | Volume 1'
-    }.each do |example, expected|
-      describe "for example '#{example}'" do
-        let(:example) { example }
-        context 'in /location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_phys_loc)
-            subject.send(:add_location, sdb, solr_doc)
-          end
-          it "has the expected location '#{expected}'" do
-            expect(solr_doc['location_ssi']).to eq expected
-          end
-        end
-        context 'in /relatedItem/location/physicalLocation' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_rel_item_loc_phys_loc)
-            subject.send(:add_location, sdb, solr_doc)
-          end
-          it "has the expected location '#{expected}'" do
-            expect(solr_doc['location_ssi']).to eq expected
-          end
+        it 'is blank' do
+          expect(solr_doc['series_ssi']).to be_blank
         end
-        context 'with multiple physicalLocation elements' do
-          before do
-            allow(r).to receive(:mods).and_return(mods_loc_multiple_phys_loc)
-            subject.send(:add_location, sdb, solr_doc)
-          end
-          it "has the expected location '#{expected}'" do
-            expect(solr_doc['location_ssi']).to eq expected
-          end
+      end
+      context 'with a record with a series' do
+        let(:mods) do
+          # e.g. from https://purl.stanford.edu/vw282gv1740
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+              <location>
+                <physicalLocation>Series 1, Box 10, Folder 8</physicalLocation>
+              </location>
+            </mods>
+          EOF
         end
-      end # for example
-    end # each
-  end # add_location
-  # rubocop:enable Metrics/LineLength
 
-  let(:mods_note_plain) do
-    Nokogiri::XML <<-EOF
-      <mods xmlns="#{Mods::MODS_NS}">
-        <note>#{example}</note>
-      </mods>
-    EOF
-  end
-  let(:mods_note_preferred_citation) do
-    Nokogiri::XML <<-EOF
-      <mods xmlns="#{Mods::MODS_NS}">
-        <note type="preferred citation">#{example}</note>
-      </mods>
-    EOF
-  end
+        it 'extracts the series' do
+          expect(solr_doc['series_ssi']).to eq('1')
+        end
+      end
+    end # add_series
+  end # context StanfordMods concern
 
   # rubocop:disable Metrics/LineLength
   describe '#add_folder_name' do
+    let(:mods_note_plain) do
+      Nokogiri::XML <<-EOF
+        <mods xmlns="#{Mods::MODS_NS}">
+          <note>#{example}</note>
+        </mods>
+      EOF
+    end
+    let(:mods_note_preferred_citation) do
+      Nokogiri::XML <<-EOF
+        <mods xmlns="#{Mods::MODS_NS}">
+          <note type="preferred citation">#{example}</note>
+        </mods>
+      EOF
+    end
     # example string as key, expected folder name as value
     # all from feigenbaum (or based on feigenbaum), as that is only coll with this data
     {

data/spec/models/spotlight/resources/purl_spec.rb

@@ -107,6 +107,13 @@ describe Spotlight::Resources::Purl do
         expect(Spotlight::Dor::Resources.indexer).to receive(:solr_document).and_raise(RuntimeError.new)
         expect { subject.to_solr.to_a }.not_to raise_error
       end
+
+      it 'log and raises other types of errors errors' do
+        allow(subject.resource).to receive(:items).and_return([])
+        expect(Spotlight::Dor::Resources.indexer).to receive(:solr_document).and_raise(StandardError.new)
+        expect(subject.send(:logger)).to receive(:error).with(/Error processing xf680rd3068/)
+        expect { subject.to_solr.to_a }.to raise_error StandardError
+      end
     end
 
     context 'with a single item' do

data/spotlight-dor-resources.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
   spec.add_dependency 'solrizer'
-  spec.add_dependency 'stanford-mods', '>= 1.2.0' # includes new person facets
   spec.add_dependency 'gdor-indexer'
   # newer versions of harvestdor-indexer have performance improvements for collections
   spec.add_dependency 'harvestdor-indexer', '~> 2.3'
+  # stanford-mods 1.2.1 includes additional name fields and a bug fix
+  spec.add_dependency 'stanford-mods', '>= 1.2.1'
   spec.add_dependency 'rails'
   spec.add_dependency 'blacklight-spotlight', '~> 0.6'
   spec.add_dependency 'parallel'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotlight-dor-resources
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: stanford-mods
+  name: gdor-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: gdor-indexer
+  name: harvestdor-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: harvestdor-indexer
+  name: stanford-mods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement