acts_as_scrubbable 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b03e06478fe5c46d1be95047d60b28b91f3e21699743940e18ae0ee6ac8075
-  data.tar.gz: 28e6b08a628f43b121b4419b1571466f4810c9ad619849ce8f1b7bdc7700a658
+  metadata.gz: 8d5dd99dfeaccd8c11b9eb2125c5dc9e16aba2f8f5d02eb5fc9fba59d7c36f02
+  data.tar.gz: 3551737a717372941339f0a81e95f6142a87a1ebb006437465d458c0fee0ea07
 SHA512:
-  metadata.gz: 74246e4b9ea4209288e2709cf86a0b35e8d5f4abc1f7548c6a5cac4d628fbfc11c1d5a69c61d2de357748e4b6157a107ad7bc34551c3734f9d1630f62b0986e2
-  data.tar.gz: 4c5407c1f0689663ff28562880784b89442f1bce5d0cdb26e9ae0c089d4a0435ac516b692399dd8eb4cf15a115c771545bad2367aa75a8b0e9b727e6dcc43fe6
+  metadata.gz: eca9d4ca0de33ea806a4e8c28e7eb97d832c9859ee00f984342d6b041aa31393742942ebee345123459f484fd1a7f157164115afbf5e67070df2c990e9bc5d2d
+  data.tar.gz: be3873e9f173fbf7058aa0c5328397465264117f627afbfdd92f527a5f8a7f1e637722b13e2be9d4dce9adf3133182c93c988f324cf3e046c8a0382a015dd891

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.4.3
+  - 2.7.2
 
 script:
   - bundle exec rspec

data/Gemfile

@@ -1,3 +1,5 @@
+ruby '2.7.2'
+
 source 'https://rubygems.org'
 
 gemspec

data/acts_as_scrubbable.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.required_ruby_version = '~> 2.0'
 
-  s.add_runtime_dependency 'activesupport'    , '>= 4.1', '< 6'
-  s.add_runtime_dependency 'activerecord'     , '>= 4.1', '< 6'
-  s.add_runtime_dependency 'railties'         , '>= 4.1', '< 6'
+  s.add_runtime_dependency 'activesupport'    , '>= 4.1', '< 8'
+  s.add_runtime_dependency 'activerecord'     , '>= 4.1', '< 8'
+  s.add_runtime_dependency 'railties'         , '>= 4.1', '< 8'
   s.add_runtime_dependency 'faker'            , '>= 1.4'
   s.add_runtime_dependency 'highline'         , '>= 1.7'
   s.add_runtime_dependency 'term-ansicolor'   , '>= 1.3'

data/lib/acts_as_scrubbable/task_runner.rb

@@ -49,18 +49,29 @@ module ActsAsScrubbable
       ar_classes << ar_class
     end
 
-    def scrub(num_of_batches: nil)
+    def scrub(num_of_batches: nil, skip_before_hooks: false, skip_after_hooks: false)
+      before_hooks unless skip_before_hooks
+
       Parallel.each(ar_classes) do |ar_class|
         ActsAsScrubbable::ArClassProcessor.new(ar_class).process(num_of_batches)
       end
       ActiveRecord::Base.connection.verify!
+
+      after_hooks unless skip_after_hooks
+    end
+
+    def before_hooks
+      return if ENV["SKIP_BEFOREHOOK"]
+
+      ActsAsScrubbable.logger.info Term::ANSIColor.red("Running before hook")
+      ActsAsScrubbable.execute_before_hook
     end
 
     def after_hooks
-      if ENV["SKIP_AFTERHOOK"].blank?
-        ActsAsScrubbable.logger.info Term::ANSIColor.red("Running after hook")
-        ActsAsScrubbable.execute_after_hook
-      end
+      return if ENV["SKIP_AFTERHOOK"]
+
+      ActsAsScrubbable.logger.info Term::ANSIColor.red("Running after hook")
+      ActsAsScrubbable.execute_after_hook
     end
   end
-end
+end

data/lib/acts_as_scrubbable/tasks.rb

@@ -10,7 +10,6 @@ namespace :scrub do
     exit unless task_runner.confirmed_configuration?
     task_runner.extract_ar_classes
     task_runner.scrub(num_of_batches: 1)
-    task_runner.after_hooks
   end
 
   desc "Scrub one table"
@@ -19,7 +18,7 @@ namespace :scrub do
     task_runner.prompt_db_configuration
     exit unless task_runner.confirmed_configuration?
     task_runner.set_ar_class(args[:ar_class].constantize)
-    task_runner.scrub
+    task_runner.scrub(skip_after_hooks: true)
   end
 end
 

data/lib/acts_as_scrubbable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsScrubbable
-  VERSION = '1.2.1'
+  VERSION = '1.4.0'
 end

data/lib/acts_as_scrubbable.rb

@@ -24,6 +24,14 @@ module ActsAsScrubbable
     end
   end
 
+  def before_hook(&block)
+    @before_hook = block
+  end
+
+  def execute_before_hook
+    @before_hook.call if @before_hook
+  end
+
   def after_hook(&block)
     @after_hook = block
   end

data/spec/support/database.rb

@@ -1,7 +1,11 @@
 require 'nulldb/rails'
 require 'nulldb_rspec'
 
-ActiveRecord::Base.configurations.merge!("test" => {adapter: 'nulldb'})
+if ActiveRecord::Base.configurations.respond_to?(:merge!)
+  ActiveRecord::Base.configurations.merge!("test" => {adapter: 'nulldb'})
+else
+  ActiveRecord::Base.configurations = ActiveRecord::DatabaseConfigurations.new(test: {adapter: 'nulldb'})
+end
 
 NullDB.configure do |c|
   c.project_root = './spec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_scrubbable
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Samer Masry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement