base_indexer 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a19d34845a0a633c06610cb45bdefb993c3ee8
-  data.tar.gz: 301b400453ff6a144c7a351ee44b35b7b44063eb
+  metadata.gz: fafea5ec9ef440680cfc8a75fc6baa0ae9e976f3
+  data.tar.gz: 5bb1d6677f86ab0956b2bc8d32258f5e8f0550fe
 SHA512:
-  metadata.gz: 8009397678aa7560e53fdcdf807dc1b83046f8201f75a26fad0afd90b648c6b0a36be570b8dd81e3d4a57de5ff5ebe7f44cb87cdb048197b4ff25e5155a5a105
-  data.tar.gz: 3e54bcea6aa65496416721d341d121789c87ee5e832039aaec3b744f17b8cabac30a6cc10a784b9893e3dad36862cd72a5a84af3fb1084788162b1b3e3e74e6b
+  metadata.gz: 1c76f5a3f5ffa68ac9490f86696c69020993e6254c6aedddca60731f9d4debb9fdf2eac1129d68e9fa89a1335c34d5371c24975b60bf9f633ff82ca396cf0983
+  data.tar.gz: 37181e9abc7c82f855bdeba95272b3d6153ec96eab2832f8f842abce19eb702fcad6a9e2af93e41a8b44d503d36258c7916e044c42200ea7cd2e7b6ed3daa8ed

data/Rakefile

@@ -11,16 +11,16 @@ require 'yard/rake/yardoc_task'
 
 Bundler::GemHelper.install_tasks
 
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |f| load f }
 
 # Travis ci task
-task :default => :ci  
-desc "run continuous integration suite (tests, coverage, docs)" 
+task default: :ci
+desc 'run continuous integration suite (tests, coverage, docs)'
 
 require 'engine_cart/rake_task'
 EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
-task :ci => ['engine_cart:generate'] do
+task ci: ['engine_cart:generate'] do
   # run the tests
   Rake::Task['spec'].invoke
   Rake::Task['doc'].invoke
@@ -35,15 +35,12 @@ begin
 
   YARD::Rake::YardocTask.new(:doc) do |yt|
     yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
-                 [ File.join(project_root, 'README.rdoc') ]
+      [File.join(project_root, 'README.rdoc')]
     yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'Discovery Indexer Documentation']
   end
 rescue LoadError
-  desc "Generate YARD Documentation"
+  desc 'Generate YARD Documentation'
   task :doc do
-    abort "Please install the YARD gem to generate rdoc."
+    abort 'Please install the YARD gem to generate rdoc.'
   end
-end  
-
-
-
+end

data/app/controllers/base_indexer/about_controller.rb

@@ -1,24 +1,20 @@
 module BaseIndexer
   class AboutController < ApplicationController
-  
     def index
       render text: 'ok', status: 200
     end
-  
+
     def version
-      
-      @result={:app_name=>Rails.configuration.app_name,:rails_env=>Rails.env,:version=>Rails.configuration.app_version,:last_restart=>(File.exists?('tmp/restart.txt') ? File.new('tmp/restart.txt').mtime : "n/a"),:last_deploy=>(File.exists?('REVISION') ? File.new('REVISION').mtime : "n/a"),:revision=>(File.exists?('REVISION') ? File.read('REVISION') : "n/a")}
-      @result.update({:solr_cores=>BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash})
-      @result.update({:gems=>Gem.loaded_specs}) if request.format.html?
-        
+      @result = { app_name: Rails.configuration.app_name, rails_env: Rails.env, version: Rails.configuration.app_version, last_restart: (File.exist?('tmp/restart.txt') ? File.new('tmp/restart.txt').mtime : 'n/a'), last_deploy: (File.exist?('REVISION') ? File.new('REVISION').mtime : 'n/a'), revision: (File.exist?('REVISION') ? File.read('REVISION') : 'n/a') }
+      @result.update(solr_cores: BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash)
+      @result.update(gems: Gem.loaded_specs) if request.format.html?
+
       respond_to do |format|
-        format.json {render json: @result.to_json}
-        format.xml {render json: result.to_xml(root: 'status')}
-        format.html {render}
+        format.json { render json: @result.to_json }
+        format.xml { render json: result.to_xml(root: 'status') }
+        format.html { render }
         # add the solr core names
-      end      
-      
+      end
     end
-    
   end
-end
+end

data/app/controllers/base_indexer/application_controller.rb

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

data/app/controllers/base_indexer/collections_controller.rb

@@ -1,47 +1,41 @@
-require_dependency "base_indexer/application_controller"
+require_dependency 'base_indexer/application_controller'
 
 module BaseIndexer
   class CollectionsController < ApplicationController
-
     def new
-      begin  
-        druid = remove_prefix params[:druid]
-        
-        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
+      druid = remove_prefix params[:druid]
+
+      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
+
+      # initialize dor-fetcher to get list of druids for this collection
+      df = DorFetcher::Client.new(service_url: Rails.application.config.dor_fetcher_url)
+
+      item_druids = df.druid_array(df.get_collection(druid, {}))
 
-        # initialize dor-fetcher to get list of druids for this collection
-        df = DorFetcher::Client.new({:service_url => Rails.application.config.dor_fetcher_url})
-
-        item_druids = df.druid_array(df.get_collection(druid, {}))
-
-        Rails.logger.debug "Found #{item_druids.size} members of the collection #{druid}"
-
-        counter=0
-  
-        item_druids.each do |druid|
-          
-          druid=remove_prefix druid
-          counter+=1
-          indexer.index druid,targets 
-          Rails.logger.debug "#{counter} of #{item_druids.size}: #{druid}"
-
-        end
-  
-        @status = report_success
-        render nothing: true, status: 200
-        Rails.logger.debug "Completing indexing of collection #{druid}"
-        
-      rescue Exception => e  
-        @status = report_failure request.method_symbol, params, e
-        Rails.logger.error @status
-        render nothing: true, status: 202
+      Rails.logger.debug "Found #{item_druids.size} members of the collection #{druid}"
+
+      counter = 0
+
+      item_druids.each do |druid|
+        druid = remove_prefix druid
+        counter += 1
+        indexer.index druid, targets
+        Rails.logger.debug "#{counter} of #{item_druids.size}: #{druid}"
       end
-    end
 
+      @status = report_success
+      render nothing: true, status: 200
+      Rails.logger.debug "Completing indexing of collection #{druid}"
+
+    rescue Exception => e
+      @status = report_failure request.method_symbol, params, e
+      Rails.logger.error @status
+      render nothing: true, status: 202
+    end
   end
 end

data/app/controllers/base_indexer/items_controller.rb

@@ -1,42 +1,36 @@
-require_dependency "base_indexer/application_controller"
+require_dependency 'base_indexer/application_controller'
 
 module BaseIndexer
   class ItemsController < ApplicationController
-
     def new
-      begin  
-        druid = remove_prefix params[:druid]
-        Rails.logger.debug "Receiving indexing #{druid}"
-        targets = params[:subtargets]
-        
-        indexer = BaseIndexer.indexer_class.constantize.new
-        indexer.index druid, targets
-        @status = report_success
-        render nothing: true, status: 200
-        Rails.logger.debug "Completing indexing #{druid}"
-      rescue Exception => e  
-        @status = report_failure request.method_symbol, params, e
-        Rails.logger.error @status
-        render nothing: true, status: 202
-      end
+      druid = remove_prefix params[:druid]
+      Rails.logger.debug "Receiving indexing #{druid}"
+      targets = params[:subtargets]
+
+      indexer = BaseIndexer.indexer_class.constantize.new
+      indexer.index druid, targets
+      @status = report_success
+      render nothing: true, status: 200
+      Rails.logger.debug "Completing indexing #{druid}"
+    rescue StandardError => e
+      @status = report_failure request.method_symbol, params, e
+      Rails.logger.error @status
+      render nothing: true, status: 202
     end
-    
+
     def destroy
-      begin
-        druid = remove_prefix params[:druid]
-        Rails.logger.debug "Receiving deleting #{druid}"
-        
-        indexer = BaseIndexer.indexer_class.constantize.new
-        indexer.delete druid
-        @status= report_success
-        render nothing: true, status: 200
-        Rails.logger.debug "Completing deleting #{druid}"
-      rescue Exception => e  
-        @status =  report_failure request.method_symbol, params, e
-        Rails.logger.error @status
-        render nothing: true, status: 202
-      end
+      druid = remove_prefix params[:druid]
+      Rails.logger.debug "Receiving deleting #{druid}"
+
+      indexer = BaseIndexer.indexer_class.constantize.new
+      indexer.delete druid
+      @status = report_success
+      render nothing: true, status: 200
+      Rails.logger.debug "Completing deleting #{druid}"
+    rescue StandardError => e
+      @status =  report_failure request.method_symbol, params, e
+      Rails.logger.error @status
+      render nothing: true, status: 202
     end
-        
   end
 end

data/config/initializers/base_indexer.rb

@@ -1,8 +1,8 @@
 
-# Define the indexer class that will be used by the engine. 
+# Define the indexer class that will be used by the engine.
 # The engine consumer app should override this class
-BaseIndexer.indexer_class = "BaseIndexer::MainIndexerEngine"
-BaseIndexer.solr_configuration_class_name = "BaseIndexer::SolrConfigurationFromFile"
-#BaseIndexer.solr_configuration_class.constantize.new(Rails.configuration.solr_config_file_path)
-BaseIndexer.mapper_class_name = "DiscoveryIndexer::Mapper::GeneralMapper"
-BaseIndexer.solr_writer_class_name = "DiscoveryIndexer::Writer::SolrWriter"
+BaseIndexer.indexer_class = 'BaseIndexer::MainIndexerEngine'
+BaseIndexer.solr_configuration_class_name = 'BaseIndexer::SolrConfigurationFromFile'
+# BaseIndexer.solr_configuration_class.constantize.new(Rails.configuration.solr_config_file_path)
+BaseIndexer.mapper_class_name = 'DiscoveryIndexer::Mapper::GeneralMapper'
+BaseIndexer.solr_writer_class_name = 'DiscoveryIndexer::Writer::SolrWriter'

data/config/initializers/is_it_working.rb

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

data/config/routes.rb

@@ -7,5 +7,4 @@ BaseIndexer::Engine.routes.draw do
   delete '/items/:druid', to: 'items#destroy'
 
   post '/collections/:druid', to: 'collections#new'
-
 end

data/lib/base_indexer.rb

@@ -1,9 +1,9 @@
-require "base_indexer/engine"
+require 'base_indexer/engine'
 
-require "base_indexer/main_indexer_engine"
-require "base_indexer/solr/solr_configuration"
-require "base_indexer/solr/solr_configuration_from_file"
-require "base_indexer/collection"
+require 'base_indexer/main_indexer_engine'
+require 'base_indexer/solr/solr_configuration'
+require 'base_indexer/solr/solr_configuration_from_file'
+require 'base_indexer/collection'
 require 'discovery-indexer'
 module BaseIndexer
   mattr_accessor :indexer_class
@@ -11,4 +11,3 @@ module BaseIndexer
   mattr_accessor :solr_writer_class_name
   mattr_accessor :solr_configuration_class_name
 end
-

data/lib/base_indexer/engine.rb

@@ -3,29 +3,27 @@ require 'active_support/core_ext/numeric/bytes'
 module BaseIndexer
   class Engine < ::Rails::Engine
     isolate_namespace BaseIndexer
-    
+
     # Initialize memory store cache with 50 MB size
-    config.cache_store = [:memory_store, {:size => 64.megabytes }]
-    
+    config.cache_store = [:memory_store, { size: 64.megabytes }]
+
     config.generators do |g|
       g.test_framework :rspec
     end
-    config.app_version = "0.0"
-    config.app_name = "[You have to override this name in your app]"
- 
+    config.app_version = '0.0'
+    config.app_name = '[You have to override this name in your app]'
+
     config.after_initialize do
-      
-      config.solr_config_file = File.join(Rails.root, "config","solr.yml")
-      
-      if File.exists? config.solr_config_file
+      config.solr_config_file = File.join(Rails.root, 'config', 'solr.yml')
+
+      if File.exist? config.solr_config_file
         # Reads the SOLR configuration file
         BaseIndexer.solr_configuration_class_name.constantize.instance.read(config.solr_config_file)
       end
-      
-      # Initializes the DiscoveryIndexer log with Rails logger, so all the messages will go to 
+
+      # Initializes the DiscoveryIndexer log with Rails logger, so all the messages will go to
       #   the same log file
       DiscoveryIndexer::Logging.logger = Rails.logger
     end
   end
 end
-

data/lib/base_indexer/version.rb

@@ -1,3 +1,3 @@
 module BaseIndexer
-  VERSION = "0.4.8"
+  VERSION = '0.4.9'
 end

data/lib/generators/base_indexer/install_generator.rb

@@ -1,14 +1,13 @@
 require 'rails/generators'
 
 module BaseIndexer
- class Install < Rails::Generators::Base
+  class Install < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
 
-	source_root File.expand_path('../templates', __FILE__)
-
-    desc "Install Base Indexer"
+    desc 'Install Base Indexer'
 
     def assets
-      copy_file "solr.yml", "config/solr.yml"
+      copy_file 'solr.yml', 'config/solr.yml'
     end
-  end
-end
+   end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: base_indexer
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Ahmed Alsum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,6 @@ dependencies:
         version: '0'
 description: Description of BaseIndexer.
 email:
-- aalsum@stanford.edu
 - laneymcg@stanford.edu
 executables: []
 extensions: []