database_flusher 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f228160138e843a8bed353ad7cc4582b1390846d
-  data.tar.gz: fea5700dd7a8e3d27d36bf32205472982de6de21
+  metadata.gz: 90cac9582ff73ebe0151abb8ea901bdae8280dc4
+  data.tar.gz: 99ebfe15fbf6de3c1ac4d479f7bda06ec6c89995
 SHA512:
-  metadata.gz: '0846ed665fa63a8c664352f89c7160351c344578bc6efb800f13b2314f9c92fb2e24507c5fb797354f3dd875cde218836f110306272ffc61b659bb2bd5e84188'
-  data.tar.gz: 98e3cb45b170ad48bec6b220de6007b276b58500a17c07d147e7d3345561e356f0d41928767b2e7079341a936748ff1feef62485864aad0b52d6c5a31fbf1022
+  metadata.gz: 1b30f3618eff2f27ecb506c79ee2d80df941ac008ddbbed8c505f82b6df9bd31344ef6cecaa9534987450b49c7e80f2390b815dbb910ba56f2b256f7e9c9d56c
+  data.tar.gz: a5b2ce6762f219a3172c4db6eb229a2a1a0ee5344b9956690ebbc6bda4e41fa9152c9adc4a76bdd1ec28dc1e01b26ff4572a5106c811a430e5c5b9ef0ecc5635

data/README.md

@@ -7,7 +7,7 @@ database_flusher is a tiny and fast database cleaner inspired by [database_clean
 
 ## Features
 
-* No monkey patching - uses `ActiveSupport::Notifications` and `Mongo::Monitoring::Global` to catch `INSERT` statements
+* No monkey patching - uses `ActiveSupport::Notifications` and `Mongo::Monitoring` to catch `INSERT` statements
 * Fast `:deletion` strategy that cleans only tables/collections where `INSERT` statements were performed
 * Faster `disable_referential_integrity` for PostgreSQL
 * Executes multiple `DELETE` statements as one query with ActiveRecord
@@ -105,17 +105,14 @@ end
 DatabaseFlusher[:active_record].strategy = :transaction
 DatabaseFlusher[:mongoid].strategy = :deletion
 
-Before do
+# Use Around hook to make sure it runs after capybara session reset.
+Around do |scenario, block|
   if Capybara.current_driver == :rack_test
     DatabaseFlusher[:active_record].strategy = :transaction
   else
     DatabaseFlusher[:active_record].strategy = :deletion
   end
-  DatabaseFlusher.start
-end
-
-After do
-  DatabaseFlusher.clean
+  DatabaseFlusher.cleaning(&block)
 end
 ```
 

data/lib/database_flusher.rb

@@ -31,4 +31,11 @@ module DatabaseFlusher
   def clean
     cleaners.values.each(&:clean)
   end
+
+  def cleaning
+    start
+    yield
+  ensure
+    clean
+  end
 end

data/lib/database_flusher/active_record/adapters/postgresql_adapter.rb

@@ -5,18 +5,10 @@ module DatabaseFlusher
       private
 
       def disable_referential_integrity(*tables)
-        begin
-          execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
-        rescue
-          execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER USER" }.join(";"))
-        end
+        execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
         yield
       ensure
-        begin
-          execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
-        rescue
-          execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER USER" }.join(";"))
-        end
+        execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
       end
     end
   end

data/lib/database_flusher/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module DatabaseFlusher
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_flusher
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Edgars Beigarts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler