database_rewinder 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fffba2eb153141b4eba049ab2967097718de4e8
-  data.tar.gz: aa36ca325c1596c835ec595306412dd5c0f68267
+  metadata.gz: c43ef731e44e9d819825abd6bf2a0a013a46d5f1
+  data.tar.gz: 02505f6ad68fbf819d3bfff1da3377f7ed70afc5
 SHA512:
-  metadata.gz: 56db3ef0a01ee81a6c6d2e8dcbcfcd87172fd71eaa1c01df0b1492a2fe5266affc0ba8f446fc7c8d589d2fab515af8dc5ebd74aaa7763d82b55d6de597258a75
-  data.tar.gz: e54db71f5bcb3903bcdc4e9bf949be2cead0230df19eba62f15285b07302b331b8a4662b8ea9abc02f049646585ace7b8a2230ea66ff22f3bb4294e819c0665b
+  metadata.gz: 05c4efb51990bc523e2a441a06eb65bfedd042435fa1a9534bc08739e61be28366f2a8892605730e69de87463695a59d1ceb6a3309f949a756b71bc25033a3fc
+  data.tar.gz: 73c45aaecf4ac026b1903cca7ae61cdf9fdf9024b0833b81f4aa68bc0a95ed698001fad6f49e5bc36b11c9a8b893f31bad3a7e3f679baa5921fbc2184220d692

data/README.md

@@ -63,6 +63,11 @@ So the following code will probably let your existing app work under database\_r
 DatabaseCleaner = DatabaseRewinder
 ```
 
+## TODO
+
+Write documentation and specs about multiple databases.
+
+
 ## Contributing
 
 Send me your pull requests.

data/database_rewinder.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "database_rewinder"
-  spec.version       = '0.3.0'
+  spec.version       = '0.4.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"

data/lib/database_rewinder/cleaner.rb

@@ -1,12 +1,16 @@
 module DatabaseRewinder
   class Cleaner
-    attr_accessor :db, :connection_name, :only, :except, :inserted_tables, :pool
+    attr_accessor :config, :connection_name, :only, :except, :inserted_tables, :pool
 
-    def initialize(db: nil, connection_name: nil, only: nil, except: nil)
-      @db, @connection_name, @only, @except = db, connection_name, Array(only), Array(except)
+    def initialize(config: nil, connection_name: nil, only: nil, except: nil)
+      @config, @connection_name, @only, @except = config, connection_name, Array(only), Array(except)
       reset
     end
 
+    def db
+      config['database']
+    end
+
     def clean
       return if !pool || inserted_tables.empty?
 
@@ -21,9 +25,15 @@ module DatabaseRewinder
     end
 
     def clean_all
-      ar_conn = pool ? pool.connection : ActiveRecord::Base.connection
+      if (ar_conn = (pool || find_already_connected_model).try :connection)
+        delete_all ar_conn, DatabaseRewinder.all_table_names(ar_conn)
+      else
+        require 'database_rewinder/dummy_model'
+        DummyModel.with_temporary_connection(config) do |ar_conn|
+          delete_all ar_conn, DatabaseRewinder.all_table_names(ar_conn)
+        end
+      end
 
-      delete_all ar_conn, DatabaseRewinder.all_table_names(ar_conn)
       reset
     end
 
@@ -51,6 +61,10 @@ module DatabaseRewinder
     ensure
       pool.automatic_reconnect = reconnect
     end
+
+    def find_already_connected_model
+      ActiveRecord::Base.descendants.detect {|m| m.connection_pool.spec.config[:database] == db}
+    end
   end
 end
 

data/lib/database_rewinder/dummy_model.rb

@@ -0,0 +1,11 @@
+module DatabaseRewinder
+  class DummyModel < ActiveRecord::Base
+    class << self
+      def with_temporary_connection(config)
+        establish_connection config
+        yield connection
+        connection.pool.disconnect!
+      end
+    end
+  end
+end

data/lib/database_rewinder.rb

@@ -18,7 +18,7 @@ module DatabaseRewinder
     def create_cleaner(connection_name)
       config = database_configuration[connection_name] or raise %Q[Database configuration named "#{connection_name}" is not configured.]
 
-      Cleaner.new(db: config['database'], connection_name: connection_name, only: @only, except: @except).tap {|c| @cleaners << c}
+      Cleaner.new(config: config, connection_name: connection_name, only: @only, except: @except).tap {|c| @cleaners << c}
     end
 
     def [](_orm, connection: nil, **)
@@ -69,7 +69,7 @@ module DatabaseRewinder
 
     # cache AR connection.tables
     def all_table_names(connection)
-      db = connection.instance_variable_get(:'@config')[:database]
+      db = connection.pool.spec.config[:database]
       @table_names_cache[db] ||= connection.tables.reject{|t| t == ActiveRecord::Migrator.schema_migrations_table_name }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,7 @@ files:
 - lib/database_rewinder/active_record_monkey.rb
 - lib/database_rewinder/cleaner.rb
 - lib/database_rewinder/compatibility.rb
+- lib/database_rewinder/dummy_model.rb
 - lib/database_rewinder/railtie.rb
 - spec/active_record_monkey_spec.rb
 - spec/cleaner_spec.rb