spotlight-dor-resources 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c9626527848a815f94b5e897c644439a4130b5
-  data.tar.gz: a5bb46bce723dbdb76d9799a06954854a588f351
+  metadata.gz: a6454dc1dc2ecd62b6742f158f49c5d3c0463f13
+  data.tar.gz: fa13810076a206a0869e41cc8ab833f652833119
 SHA512:
-  metadata.gz: e4f617b75c4659fb64a368eddf055168af6fcac6e9a8053aa3cd0d1c8d421ddf1e6083a3ce4f313dc453b246e9d59af9e1b90667325965d5566c40ce841a5e21
-  data.tar.gz: 8aae9489098370a7ce5982813ded06b216ecc29d1b8f9d33909041a9f6dc82abcf2de25e975b6a07468acfc63b47764d7fc685df1de635095107e6289111796d
+  metadata.gz: e6f4acd16f57c69655e415a4e0d383e079593f9dc39ec867ebe264ebfac17b1b76b8084443a0e94fbe6e4f657512eed3bfcd0d9b560ee959d9c8c976381fd7a9
+  data.tar.gz: 5a0835148edb693100764d467fb9dcece618e5eeed95f30c35273649a5fb42c78ab42eb07d3b85606d4e6030776a4d8f5c1deaaf461c499cbf15a5c59364a468

data/.rubocop_todo.yml

@@ -11,15 +11,14 @@ Lint/UselessAccessModifier:
   Exclude:
     - 'lib/spotlight/dor/indexer.rb'
 
-# Offense count: 7
-# Configuration parameters: Max.
-RSpec/ExampleLength:
+# Offense count: 1
+RSpec/AnyInstance:
   Exclude:
-    - 'spec/lib/spotlight/dor/indexer_spec.rb'
     - 'spec/models/spotlight/resources/dor_harvester_spec.rb'
 
-# Offense count: 2
-RSpec/VerifiedDoubles:
+# Offense count: 6
+# Configuration parameters: Max.
+RSpec/ExampleLength:
   Exclude:
-    - 'spec/integration/gdor_integration_spec.rb'
+    - 'spec/lib/spotlight/dor/indexer_spec.rb'
     - 'spec/models/spotlight/resources/dor_harvester_spec.rb'

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

@@ -12,9 +12,7 @@ module Spotlight::Resources
     end
 
     def resources
-      @resources ||= druids.map do |d|
-        Spotlight::Dor::Resources.indexer.resource d
-      end
+      @resources ||= druids.map { |d| Spotlight::Dor::Resources.indexer.resource(d) }.select(&:exists?)
     end
 
     def druids

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

@@ -2,7 +2,7 @@ module Spotlight
   module Dor
     # :nodoc:
     module Resources
-      VERSION = '2.0.0'.freeze
+      VERSION = '2.0.1'.freeze
     end
   end
 end

data/spec/integration/gdor_integration_spec.rb

@@ -1,12 +1,9 @@
 describe 'gdor indexing integration test', :vcr do
-  let :exhibit do
-    double(solr_data: {}, blacklight_config: Blacklight::Configuration.new)
-  end
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
 
   subject do
-    r = Spotlight::Resources::DorHarvester.new(druid_list: 'xf680rd3068')
+    r = Spotlight::Resources::DorHarvester.new(druid_list: 'xf680rd3068', exhibit: exhibit)
     allow(r).to receive(:to_global_id).and_return('x')
-    allow(r).to receive(:exhibit).and_return(exhibit)
     r.document_builder.to_solr.first
   end
 

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

@@ -7,7 +7,7 @@ describe Spotlight::Resources::DorHarvester do
     double
   end
 
-  subject { described_class.new druid_list: 'xf680rd3068' }
+  subject { described_class.new druid_list: 'xf680rd3068', exhibit: exhibit }
   let(:resource) { subject.resources.first }
 
   before do
@@ -61,13 +61,25 @@ describe Spotlight::Resources::DorHarvester do
     it 'has the correct indexer' do
       expect(resource.indexer).to eq Spotlight::Dor::Resources.indexer.harvestdor
     end
+
+    context 'with an unpublished druid' do
+      let(:missing_resource) { instance_double(Harvestdor::Indexer::Resource, exists?: false) }
+
+      before do
+        allow(Spotlight::Dor::Resources.indexer).to receive(:resource).with('xf680rd3068').and_return(missing_resource)
+      end
+
+      it 'excludes missing resources' do
+        expect(subject.resources).to be_empty
+      end
+    end
   end
 
   describe '#reindex' do
     before do
       allow(Spotlight::Dor::Resources.indexer).to receive(:solr_document).and_return(upstream: true)
       allow(resource).to receive(:collection?).and_return(false)
-      allow(exhibit).to receive(:solr_data).and_return({})
+      allow_any_instance_of(SolrDocument).to receive(:to_solr).and_return({})
     end
 
     it 'adds a document to solr' do

data/spotlight-dor-resources.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'solrizer'
   spec.add_dependency 'gdor-indexer', '>=0.5.0' # for new pub date methods
   # newer versions of harvestdor-indexer have performance improvements for collections
-  spec.add_dependency 'harvestdor-indexer', '~> 2.3', '>= 2.3.2'
+  spec.add_dependency 'harvestdor-indexer', '~> 2.4'
   spec.add_dependency 'rails'
-  spec.add_dependency 'blacklight-spotlight', '~> 0.19'
+  spec.add_dependency 'blacklight-spotlight', '~> 0.20'
   spec.add_dependency 'parallel'
   spec.add_dependency 'stanford-mods', '~> 2.1'
   spec.add_development_dependency 'bundler', '~> 1.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotlight-dor-resources
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,20 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement