base_indexer 3.0.0.pre1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf0470bb5a1c835a86d069127d8e02cb7504454b
-  data.tar.gz: abcb0fe938d4f8a3aa84df83950ddf4ba6d7902b
+  metadata.gz: 7c8632ff625459ac2ee0a4b34e95e2fa38ed4306
+  data.tar.gz: b3eaab7a1ef88ee04ae3cfa8429e66075af7ce5a
 SHA512:
-  metadata.gz: 5554938e73ffe3d17f3b079cd2248f936c02ed0aeb2509db50563047e835ae06d5b5d54d0d711d32d4efeed5b277234a4557e525046f595f22e77b91d6311cd3
-  data.tar.gz: 8ba932273e7dafad5b3f6718a9385bb2848a7196da3578649df5605cd23fbd8c385921b4e8c82a70d35f20fad8a25b589b6404734043d57592b68096de38174c
+  metadata.gz: fbfabfa97ae959e72e1638d4d2c0abeedac7efda67d625c82537ab6ef10805270c20cd5bf79d74b87e6b9072c7562f91c85e23b98803e4b377e568545224bddc
+  data.tar.gz: 0e266c03b6556806684761f5f7c32bb85f7e95ea586748771533fa0d8defd7760e71fca8e7f4062ef83e1938d0a334f03f9c30c4caf475f1b9b63ccf2bba76fc

data/app/controllers/base_indexer/collections_controller.rb

@@ -34,7 +34,7 @@ module BaseIndexer
     rescue Exception => e
       @status = report_failure request.method_symbol, params, e
       Rails.logger.error @status
-      render nothing: true, status: 202
+      render nothing: true, status: 500
     end
   end
 end

data/app/controllers/base_indexer/items_controller.rb

@@ -11,7 +11,7 @@ module BaseIndexer
       Rails.logger.debug "Completing indexing #{druid}"
     rescue StandardError => e
       Rails.logger.error report_failure request.method_symbol, params, e
-      render nothing: true, status: 202
+      render nothing: true, status: 500
     end
 
     def destroy
@@ -29,7 +29,7 @@ module BaseIndexer
       Rails.logger.debug "Completing deleting #{druid}"
     rescue StandardError => e
       Rails.logger.error report_failure request.method_symbol, params, e
-      render nothing: true, status: 202
+      render nothing: true, status: 500
     end
 
     private

data/lib/base_indexer/config/solr_configuration_from_file.rb

@@ -19,7 +19,7 @@ module BaseIndexer
      #
      #   {"target1":{"url"=>"http://localhost/solr/","open_timeout"=>120},"target2":{"url"=>"http://solr-cor.com/solr/"}}
      def get_configuration_hash
-      @solr_config_hash
+       Hash[ @solr_config_hash.collect {|k,v| [k.upcase, v] } ] # updase all of the target names
     end
   end
 end

data/lib/base_indexer/solr/client.rb

@@ -35,7 +35,7 @@ module BaseIndexer
       # @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.debug "#{exception.class} on attempt #{attempt_number} for #{id}"
+          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|

data/lib/base_indexer/solr/writer.rb

@@ -43,9 +43,11 @@ module BaseIndexer
 
       def get_connector_for_target(solr_target)
         solr_connector = nil
-        if solr_targets_configs.keys.include?(solr_target)
-          config = solr_targets_configs[solr_target]
-          solr_connector = RSolr.connect(config.deep_symbolize_keys)
+        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)
+          end
         end
         solr_connector
       end

data/lib/base_indexer/version.rb

@@ -1,3 +1,3 @@
 module BaseIndexer
-  VERSION = '3.0.0.pre1'
+  VERSION = '3.0.0'
 end

data/lib/tasks/index.rake

@@ -30,7 +30,7 @@ task :log_indexer => :environment do |t, args|
   raise 'Log type must be preassembly, remediate or csv.' unless ['preassembly','remediate','csv'].include? log_type
   raise 'Log file not found.' unless File.readable? log_file_path
 
-  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]
+  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target.upcase]
 
   raise 'Target not found.' if target_config.nil?
 
@@ -55,7 +55,7 @@ task :log_indexer => :environment do |t, args|
     druids=csv.map { |row| row.to_hash.with_indifferent_access['druid'] }.delete_if {|druid| druid.nil?}
   end
 
-  solr_server=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]['url']
+  solr_server=target_config['url']
 
   log my_logger,"** Indexing #{druids.size} druids from #{log_file_path} into solr server #{solr_server} (target=#{target}).  Log file is of type #{log_type}."
   log my_logger,"Indexing started at #{start_time}"
@@ -121,11 +121,11 @@ task :index => :environment do |t, args|
 
   raise 'You must specify a target and druid.' if target.blank? || druid.blank?
 
-  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]
+  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target.upcase]
 
   raise 'Target not found.' if target_config.nil?
 
-  solr_server=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]['url']
+  solr_server=target_config['url']
 
   puts "** Indexing #{druid} druid into solr server #{solr_server} (target=#{target})."
 
@@ -144,11 +144,11 @@ task :collection_indexer => :environment do |t, args|
 
   raise 'You must specify a target and collection druid.' if target.blank? || collection_druid.blank?
 
-  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]
+  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target.upcase]
 
   raise 'Target not found.' if target_config.nil?
 
-  solr_server=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]['url']
+  solr_server=target_config['url']
 
   output_log_file_name="#{Rails.root}/log/collection_#{collection_druid}_indexer_#{Time.now.strftime('%Y%m%d-%H%M%S')}.log"
   my_logger=Logger.new(output_log_file_name) # set up a new log file
@@ -211,7 +211,7 @@ task :reindexer => :environment do |t, args|
   raise 'You must specify a target and file.' if target.blank? || file_path.blank?
   raise 'File not found.' unless File.readable? file_path
 
-  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]
+  target_config=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target.upcase]
 
   raise 'Target not found.' if target_config.nil?
 
@@ -220,7 +220,7 @@ task :reindexer => :environment do |t, args|
   errors=0
   indexed=0
 
-  solr_server=BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash[target]['url']
+  solr_server=target_config['url']
 
   output_log_file_name="#{Rails.root}/log/#{File.basename(file_path,File.extname(file_path))}_reindex_#{Time.now.strftime('%Y%m%d-%H%M%S')}.log"
   my_logger=Logger.new(output_log_file_name) # set up a new log file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: base_indexer
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre1
+  version: 3.0.0
 platform: ruby
 authors:
 - Ahmed Alsum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,16 +29,22 @@ dependencies:
   name: discovery-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: is_it_working-cbeer
+  name: dor-fetcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -225,7 +231,6 @@ files:
 - app/views/base_indexer/items/destroy.json.erb
 - app/views/base_indexer/items/new.json.erb
 - config/initializers/base_indexer.rb
-- config/initializers/is_it_working.rb
 - config/routes.rb
 - lib/base_indexer.rb
 - lib/base_indexer/config/solr_configuration.rb
@@ -254,9 +259,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/config/initializers/is_it_working.rb

@@ -1,3 +0,0 @@
-require 'is_it_working'
-Rails.configuration.middleware.use(IsItWorking::Handler) do |_h|
-end