cdmbl 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c42251d98410bacf0c610a536e9514e0e4a6662
-  data.tar.gz: 77fb5f56972cf1bb3b7e31ad8be7188cdf4c5fda
+  metadata.gz: ec2dc41e2bed58f7f93388d3327fa4b45812ab33
+  data.tar.gz: e7d0b8c9b54fce9f35978beafe515f9e17f5441d
 SHA512:
-  metadata.gz: 49d38e10d6871c4d4e4e249624b543787f6476aaebb680748babf822932127eac82bdb81259177b7b9e1e543b816ac012e4d08735bf882a57e3829c1175efb13
-  data.tar.gz: 8d99175077e75f997efb3c0233eeed32d1be2142403d3a566452471faa3b13926573a2c4cba19540dfab2328455175e8c19369ce61d5db6fe2becf5df1de3995
+  metadata.gz: 3ed793f0f5cf45571dd89e03649938fbc07a54a05a03942e0646803a8b3270c3c0ae8e97e4b095038cc8634591c2f0897d192ff7bb2c7f9e28415ca2e92c3d2b
+  data.tar.gz: 1aa8224e92bdb48bf875e9b4a188db4d06e003f7e0b95b616aff100bb4dd653c12aeb0a6929e74cdd5dfe7e2197a64daa9d762b6e2aacb9ba0afb0ea9ec9a67e

data/lib/cdmbl/batch_deleter.rb

@@ -8,7 +8,7 @@ module CDMBL
                 :oai_deletables_klass
     def initialize(prefix: '',
                    start: 0,
-                   batch_size: 200,
+                   batch_size: 10,
                    oai_client: :missing_oai_client,
                    solr_client: :missing_solr_client,
                    oai_deletables_klass: OaiDeletables)
@@ -28,24 +28,25 @@ module CDMBL
       start + batch_size >= num_found
     end
 
-    private
-
     def deletables
-      oai_deletables_klass.new(identifiers: docs,
-                               prefix: prefix,
-                               oai_client: oai_client).deletables
+      @deletables ||= oai_deletables_klass.new(identifiers: ids,
+                                               oai_client: oai_client,
+                                               prefix: prefix).deletables
     end
 
-    def docs
-      ids.fetch('response', {}).fetch('docs', {})
+    private
+
+
+    def ids
+      results.fetch('response', {}).fetch('docs', {}).map { |doc| doc['id'] }
     end
 
     def num_found
-      ids.fetch('response', {}).fetch('numFound', 0)
+      results.fetch('response', {}).fetch('numFound', 0)
     end
 
-    def ids
-      @ids ||= solr_client.ids(start: start)
+    def results
+      @results ||= solr_client.ids(start: start)
     end
   end
 end

data/lib/cdmbl/batch_deleter_worker.rb

@@ -3,31 +3,36 @@ module CDMBL
   class BatchDeleterWorker
     include Sidekiq::Worker
     attr_reader :start, :prefix, :oai_url, :solr_url
+    attr_accessor :batch_deleter_klass, :oai_client, :solr_client
+    sidekiq_options :backtrace => true
     def perform(start = 0, prefix = '', oai_url = '', solr_url = '')
       @start    = start
       @prefix   = prefix
       @oai_url  = oai_url
       @solr_url = solr_url
       delete!
+      batch_deleter
     end
 
     private
 
+    def batch_deleter_klass
+      @batch_deleter_klass ||= BatchDeleter
+    end
+
     def delete!
       batch_deleter.delete!
       unless batch_deleter.last_batch?
-        BatchDeleteWorker.perform_async(start: start + 1,
-                                        prefix: prefix,
-                                        oai_url: oai_url,
-                                        solr_url: solr_url)
+        BatchDeleterWorker.perform_async start + 1, prefix, oai_url, solr_url
       end
     end
 
     def batch_deleter
-      @deleter ||= BatchDeleter.new(start: start,
-                                    prefix: prefix,
-                                    solr_client: solr_client,
-                                    oai_client: oai_client)
+      @batch_deleter ||=
+        batch_deleter_klass.new(start: start,
+                                prefix: prefix,
+                                solr_client: solr_client,
+                                oai_client: oai_client)
     end
 
     def solr_client

data/lib/cdmbl/default_solr.rb

@@ -14,7 +14,7 @@ module CDMBL
         :params => { :q => '*:*',
           :defType => 'edismax',
           :fl => '',
-          :rows => 200,
+          :rows => 10,
           :start => start
         }
       )

data/lib/cdmbl/oai_deletables.rb

@@ -14,7 +14,7 @@ module CDMBL
 
     def deletables
       identifiers.select do |id|
-        record_exists? to_oai_id(id)
+        record_missing? to_oai_id(id)
       end
     end
 
@@ -36,8 +36,8 @@ module CDMBL
       id.split(':')
     end
 
-    def record_exists?(identifier)
-      oai_record_klass.new(oai_client: oai_client,
+    def record_missing?(identifier)
+      !oai_record_klass.new(oai_client: oai_client,
                            identifier: identifier).record_exists?
     end
   end

data/lib/cdmbl/tasks/delete.rake

@@ -0,0 +1,12 @@
+require 'cdmbl'
+
+namespace :cdmbl do
+  desc "delete all records that aren't in a given OAI endpoint"
+  task :delete_batch, [:start, :prefix, :oai_url, :solr_url] do |t, args|
+        CDMBL::BatchDeleterWorker.perform_async(args[:start].to_i,
+                                         args[:prefix],
+                                         args[:oai_url],
+                                         args[:solr_url])
+  end
+end
+

data/lib/cdmbl/version.rb

@@ -1,3 +1,3 @@
 module CDMBL
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdmbl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - chadfennell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash_at_path
@@ -231,6 +231,7 @@ files:
 - lib/cdmbl/oai_set_lookup.rb
 - lib/cdmbl/rake_task.rb
 - lib/cdmbl/record_transformer.rb
+- lib/cdmbl/tasks/delete.rake
 - lib/cdmbl/tasks/etl.rake
 - lib/cdmbl/transformer.rb
 - lib/cdmbl/version.rb