pseudo_cleaner 0.0.33 → 0.0.34

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODgxMjJmODBkNTRhMTIyMjQyMzM2NjQyNzgyYjlkZWM1OTZkMTJhZA==
+    YjA5OTAwZDY1ZTllMjM2MTVjZjYxYjFjOGUyMzkzMWZlYTVkNWIyNg==
   data.tar.gz: !binary |-
-    YmZlM2NhOTJiYTYzZDVkNGNjMmVhMjMxYmY1YTVlNTBkNjE4NTEwZg==
+    YzdmYjI1YmRhODRiYjc2ZDc1MTQ1ZjlhMzg3Mzc4YmJhODIyYzA4NA==
 SHA512:
   metadata.gz: !binary |-
-    ZjY2YWQwM2I4YmRiYTY2YTlkNmQ1OWQ1M2VmZGRmOTJkNjRiNzAyZjUxNjQ0
-    MDVlNjU0OTU1ZmNjYmQ0YWRlNGExOTc0YzRlNTA3MjAxZDNmNzQ4MmJhY2Y0
-    YTdlMTRjMzlhMDYwMzYwN2MzZmQ4NzY3Yzg5MzMwNDI5ZTNkMDc=
+    NDAwMzY5MzNmZWZjZWFiOWQ3ZGMyYzU3ZWRlNjFkYzRhYjY4NzBjMjRlMjlm
+    NmQ2Nzg5NDY2Mjk2MTNmMmJlZWNlYzgyZTQ1YjhjNWE4N2UwYTE4ODg0NGU0
+    YmRlOTVhNTY3NjE1OTRmMWI3YzI2ZWU5ZDNlOGE1ZmMxMTQ0ODk=
   data.tar.gz: !binary |-
-    ZDY3MGEyZmQ2ZTk0MmJhMWViNmI3Y2VlODAxYTAxNWU0YTE0NjUzOWYxYzRh
-    YzRkM2U2YWQ5ZjQ2MzQ1NWZlYmZiY2RmMzUxMDFkOWNlYjdhNWI5OGI1YmUw
-    NDk0M2QwMzE3MDA3YjRhYWRkMjBkMWE3ZTQxZmU2Y2MwYzcxNTI=
+    M2ViMTY5NjQ2ZmI0YmQ5Yjk2YWRlMWYxY2VmNGU1NjIxYTgxMzhkODYyMGNl
+    M2JlNTRmZDdkZmYyNjVmNzYyYjgzZDIyZjZlNDQ5ODA0MDMzOWFjOTRkMTA3
+    NDE3YTlkOTlkYzdkMWM0ODMwMDc0NTYwMGE5ZGViMTllZWI1OGE=

data/lib/pseudo_cleaner/configuration.rb

@@ -40,8 +40,8 @@ module PseudoCleaner
 
     def db_connection=(connection)
       if Object.const_defined?("ActiveRecord", false) && ActiveRecord.const_defined?("Base", false)
-        table_is_active_record = connection.class == ActiveRecord::Base
-        table_super_class      = connection.class.superclass if connection.class
+        table_is_active_record = connection == ActiveRecord::Base
+        table_super_class      = connection.superclass if connection
         while !table_is_active_record && table_super_class
           table_is_active_record = (table_super_class == ActiveRecord::Base)
           table_super_class      = table_super_class.superclass

data/lib/pseudo_cleaner/spinach.rb

@@ -2,7 +2,7 @@ first_test_run = false
 
 # I haven't tested this fully yet, but I think that this should work.
 
-Spinach.hooks.before_scenario do |scenario, step_definitions|
+Spinach.hooks.around_scenario do |scenario_data, step_definitions, &block|
   unless first_test_run
     first_test_run = true
     # before tests run...
@@ -16,20 +16,22 @@ Spinach.hooks.before_scenario do |scenario, step_definitions|
     DatabaseCleaner.strategy = :transaction
   end
 
-  strategy = if scenario.tags.include?("@none")
+  strategy = if scenario_data.tags.include?("@none")
                :none
-             elsif scenario.tags.include?("@truncation")
+             elsif scenario_data.tags.include?("@truncation")
                :truncation
-             elsif scenario.tags.include?("@deletion")
+             elsif scenario_data.tags.include?("@deletion")
                :deletion
              else
                :pseudo_delete
              end
-  PseudoCleaner::MasterCleaner.start_example(scenario, strategy)
-end
+  PseudoCleaner::MasterCleaner.start_example(scenario_data, strategy)
 
-Spinach.hooks.after_scenario do |scenario, step_definitions|
-  PseudoCleaner::MasterCleaner.end_example(scenario)
+  begin
+    block.call
+  ensure
+    PseudoCleaner::MasterCleaner.end_example(scenario_data)
+  end
 end
 
 Spinach.hooks.after_run do |status|

data/lib/pseudo_cleaner/version.rb

@@ -1,3 +1,3 @@
 module PseudoCleaner
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pseudo_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - RealNobody