acts_as_scrubbable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b879327a376524d60458ad12c6a7688b5d85baf
-  data.tar.gz: 52411d6ea51c0a3f4484ef09c96195cea42bae9f
+  metadata.gz: 99b9db00af3123a92e810a3a8f11b17892b6fb98
+  data.tar.gz: d1df98fd8b092fe05df842a0702a3d094db6807d
 SHA512:
-  metadata.gz: bb3958c928fc147ab33945e5e045db624715e584c72d15eb4b86718b9da3613730c0389ec17b567b24a7fcb0b200849cd1b7e4cfe923143bc508d2d4f88fe5db
-  data.tar.gz: e49d143b35922305445915b2bc88138399cdb10e6670ee801fd3b2e4d2f3824332cefcf1e6ca188caa5fd6f458f205152f7f457883803d6315295e5ce9c13a17
+  metadata.gz: caebfced29047326d794c5732d0aa137bfec6146f8e4e8f66b80fbc786095e8ae54704a759bec6e5fa865fdc675d181d7744eb668057ccbfc3af62d3e4717d97
+  data.tar.gz: 9560fc33ffd3486e0cb20f971371bfc79cd15634c9a896eac46b0bcdb1554869b4725249c520630881b82f272a01d9bb67d688df1245a62b14fa16b1ad29a04e

data/acts_as_scrubbable.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'faker'            , '~> 1.4'
   s.add_runtime_dependency 'highline'         , '~> 1.7'
   s.add_runtime_dependency 'term-ansicolor'   , '~> 1.3'
+  s.add_runtime_dependency 'parallel'         , '~> 1.6'
 
   s.add_development_dependency 'rspec'        , '~> 3.3'
   s.add_development_dependency 'guard'        , '~> 2.13'

data/lib/acts_as_scrubbable/tasks.rb

@@ -1,3 +1,4 @@
+
 require 'rake'
 
 namespace :scrub do
@@ -8,6 +9,7 @@ namespace :scrub do
     require 'highline/import'
     require 'term/ansicolor'
     require 'logger'
+    require 'parallel'
 
     @logger = Logger.new($stdout)
 
@@ -23,23 +25,30 @@ namespace :scrub do
 
     @total_scrubbed = 0
 
-    ActiveRecord::Base.descendants.sort_by{|d| d.to_s }.each do |ar_class|
-      next unless ar_class.scrubbable?
+    ar_classes = ActiveRecord::Base.descendants.select{|d| d.scrubbable? }.sort_by{|d| d.to_s }
+    Parallel.each(ar_classes) do |ar_class|
+
+      @logger.info "Scrubbing #{ar_class} ...".green
 
       scrubbed_count = 0
-      ar_class.find_in_batches do |batch|
-        batch.each do |obj|
-          obj.scrub!
-          scrubbed_count += 1
+
+      ActiveRecord::Base.connection_pool.with_connection do
+        ar_class.find_in_batches(batch_size: 1000) do |batch|
+          ActiveRecord::Base.transaction do
+            batch.each do |obj|
+              obj.scrub!
+              scrubbed_count += 1
+            end
+          end
         end
       end
-      @logger.info "Scrubbed #{scrubbed_count} #{ar_class} objects".green
-      @total_scrubbed += scrubbed_count
+
+      @logger.info "#{scrubbed_count} #{ar_class} objects scrubbed".blue
     end
 
+    @logger.info "Running after hook".red
     ActsAsScrubbable.execute_after_hook
 
-    @logger.info "#{@total_scrubbed} scrubbed objects".blue
     @logger.info "Scrub Complete!".white
   end
 end

data/lib/acts_as_scrubbable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsScrubbable
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_scrubbable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Samer Masry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement