base_indexer 2.0.0 → 3.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d970b5ac2c8deb027d2b9d58c1f42e422b2ac80
-  data.tar.gz: d0d47d0ffa6750d559f81341f5beb4a196c6ac5f
+  metadata.gz: bf0470bb5a1c835a86d069127d8e02cb7504454b
+  data.tar.gz: abcb0fe938d4f8a3aa84df83950ddf4ba6d7902b
 SHA512:
-  metadata.gz: e8f1681e38672dc4947407cb83a17066c143368f17442c59d97df78044557957ea95aff729904c1da7131116e4e0df9fe8e44618397e64fa859e4855592ce6a0
-  data.tar.gz: 81cf6fd0fb29af5545b41c21fb64c4c2a02bfa264d39f431373dc231950ebbc8ba74e424dfbb9435efc2d9d5bd29aba3d27edfb63c5500d8b2d6ddd24b9b0352
+  metadata.gz: 5554938e73ffe3d17f3b079cd2248f936c02ed0aeb2509db50563047e835ae06d5b5d54d0d711d32d4efeed5b277234a4557e525046f595f22e77b91d6311cd3
+  data.tar.gz: 8ba932273e7dafad5b3f6718a9385bb2848a7196da3578649df5605cd23fbd8c385921b4e8c82a70d35f20fad8a25b589b6404734043d57592b68096de38174c

data/app/controllers/base_indexer/application_controller.rb

@@ -1,6 +1,5 @@
 module BaseIndexer
   class ApplicationController < ActionController::Base
-    respond_to :json, :xml, :html
 
     def remove_prefix(druid)
       druid.gsub('druid:', '') # lop off druid prefix if sent

data/app/controllers/base_indexer/collections_controller.rb

@@ -12,10 +12,9 @@ module BaseIndexer
       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, {}))
+      # 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}"
 

data/app/controllers/base_indexer/items_controller.rb

@@ -3,34 +3,47 @@ require_dependency 'base_indexer/application_controller'
 module BaseIndexer
   class ItemsController < ApplicationController
     def update
-      druid = remove_prefix params[:id]
       Rails.logger.debug "Receiving indexing #{druid}"
-      targets = params[:subtargets]
 
       indexer = BaseIndexer.indexer_class.constantize.new
-      indexer.index druid, targets
-      @status = report_success
+      indexer.index druid, { subtarget_params => true }
       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
+      Rails.logger.error report_failure request.method_symbol, params, e
       render nothing: true, status: 202
     end
 
     def destroy
-      druid = remove_prefix params[:id]
       Rails.logger.debug "Receiving deleting #{druid}"
-
       indexer = BaseIndexer.indexer_class.constantize.new
-      indexer.delete druid
-      @status = report_success
+      # If no subtarget is defined, delete from everywhere
+      if optional_subtarget_params.nil?
+        indexer.delete druid
+      else
+        ##
+        # Only delete from specified subtarget
+        indexer.index druid, { subtarget_params => false }
+      end
       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
+      Rails.logger.error report_failure request.method_symbol, params, e
       render nothing: true, status: 202
     end
+
+    private
+
+    def druid
+      remove_prefix params.require(:druid)
+    end
+
+    def optional_subtarget_params
+      params.permit(:subtarget)[:subtarget]
+    end
+
+    def subtarget_params
+      params.require(:subtarget)
+    end
   end
 end

data/config/routes.rb

@@ -3,6 +3,13 @@ BaseIndexer::Engine.routes.draw do
   get 'about/version' => 'about#version'
   get 'about' => 'about#version'
 
-  resources :items, only: [:update, :destroy]
+  resources :items, only: [:destroy], param: :druid, default: { format: :json } do
+    member do
+      patch 'subtargets/:subtarget', action: :update
+      put 'subtargets/:subtarget', action: :update
+      delete 'subtargets/:subtarget', action: :destroy
+    end
+  end
+
   resources :collections, only: :update
 end

data/lib/base_indexer/version.rb

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

data/lib/base_indexer.rb

@@ -11,4 +11,5 @@ module BaseIndexer
   mattr_accessor :mapper_class_name
   mattr_accessor :solr_writer_class_name
   mattr_accessor :solr_configuration_class_name
+  mattr_accessor :fetcher_class
 end

data/lib/generators/base_indexer/install_generator.rb

@@ -9,5 +9,9 @@ module BaseIndexer
     def assets
       copy_file 'solr.yml', 'config/solr.yml'
     end
-   end
+
+    def add_routes
+      route "mount BaseIndexer::Engine, at: '/'"
+    end
+  end
 end

data/lib/tasks/index.rake

@@ -48,10 +48,8 @@ task :log_indexer => :environment do |t, args|
   errors=0
   indexed=0
 
-  druids=[]
-
   if ['preassembly','remediate'].include? log_type
-    YAML.load_stream(IO.read(log_file_path)) { |obj| druids << obj[:pid] if obj[log_completed] == true}
+    YAML.load_stream(IO.read(log_file_path)).map { |obj| obj[:pid] if obj[log_completed] == true}
   else
     csv = CSV.parse(IO.read(log_file_path), :headers => true)
     druids=csv.map { |row| row.to_hash.with_indifferent_access['druid'] }.delete_if {|druid| druid.nil?}
@@ -162,14 +160,14 @@ task :collection_indexer => :environment do |t, args|
 
   indexer = BaseIndexer.indexer_class.constantize.new
 
-  df = DorFetcher::Client.new({:service_url => Rails.application.config.dor_fetcher_url})
+  fetcher = BaseIndexer.fetcher_class.constantize.new(service_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 = df.druid_array(df.get_collection(collection_druid, {}))
+  druids = fetcher.druid_array(fetcher.get_collection(collection_druid, {}))
 
   log my_logger,"** Found #{druids.size} members of the collection"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: base_indexer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0.pre1
 platform: ruby
 authors:
 - Ahmed Alsum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,30 +85,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Summary of BaseIndexer.
 test_files: []
-has_rdoc: