base_indexer 4.2.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb2a56c11c92d29fc7d476b070e1b84409a4a769
-  data.tar.gz: 1ab90182afa6a8083fe45b7122e06a9f252c8fc3
+  metadata.gz: 416cd88ba0ca83c08d9783cebc9af1eb044647c6
+  data.tar.gz: bd8aa214f215b69bbd5f553cd2f32a72dabec313
 SHA512:
-  metadata.gz: a826e9dd54cb5ddf833c366d90de13333905531c459cd9d7fa95bc1a9e2e458d59fe8ba09e94570120b3771bb71ae5a6f5563a38c4d6fb4a6ed1661afea58ee9
-  data.tar.gz: fb3ee9d52ba97f730d61076342007f108fd3a396c1281730942f90ee6e83aa922ebc90172c2b83f113be01fe24a5b0749efddef17977708fd5ab8ee2987786c2
+  metadata.gz: ad1abf4ebe31cb0caf0199e88086d7da89c52ce3efce64ee9806daa652132ac52313d823facc32fb8fe5be0a59627a811781839893a097afbf27949acfd6b9f9
+  data.tar.gz: 2b5db11fd80aedc6b7ec2a7dc1a95e587ac5faa13183b0ec6ad27ab9247d9cd5640086010e7adb416ec61a7ecde408c1a34dd7a4a632f66770a0180bc384bfde

data/.gitignore

@@ -38,3 +38,4 @@ build/
 .internal_test_app
 /spec/internal
 ./spec/internal
+/spec/examples.txt

data/Gemfile

@@ -14,7 +14,7 @@ gemspec
 # gem 'debugger'
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.10.0
+# engine_cart: 1.0.1
 # engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
@@ -36,14 +36,5 @@ else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
-
-  case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
-  end
 end
 # END ENGINE_CART BLOCK

data/app/controllers/base_indexer/application_controller.rb

@@ -1,16 +1,4 @@
 module BaseIndexer
   class ApplicationController < ActionController::Base
-
-    def remove_prefix(druid)
-      druid.gsub('druid:', '') # lop off druid prefix if sent
-    end
-
-    def report_failure(method_symbol, params, e)
-      "#{method_symbol} #{params}\n\n#{e.inspect}\n#{e.message}\n#{e.backtrace}"
-    end
-
-    def report_success
-      'success'
-    end
   end
 end

data/app/controllers/base_indexer/items_controller.rb

@@ -1,22 +1,15 @@
-require_dependency 'base_indexer/application_controller'
-
 module BaseIndexer
   class ItemsController < ApplicationController
     def update
       Rails.logger.debug "Receiving indexing #{druid}"
 
-      indexer = BaseIndexer.indexer_class.constantize.new
       indexer.index druid, { subtarget_params => true }
       head :ok
-      Rails.logger.debug "Completing indexing #{druid}"
-    rescue StandardError => e
-      Rails.logger.error report_failure request.method_symbol, params, e
-      raise
     end
 
     def destroy
       Rails.logger.debug "Receiving deleting #{druid}"
-      indexer = BaseIndexer.indexer_class.constantize.new
+
       # If no subtarget is defined, delete from everywhere
       if optional_subtarget_params.nil?
         indexer.delete druid
@@ -26,16 +19,16 @@ module BaseIndexer
         indexer.index druid, { subtarget_params => false }
       end
       head :ok
-      Rails.logger.debug "Completing deleting #{druid}"
-    rescue StandardError => e
-      Rails.logger.error report_failure request.method_symbol, params, e
-      raise
     end
 
     private
 
+    def indexer
+      BaseIndexer.indexer_class.constantize.new
+    end
+
     def druid
-      remove_prefix params.require(:druid)
+      params.require(:druid).gsub('druid:', '') # lop off druid prefix if sent
     end
 
     def optional_subtarget_params

data/base_indexer.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '~> 5'
   s.add_dependency 'discovery-indexer', '>= 2', '< 4'
   s.add_dependency 'retries'
-  s.add_dependency 'dor-fetcher'
+  s.add_dependency 'harvestdor-indexer'
   s.add_dependency 'config'
 
   s.add_development_dependency 'sqlite3'

data/config/initializers/base_indexer.rb

@@ -3,4 +3,3 @@
 # The engine consumer app should override this class
 BaseIndexer.indexer_class = 'BaseIndexer::MainIndexerEngine'
 BaseIndexer.mapper_class_name = 'DiscoveryIndexer::GeneralMapper'
-BaseIndexer.solr_writer_class_name = 'BaseIndexer::Solr::Writer'

data/config/routes.rb

@@ -10,6 +10,4 @@ BaseIndexer::Engine.routes.draw do
       delete 'subtargets/:subtarget', action: :destroy
     end
   end
-
-  resources :collections, only: :update
 end

data/lib/base_indexer.rb

@@ -7,6 +7,4 @@ require 'discovery-indexer'
 module BaseIndexer
   mattr_accessor :indexer_class
   mattr_accessor :mapper_class_name
-  mattr_accessor :solr_writer_class_name
-  mattr_accessor :fetcher_class
 end

data/lib/base_indexer/main_indexer_engine.rb

@@ -16,29 +16,34 @@ module BaseIndexer
   #   indexer = BaseIndexer::MainIndexerEngine.new
   #   indexer.delete "ab123cd456"
   class MainIndexerEngine
-    include DiscoveryIndexer
-
     # It is the main indexing function
     #
     # @param druid [String] is the druid for an object e.g., ab123cd4567
     # @param targets [Array] is an array with the targets list to index towards
     #
     # @raise it will raise erros if there is any problems happen in any level
-    def index(druid, targets = nil)
+    def index(druid, targets)
       # Map the input to solr_doc
-      solr_doc = BaseIndexer.mapper_class_name.constantize.new(druid).convert_to_solr_doc
+      solr_doc = mapper_class.new(druid).convert_to_solr_doc
 
       # Get SOLR configuration and write
-      BaseIndexer.solr_writer_class_name.constantize.new
-                 .process(druid, solr_doc, targets, Settings.SOLR_TARGETS.to_hash.deep_stringify_keys)
+      solr_writer.process(druid, solr_doc, targets)
     end
 
     # It deletes an item defined by druid from all registered solr core
     # @param druid [String] is the druid for an object e.g., ab123cd4567
     def delete(druid)
-      BaseIndexer.solr_writer_class_name.constantize.new
-                 .solr_delete_from_all(druid, Settings.SOLR_TARGETS.to_hash.deep_stringify_keys)
+      solr_writer.solr_delete_from_all(druid)
     end
 
+    private
+
+    def mapper_class
+      BaseIndexer.mapper_class_name.constantize
+    end
+
+    def solr_writer
+      BaseIndexer::Solr::Writer.new
+    end
   end
 end

data/lib/base_indexer/solr/client.rb

@@ -6,6 +6,12 @@ module BaseIndexer
     # Processes adds and deletes to the solr core
     class Client
       include DiscoveryIndexer::Logging
+      
+      def self.logging_handler(id)
+        proc do |exception, attempt_number, _total_delay|
+          DiscoveryIndexer::Logging.logger.error "#{exception.class} on attempt #{attempt_number} for #{id}"
+        end
+      end
 
       # Add the document to solr, retry if an error occurs.
       # See https://github.com/ooyala/retries for docs on with_retries.
@@ -14,7 +20,19 @@ module BaseIndexer
       # @param solr_connector [RSolr::Client]  is an open connection with the solr core
       # @param max_retries [Integer] the maximum number of tries before fail
       def self.add(id, solr_doc, solr_connector, max_retries = 10)
-        process(id, solr_doc, solr_connector, max_retries, false)
+        with_retries(max_tries: max_retries, handler: logging_handler(id), base_sleep_seconds: 1, max_sleep_seconds: 5) do |attempt|
+          DiscoveryIndexer::Logging.logger.debug "Attempt #{attempt} for #{id}"
+
+          if allow_update?(solr_connector) && doc_exists?(id, solr_connector)
+            update_solr_doc(id, solr_doc, solr_connector)
+            DiscoveryIndexer::Logging.logger.info "Updating #{id} on attempt #{attempt}"
+          else
+            solr_connector.add(solr_doc, :add_attributes => {:commitWithin => 10000})
+            DiscoveryIndexer::Logging.logger.info "Indexing #{id} on attempt #{attempt}"
+          end
+
+          DiscoveryIndexer::Logging.logger.info "Completing #{id} successfully on attempt #{attempt}"
+        end
       end
 
       # Add the document to solr, retry if an error occurs.
@@ -23,35 +41,11 @@ module BaseIndexer
       # @param solr_connector[RSolr::Client]  is an open connection with the solr core
       # @param max_retries [Integer] the maximum number of tries before fail
       def self.delete(id, solr_connector, max_retries = 10)
-        process(id, {}, solr_connector, max_retries, true)
-      end
-
-      # It's an internal method that receives all the requests and deal with
-      # SOLR core. This method can call add, delete, or update
-      #
-      # @param id [String] the document id, usually it will be druid.
-      # @param solr_doc [Hash] is the solr doc in hash format
-      # @param solr_connector [RSolr::Client]  is an open connection with the solr core
-      # @param max_retries [Integer] the maximum number of tries before fail
-      def self.process(id, solr_doc, solr_connector, max_retries, is_delete = false)
-        handler = proc do |exception, attempt_number, _total_delay|
-          DiscoveryIndexer::Logging.logger.error "#{exception.class} on attempt #{attempt_number} for #{id}"
-        end
-
-        with_retries(max_tries: max_retries, handler: handler, base_sleep_seconds: 1, max_sleep_seconds: 5) do |attempt|
+        with_retries(max_tries: max_retries, handler: logging_handler(id), base_sleep_seconds: 1, max_sleep_seconds: 5) do |attempt|
           DiscoveryIndexer::Logging.logger.debug "Attempt #{attempt} for #{id}"
 
-          if is_delete
-            solr_connector.delete_by_id(id, :add_attributes => {:commitWithin => 10000})
-            DiscoveryIndexer::Logging.logger.info "Deleting #{id} on attempt #{attempt}"
-          elsif allow_update?(solr_connector) && doc_exists?(id, solr_connector)
-            update_solr_doc(id, solr_doc, solr_connector)
-            DiscoveryIndexer::Logging.logger.info "Updating #{id} on attempt #{attempt}"
-          else
-            solr_connector.add(solr_doc, :add_attributes => {:commitWithin => 10000})
-            DiscoveryIndexer::Logging.logger.info "Indexing #{id} on attempt #{attempt}"
-          end
-          #solr_connector.commit
+          solr_connector.delete_by_id(id, :add_attributes => {:commitWithin => 10000})
+          DiscoveryIndexer::Logging.logger.info "Deleting #{id} on attempt #{attempt}"
           DiscoveryIndexer::Logging.logger.info "Completing #{id} successfully on attempt #{attempt}"
         end
       end
@@ -66,16 +60,10 @@ module BaseIndexer
       # @param solr_connector [RSolr::Client]  is an open connection with the solr core
       # @return [Boolean] true if the solr doc defined by this id exists
       def self.doc_exists?(id, solr_connector)
-        response = solr_connector.get 'select', params: { q: 'id:"' + id + '"' }
+        response = solr_connector.get 'select', params: { q: 'id:"' + id + '"', defType: 'lucene' }
         response['response']['numFound'] == 1
       end
 
-      # @param solr_connector [RSolr::Client]  is an open connection with the solr core
-      # send hard commit to solr
-      def self.commit(solr_connector)
-        RestClient.post self.solr_url(solr_connector), {},:content_type => :json, :accept=>:json
-      end
-
       # It is an internal method that updates the solr doc instead of adding a new one.
       # @param id [String] the document id, usually it will be druid.
       # @param solr_doc [Hash] is the solr doc in hash format
@@ -83,31 +71,12 @@ module BaseIndexer
       def self.update_solr_doc(id, solr_doc, solr_connector)
         # update_solr_doc can't used RSolr because updating hash doc is not supported
         #  so we need to build the json input manually
-        params = "[{\"id\":\"#{id}\","
-        solr_doc.each do |field_name, new_values|
-          next if field_name == :id
-          params += "\"#{field_name}\":"
-          new_values = [new_values] unless new_values.class == Array
-          new_values = new_values.map { |s| s.to_s.gsub('\\', '\\\\\\').gsub('"', '\"').strip } # strip leading/trailing spaces and escape quotes for each value
-          params += "{\"set\":[\"#{new_values.join('","')}\"]},"
+        hash = { id: id }
+        solr_doc.each do |k,v|
+          hash[k] = { set: v } unless k.to_sym == :id
         end
-        params.chomp!(',')
-        params += '}]'
-        RestClient.post self.solr_url(solr_connector), params, content_type: :json, accept: :json
+        solr_connector.update params: { commitWithin: 10000 }, data: Array.wrap(hash).to_json, headers: { 'Content-Type' => 'application/json' }
       end
-
-      # adjust the solr_url so it works with or without a trailing /
-      # @param solr_connector [RSolr::Client]  is an open connection with the solr core
-      # @return [String] the solr URL
-      def self.solr_url(solr_connector)
-        solr_url = solr_connector.options[:url]
-        if solr_url.end_with?('/')
-          "#{solr_url}update?commit=true"
-        else
-          "#{solr_url}/update?commit=true"
-        end
-      end
-
     end
   end
 end

data/lib/base_indexer/solr/writer.rb

@@ -5,28 +5,30 @@ module BaseIndexer
   module Solr
     # Performs writes to solr client based upon true and false release flags
     class Writer
-      attr_reader :solr_targets_configs
-
       include DiscoveryIndexer::Logging
 
-      def process(id, index_doc, targets, targets_configs)
-        @solr_targets_configs = targets_configs
+      def process(id, index_doc, targets)
         index_targets = targets.select { |_, b| b }.keys
         delete_targets = targets.reject { |_, b| b }.keys
 
         # get targets with true
-        solr_index_client(id, index_doc, index_targets) if index_targets.present?
+        solr_index_client(id, index_doc, index_targets)
         # get targets with false
-        solr_delete_client(id, delete_targets) if delete_targets.present?
+        solr_delete_client(id, delete_targets)
       end
 
-      def solr_delete_from_all(id, targets_configs)
+      def solr_delete_from_all(id)
         # Get a list of all registered targets
-        @solr_targets_configs = targets_configs
         targets = solr_targets_configs.keys
         solr_delete_client(id, targets)
       end
 
+      def get_connector_for_target(solr_target)
+        solr_connector_targets[solr_target]
+      end
+
+      private
+
       def solr_index_client(id, index_doc, targets)
         targets.each do |solr_target|
           solr_connector = get_connector_for_target(solr_target)
@@ -41,15 +43,16 @@ module BaseIndexer
         end
       end
 
-      def get_connector_for_target(solr_target)
-        solr_connector = nil
-        unless solr_targets_configs.nil?
-          if solr_targets_configs.keys.include?(solr_target)
-            config = solr_targets_configs[solr_target]
-            solr_connector = RSolr.connect(config.deep_symbolize_keys)
+      def solr_connector_targets
+        @solr_connector_targets ||= begin
+          solr_targets_configs.transform_values do |config|
+            RSolr.connect(config.deep_symbolize_keys)
           end
         end
-        solr_connector
+      end
+
+      def solr_targets_configs
+        Settings.SOLR_TARGETS.to_hash.stringify_keys
       end
     end
   end

data/lib/base_indexer/version.rb

@@ -1,3 +1,3 @@
 module BaseIndexer
-  VERSION = '4.2.0'
+  VERSION = '5.0.0'
 end

data/lib/tasks/index.rake

@@ -138,7 +138,7 @@ desc 'Index an entire collection, including the collection itself and all of its
 #Run me: rake collection_indexer RAILS_ENV=production target=revs_prod collection_druid=oo000oo0001
 # Examples:
 task :collection_indexer => :environment do |t, args|
-
+  require 'harvestdor/indexer'
   target = ENV['target'] # must pass in the target so specify solr core to index into
   collection_druid = ENV['collection_druid']
 
@@ -160,14 +160,14 @@ task :collection_indexer => :environment do |t, args|
 
   indexer = BaseIndexer.indexer_class.constantize.new
 
-  fetcher = BaseIndexer.fetcher_class.constantize.new(service_url: Rails.application.config.fetcher_url)
+  fetcher = Harvestdor::Indexer::PurlFetcher.new(url: Rails.application.config.fetcher_url)
 
   collection_druid=collection_druid.gsub('druid:','')
 
   indexer.index(collection_druid,{target=>true})
   log my_logger,"Indexed collection: #{collection_druid}"
 
-  druids = fetcher.druid_array(fetcher.get_collection(collection_druid, {}))
+  druids = fetcher.druids_from_collection(collection_druid)
 
   log my_logger,"** Found #{druids.size} members of the collection"
 

data/spec/base_indexer/main_indexer_engine_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
 
-describe BaseIndexer::MainIndexerEngine do
+RSpec.describe BaseIndexer::MainIndexerEngine do
   before :all do
     DiscoveryIndexer::PURL_DEFAULT = 'https://purl.stanford.edu'
   end
 
   describe '.delete' do
     it 'should call solr_delete_from_all for delete call' do
-      expect_any_instance_of(BaseIndexer::Solr::Writer).to receive(:solr_delete_from_all)
-        .with('aa111aa1111', 'target1' => { 'url' => 'http://localhost:8983/solr/' }, 'target2' => { 'url' => 'http://localhost:8983/solr/' })
+      expect_any_instance_of(BaseIndexer::Solr::Writer).to receive(:solr_delete_from_all).with('aa111aa1111')
 
       BaseIndexer::MainIndexerEngine.new.delete 'aa111aa1111'
     end

data/spec/base_indexer/solr/client_spec.rb

@@ -1,47 +1,32 @@
 require 'spec_helper'
 
-describe BaseIndexer::Solr::Client do
+RSpec.describe BaseIndexer::Solr::Client do
   let(:druid) { 'cb077vs7846' }
-  let (:solr_doc) { double('solr_doc', {}) }
-  let(:max_retries) { 10 }
-  describe '.solr_url' do
-    it 'should correctly handle urls with both trailing and leading slashes' do
-      connectors=[RSolr.connect(url: 'http://localhost:8983/solr/'),RSolr.connect(url: 'http://localhost:8983/solr')]
-      connectors.each do |connector|
-        expect(described_class.solr_url(connector)).to eq 'http://localhost:8983/solr/update?commit=true'
-      end
-    end
-  end
+  let(:solr_doc) { { a: 1 } }
 
-  describe '.process' do
-    describe 'delete' do
-      let (:solr_connector) { double('connector', { options: { url: 'http://localhost:8983/solr/' } } ) }
-      let(:is_delete) { true }
-      it 'should send a delete_by_id command' do
-        expect(solr_connector).to receive(:delete_by_id).with(druid, {:add_attributes=>{:commitWithin=>10000}})
-        BaseIndexer::Solr::Client.process(druid, {}, solr_connector, max_retries, is_delete)
-      end
+  describe 'delete' do
+    let (:solr_connector) { double('connector', { options: { url: 'http://localhost:8983/solr/' } } ) }
+    it 'should send a delete_by_id command' do
+      expect(solr_connector).to receive(:delete_by_id).with(druid, {:add_attributes=>{:commitWithin=>10000}})
+      BaseIndexer::Solr::Client.delete(druid, solr_connector)
     end
-    describe 'update' do
-      let(:is_delete) { false }
-      let(:response) { double({}) }
-      let (:solr_connector) { double('connector', { options: { url: 'http://localhost:8983/solr/', allow_update: true } } ) }
-      it 'should send update_solr_doc' do
-        allow(solr_connector).to receive(:get).with("select", {:params=>{:q=>"id:\"cb077vs7846\""}}).and_return(:response)
-        allow(BaseIndexer::Solr::Client).to receive(:update_solr_doc).with(druid, solr_doc, solr_connector)
-        expect(solr_connector).to receive(:add).with(solr_doc, :add_attributes => {:commitWithin => 10000})
-        BaseIndexer::Solr::Client.process(druid, solr_doc, solr_connector, max_retries, is_delete)
-      end
+  end
+  describe 'update' do
+    let(:response) { { 'response' => { 'numFound' => 1 } } }
+    let (:solr_connector) { double('connector', { options: { url: 'http://localhost:8983/solr/', allow_update: true } } ) }
+    it 'should send update_solr_doc' do
+      allow(solr_connector).to receive(:get).with("select", {:params=>{ :q=>"id:\"cb077vs7846\"", :defType => 'lucene'}}).and_return(response)
+      expect(solr_connector).to receive(:update).with(hash_including(data: [{ id: 'cb077vs7846', a: { set: 1 }}].to_json))
+      BaseIndexer::Solr::Client.add(druid, solr_doc, solr_connector)
     end
-    describe 'add' do
-      let(:is_delete) { false }
-      let(:response) { double({}) }
-      let (:solr_connector) { double('connector', { options: { url: 'http://localhost:8983/solr/', allow_update: true, commitWithin: '10000'} } ) }
-      it 'should send an add command' do
-        allow(solr_connector).to receive(:get).with("select", {:params=>{:q=>"id:\"cb077vs7846\""}}).and_return(:response)
-        expect(solr_connector).to receive(:add).with(solr_doc, :add_attributes => {:commitWithin => 10000})
-        BaseIndexer::Solr::Client.process(druid, solr_doc, solr_connector, max_retries, is_delete)
-      end
+  end
+  describe 'add' do
+    let(:response) { double({}) }
+    let (:solr_connector) { double('connector', { options: { url: 'http://localhost:8983/solr/', allow_update: true, commitWithin: '10000'} } ) }
+    it 'should send an add command' do
+      allow(solr_connector).to receive(:get).with("select", {:params=>{:q=>"id:\"cb077vs7846\"", :defType => 'lucene'}}).and_return(:response)
+      expect(solr_connector).to receive(:add).with(solr_doc, :add_attributes => {:commitWithin => 10000})
+      BaseIndexer::Solr::Client.add(druid, solr_doc, solr_connector)
     end
   end
 end

data/spec/base_indexer/solr/writer_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe BaseIndexer::Solr::Writer do
+RSpec.describe BaseIndexer::Solr::Writer do
   let(:sw_connection) { { url: 'http://solr-core:8983/sw-prod/' } }
   let(:preview_connection) { { url: 'http://solr-core:8983/sw-preview/' } }
   let(:mix_targets) { { 'searchworks' => true, 'searchworks:preview' => false } }
@@ -20,17 +20,17 @@ describe BaseIndexer::Solr::Writer do
     it 'should create two arrays index_targets and delete_targets' do
       expect(subject).to receive(:solr_index_client).with(id, solr_doc, ['searchworks'])
       expect(subject).to receive(:solr_delete_client).with(id, ['searchworks:preview'])
-      subject.process(id, solr_doc, mix_targets, {})
+      subject.process(id, solr_doc, mix_targets)
     end
     it 'should not send delete messages when there are no delete targets' do
       expect(subject).to receive(:solr_index_client).with(id, solr_doc, ['searchworks'])
-      expect(subject).not_to receive(:solr_delete_client)
-      subject.process(id, solr_doc, index_targets, {})
+      expect(BaseIndexer::Solr::Client).not_to receive(:delete)
+      subject.process(id, solr_doc, index_targets)
     end
     it 'should not send index messages when there are no index targets' do
-      expect(subject).not_to receive(:solr_index_client)
+      expect(BaseIndexer::Solr::Client).not_to receive(:add)
       expect(subject).to receive(:solr_delete_client).with(id, ['searchworks:preview'])
-      subject.process(id, solr_doc, delete_targets, {})
+      subject.process(id, solr_doc, delete_targets)
     end
   end
 
@@ -38,12 +38,12 @@ describe BaseIndexer::Solr::Writer do
     it 'should call solr client delete method for each target' do
       expect(BaseIndexer::Solr::Client).to receive(:delete).with('aa111bb222', an_instance_of(RSolr::Client))
       expect(BaseIndexer::Solr::Client).to receive(:delete).with('aa111bb222', an_instance_of(RSolr::Client))
-      subject.solr_delete_client('aa111bb222', ['searchworks', 'searchworks:preview'])
+      subject.process('aa111bb222', {}, { 'searchworks' => false, 'searchworks:preview' => false })
     end
 
     it 'should not call solr client delete method when there is no client for the given target' do
       expect(BaseIndexer::Solr::Client).not_to receive(:delete)
-      subject.solr_delete_client('aa111bb222', ['blah'])
+      subject.process('aa111bb222', {}, { 'blah' => false })
     end
   end
 
@@ -62,11 +62,5 @@ describe BaseIndexer::Solr::Writer do
       solr_connector = subject.get_connector_for_target('nothing')
       expect(solr_connector).to be_nil
     end
-
-    it 'should return nil for a nil solr targets list' do
-      allow(subject).to receive(:solr_targets_configs).and_return(nil)
-      solr_connector = subject.get_connector_for_target('searchworks')
-      expect(solr_connector).to be_nil
-    end
   end
 end

data/spec/controllers/base_indexer/items_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe BaseIndexer::ItemsController, type: :controller do
+RSpec.describe BaseIndexer::ItemsController, type: :controller do
   let(:my_instance) { instance_double(BaseIndexer::MainIndexerEngine) }
   before do
     allow(BaseIndexer::MainIndexerEngine).to receive(:new).and_return(my_instance)

data/spec/spec_helper.rb

@@ -65,48 +65,55 @@ RSpec.configure do |config|
 
   # The settings below are suggested to provide a good initial experience
   # with RSpec, but feel free to customize to your heart's content.
-  #   # These two settings work together to allow you to limit a spec run
-  #   # to individual examples or groups you care about by tagging them with
-  #   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  #   # get run.
-  #   config.filter_run :focus
-  #   config.run_all_when_everything_filtered = true
-  #
-  #   # Limits the available syntax to the non-monkey patched syntax that is
-  #   # recommended. For more details, see:
-  #   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  #   config.disable_monkey_patching!
-  #
-  #   # This setting enables warnings. It's recommended, but in some cases may
-  #   # be too noisy due to issues in dependencies.
-  #   config.warnings = true
-  #
-  #   # Many RSpec users commonly either run the entire suite or an individual
-  #   # file, and it's useful to allow more verbose output when running an
-  #   # individual spec file.
-  #   if config.files_to_run.one?
-  #     # Use the documentation formatter for detailed output,
-  #     # unless a formatter has already been configured
-  #     # (e.g. via a command-line flag).
-  #     config.default_formatter = 'doc'
-  #   end
-  #
-  #   # Print the 10 slowest examples and example groups at the
-  #   # end of the spec run, to help surface which specs are running
-  #   # particularly slow.
-  #   config.profile_examples = 10
-  #
-  #   # Run specs in random order to surface order dependencies. If you find an
-  #   # order dependency and want to debug it, you can fix the order by providing
-  #   # the seed, which is printed after each run.
-  #   #     --seed 1234
-  #   config.order = :random
-  #
-  #   # Seed global randomization in this process using the `--seed` CLI option.
-  #   # Setting this allows you to use `--seed` to deterministically reproduce
-  #   # test failures related to randomization by passing the same `--seed` value
-  #   # as the one that triggered the failure.
-  #   Kernel.srand config.seed
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: base_indexer
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Ahmed Alsum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dor-fetcher
+  name: harvestdor-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -242,7 +242,6 @@ files:
 - Rakefile
 - app/controllers/base_indexer/about_controller.rb
 - app/controllers/base_indexer/application_controller.rb
-- app/controllers/base_indexer/collections_controller.rb
 - app/controllers/base_indexer/items_controller.rb
 - app/helpers/base_indexer/application_helper.rb
 - app/helpers/base_indexer/items_helper.rb

data/app/controllers/base_indexer/collections_controller.rb

@@ -1,40 +0,0 @@
-require_dependency 'base_indexer/application_controller'
-
-module BaseIndexer
-  class CollectionsController < ApplicationController
-    def update
-      druid = remove_prefix params[:id]
-
-      Rails.logger.debug "Receiving indexing of collection #{druid}"
-      targets = params[:subtargets]
-
-      # initial collection item itself
-      indexer = BaseIndexer.indexer_class.constantize.new
-      indexer.index druid, targets
-
-      # Determine collection item druids
-      fetcher = BaseIndexer.fetcher_class.constantize.new(service_url: Rails.application.config.fetcher_url)
-      item_druids = fetcher.druid_array(fetcher.get_collection(druid, {}))
-
-      Rails.logger.debug "Found #{item_druids.size} members of the collection #{druid}"
-
-      counter = 0
-
-      item_druids.each do |idruid|
-        druid = remove_prefix idruid
-        counter += 1
-        indexer.index druid, targets
-        Rails.logger.debug "#{counter} of #{item_druids.size}: #{druid}"
-      end
-
-      @status = report_success
-      head :ok
-      Rails.logger.debug "Completing indexing of collection #{druid}"
-
-    rescue Exception => e
-      @status = report_failure request.method_symbol, params, e
-      Rails.logger.error @status
-      raise
-    end
-  end
-end