spotlight-dor-resources 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31130b0ef44659b04e226ce3f7d54afeb2fab9bd
-  data.tar.gz: 773201c4913261fb010cbd06a7bd027fb550acc1
+  metadata.gz: 5b035c7c9d1aa81f28332f8304294beb43a960ab
+  data.tar.gz: 1658a13bf5ff55aa7f0d67cf7770c89e17648f2d
 SHA512:
-  metadata.gz: dd69ded57b4a0daaa03b544218a95edb3b23a503ae54c56274f7f8cc06bb8949120f19af29b9047b81d743914dd2e601fbeb5b4a133edfe2718084457290a096
-  data.tar.gz: 90f34128fd6494c255f69f9cf4b430cdae7c060618ba648e99a982c3fdfdf2d41ade20b73d6febe48a8eae46b7dbf5823996b5469e25b756340a84fb217a2f04
+  metadata.gz: fa6d70d3f6530b159e9bec06a3c8b2219bb836a5a3608d291c047ae7d405d653ccf02d0f4b028523a0a942848d1b9cd2070fe42cd28e786496a8059c670c28df
+  data.tar.gz: a99351ec2d515332d76582c6b178be12021834c499d3725225b2cf2727871dd794c800a913dd87a40091cf807b76145489797cddf00ad04b1f7f97209c04ec03

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

@@ -1,17 +1,47 @@
 module Spotlight::Resources
   class DorResource < Spotlight::Resource
+    ##
+    # Generate solr documents for the DOR resources identified by this object
+    #
+    # @return [Enumerator] an enumerator of solr document hashes for indexing
     def to_solr
       return to_enum :to_solr unless block_given?
 
       base_doc = super
 
-      [resource, (resource.items if resource.collection?)].flatten.compact.each do |res|
-        yield base_doc.merge(Spotlight::Dor::Resources.indexer.solr_document(res))
+      indexable_resources.each do |res|
+        yield base_doc.merge(to_solr_document(res))
       end
     end
 
     def resource
       @resource ||= Spotlight::Dor::Resources.indexer.resource doc_id
     end
+
+    private
+
+    ##
+    # Enumerate the resource, and any collection members, that should be indexed
+    # into this exhibit
+    #
+    # @return [Enumerator] an enumerator of resources to index
+    def indexable_resources
+      return to_enum(:indexable_resources) unless block_given?
+
+      yield resource
+
+      resource.items.each do |r|
+        yield r
+      end
+    end
+
+    ##
+    # Generate the solr document hash for a given resource by applying the current
+    # indexer steps.
+    #
+    # @return [Hash]
+    def to_solr_document(resource)
+      Spotlight::Dor::Resources.indexer.solr_document(resource)
+    end
   end
 end

data/lib/spotlight/dor/indexer.rb

@@ -67,8 +67,9 @@ module Spotlight::Dor
         # 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
-      solr_doc['box_ssi'] = box_num.first if box_num.present?
+      end.compact
+
+      solr_doc['box_ssi'] = box_num.first
     end
 
     # This new donor_tags_sim field was added in October 2015 specifically for the Feigenbaum exhibit.  It is very likely
@@ -97,9 +98,9 @@ module Spotlight::Dor
                      end
 
         match_data[1].strip if match_data.present?
-      end
+      end.compact
 
-      solr_doc['folder_ssi'] = folder_num.first if folder_num.present?
+      solr_doc['folder_ssi'] = folder_num.first
     end
 
     # add the folder name to solr_doc as folder_name_ssi field (note: single valued!)
@@ -127,8 +128,9 @@ module Spotlight::Dor
         # feigenbaum uses 'Accession'
         match_data = val.match(/(?:(?:Series)|(?:Accession)):? ([^,|]+)/i)
         match_data[1].strip if match_data.present?
-      end
-      solr_doc['series_ssi'] = series_num.first if series_num.present?
+      end.compact
+
+      solr_doc['series_ssi'] = series_num.first
     end
 
     # rubocop:disable Metrics/AbcSize

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

@@ -1,7 +1,7 @@
 module Spotlight
   module Dor
     module Resources
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

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

@@ -28,6 +28,17 @@ describe Spotlight::Dor::Indexer do
     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
     # ignore noisy logs
     allow(r).to receive(:harvestdor_client)
@@ -86,6 +97,15 @@ describe Spotlight::Dor::Indexer 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
+        end
       end # for example
     end # each
   end # add_series
@@ -140,6 +160,16 @@ describe Spotlight::Dor::Indexer do
             expect(solr_doc['box_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_box, sdb, solr_doc)
+          end
+          it "has the expected series name '#{expected}'" do
+            expect(solr_doc['box_ssi']).to eq expected
+          end
+        end
       end # for example
     end # each
   end # add_box
@@ -196,6 +226,16 @@ describe Spotlight::Dor::Indexer do
             expect(solr_doc['folder_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_folder, sdb, solr_doc)
+          end
+          it "has the expected series name '#{expected}'" do
+            expect(solr_doc['folder_ssi']).to eq expected
+          end
+        end
       end # for example
     end # each
   end # add_folder

data/spotlight-dor-resources.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday"
   spec.add_dependency 'solrizer'
   spec.add_dependency 'gdor-indexer'
+  spec.add_dependency 'harvestdor-indexer', '>= 2.2.0' # 2.2.0 introduced enumerable collections
   spec.add_dependency "rails"
   spec.add_dependency "blacklight-spotlight", "~> 0.5"
   spec.add_development_dependency "bundler", "~> 1.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotlight-dor-resources
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Beer
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: harvestdor-indexer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement