database_rewinder 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdff13637a829acd582b4c01d312b2a13feb61d4
-  data.tar.gz: e984897076c597c332af05d88f70123f299fd35f
+  metadata.gz: b508301ffcd515a842bbaf9b69cb2f259f7d37bf
+  data.tar.gz: 28006751946237e176b620e7bac07527cd99ebd0
 SHA512:
-  metadata.gz: 36f33700c2dee70e5e05a4af6447651b34ce13cae4b4e45ab4c4c73439ea69d49965d86c052133a0f75e681f104d3b9881efbbaf22d34e47c375b5c3b7213708
-  data.tar.gz: e78829201e040887e19d73affb3780bcb563758ed4956ed659958fcabea4fcc11680ce6aa742afd6631c5491c60b49782fa6d54e26fc7d5650bf0de761d9f3e4
+  metadata.gz: dd07c81ea30272bef5bc22eb0bdeaa1e043ed3eeeab8e5e34a7273ce0ed5bb6fab3876c774c1440a5b2fa10f8b155523ed094d7bc4f11b142f97a2a15bb36cd5
+  data.tar.gz: c34c37f908f7b2e8a2a4181c395a0f23f74605a00005a4776bdc41c53cc65585d736bd4f9c54e0045715c12c66dfb0876398d68d69bd13c0475f7756a2617cb9

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 log
+spec/*.sqlite3

data/README.md

@@ -38,6 +38,8 @@ And then execute:
 
 ## Usage
 
+### Basic configuration
+
 Do `clean` in `after(:each)`. And do `clean_all` or `clean_with` in `before(:suite)` if you'd like to.
 
 ```ruby
@@ -54,6 +56,32 @@ RSpec.configure do |config|
 end
 ```
 
+### Dealing with multiple DBs
+
+You can configure multiple DB connections to tell DatabaseRewinder to cleanup all of them after each test.
+In order to add another connection, use `DatabaseRewinder[]` method.
+
+```ruby
+RSpec.configure do |config|
+  config.before(:suite) do
+    # simply give the DB connection names that are written in config/database.yml
+    DatabaseRewinder['test']
+    DatabaseRewinder['another_test_db']
+
+    # you could give the DB name with connection: key if you like
+    DatabaseRewinder[connection: 'yet_another_test_db']
+
+    # also with a meaning less something first, then {connection: DB_NAME} as the second argument (DatabaseCleaner compatible)
+    DatabaseRewinder[:active_record, connection: 'an_active_record_db']
+
+    DatabaseRewinder.clean_all
+  end
+
+  config.after(:each) do
+    DatabaseRewinder.clean
+  end
+```
+
 ### Pro Tip
 
 database\_rewinder is designed to be almost compatible with database\_cleaner.

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.4.2'
+  spec.version       = '0.5.1'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"

data/lib/database_rewinder.rb

@@ -21,7 +21,30 @@ module DatabaseRewinder
       Cleaner.new(config: config, connection_name: connection_name, only: @only, except: @except).tap {|c| @cleaners << c}
     end
 
-    def [](_orm, connection: nil, **)
+    # In order to add another database to cleanup, you can give its connection name in on of the forms below:
+    #
+    #    # the simplest form
+    #    DatabaseRewinder['the_db_name']
+    #
+    # or
+    #
+    #    # with connection: key
+    #    DatabaseRewinder[connection: 'the_db_name']
+    #
+    # or
+    #
+    #    # DatabaseCleaner compatible
+    #    DatabaseRewinder[:active_record, connection: 'the_db_name']
+    #
+    # You can cleanup multiple databases for each test using this configuration.
+    def [](orm, connection: nil, **)
+      if connection.nil?
+        if orm.is_a? String
+          connection = orm
+        elsif orm.is_a?(Hash) && orm.has_key?(:connection)
+          connection = orm[:connection]
+        end
+      end
       @cleaners.detect {|c| c.connection_name == connection} || create_cleaner(connection)
     end
 

data/spec/active_record_monkey_spec.rb

@@ -7,7 +7,7 @@ describe 'DatabaseRewinder::InsertRecorder#execute' do
     Bar.connection.execute "insert into bars (name) values ('bar1')"
     DatabaseRewinder.cleaners
   end
-  subject { DatabaseRewinder.instance_variable_get(:'@cleaners').detect {|c| c.db == ':memory:'} }
+  subject { DatabaseRewinder.instance_variable_get(:'@cleaners').detect {|c| c.db == 'test.sqlite3'} }
   its(:inserted_tables) { should == %w(foos bars) }
   its(:pool) { should be }
 end

data/spec/config/database.yml

@@ -1,5 +1,11 @@
 test:
   adapter: sqlite3
-  database: ':memory:'
+  database: test.sqlite3
+  pool: 5
+  timeout: 5000
+
+test2:
+  adapter: sqlite3
+  database: test2.sqlite3
   pool: 5
   timeout: 5000

data/spec/database_rewinder_spec.rb

@@ -6,23 +6,60 @@ describe DatabaseRewinder do
   end
 
   describe '.[]' do
-    before do
-      DatabaseRewinder.database_configuration = {'foo' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
-      DatabaseRewinder[:aho, connection: 'foo']
+    context 'for connecting to an arbitrary database' do
+      after do
+        DatabaseRewinder.database_configuration = nil
+      end
+      subject { DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name} }
+
+      context 'simply giving a connection name only' do
+        before do
+          DatabaseRewinder.database_configuration = {'aaa' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+          DatabaseRewinder['aaa']
+        end
+        it { should == ['aaa'] }
+      end
+
+      context 'giving a connection name via Hash with :connection key' do
+        before do
+          DatabaseRewinder.database_configuration = {'bbb' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+          DatabaseRewinder[connection: 'bbb']
+        end
+        it { should == ['bbb'] }
+      end
+
+      context 'the Cleaner compatible syntax' do
+        before do
+          DatabaseRewinder.database_configuration = {'ccc' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+          DatabaseRewinder[:aho, connection: 'ccc']
+        end
+        it { should == ['ccc'] }
+      end
     end
-    after do
-      DatabaseRewinder.database_configuration = nil
+
+    context 'for connecting to multiple databases' do
+      before do
+        DatabaseRewinder[:active_record, connection: 'test']
+        DatabaseRewinder[:active_record, connection: 'test2']
+
+        Foo.create! name: 'foo1'
+        Quu.create! name: 'quu1'
+
+        DatabaseRewinder.clean
+      end
+      it 'should clean all configured databases' do
+        Foo.count.should == 0
+        Quu.count.should == 0
+      end
     end
-    subject { DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name} }
-    it { should == ['foo'] }
   end
 
   describe '.record_inserted_table' do
     before do
-      DatabaseRewinder.database_configuration = {'foo' => {'adapter' => 'sqlite3', 'database' => 'db/test.sqlite3'}}
+      DatabaseRewinder.database_configuration = {'foo' => {'adapter' => 'sqlite3', 'database' => 'db/test_record_inserted_table.sqlite3'}}
       @cleaner = DatabaseRewinder.create_cleaner 'foo'
       connection = double('connection').as_null_object
-      connection.instance_variable_set :'@config', {adapter: 'sqlite3', database: File.expand_path('db/test.sqlite3', Rails.root) }
+      connection.instance_variable_set :'@config', {adapter: 'sqlite3', database: File.expand_path('db/test_record_inserted_table.sqlite3', Rails.root) }
       DatabaseRewinder.record_inserted_table(connection, sql)
     end
     after do
@@ -41,9 +78,9 @@ describe DatabaseRewinder do
       end
     end
 
-    context 'DataBase accepts more than one dots in an object notation(exp: SQLServer)' do
+    context 'Database accepts more than one dots in an object notation(exp: SQLServer)' do
       context 'full joined' do
-      let(:sql) { 'INSERT INTO server.database.schema.foos ("name") VALUES (?)' }
+        let(:sql) { 'INSERT INTO server.database.schema.foos ("name") VALUES (?)' }
         its(:inserted_tables) { should == ['foos'] }
       end
       context 'missing one' do

data/spec/fake_app.rb

@@ -15,6 +15,9 @@ end
 class Foo < ActiveRecord::Base; end
 class Bar < ActiveRecord::Base; end
 class Baz < ActiveRecord::Base; end
+class Quu < ActiveRecord::Base
+  establish_connection :test2
+end
 
 # migrations
 class CreateAllTables < ActiveRecord::Migration
@@ -22,5 +25,19 @@ class CreateAllTables < ActiveRecord::Migration
     create_table(:foos) {|t| t.string :name }
     create_table(:bars) {|t| t.string :name }
     create_table(:bazs) {|t| t.string :name }
+
+    test2_connection = ActiveRecord::Base.establish_connection(:test2).connection
+    test2_connection.create_table(:quus) {|t| t.string :name }
+    ActiveRecord::Base.establish_connection :test
+  end
+
+  def self.down
+    drop_table(:foos) {|t| t.string :name }
+    drop_table(:bars) {|t| t.string :name }
+    drop_table(:bazs) {|t| t.string :name }
+
+    test2_connection = ActiveRecord::Base.establish_connection(:test2).connection
+    test2_connection.drop_table :quus
+    ActiveRecord::Base.establish_connection :test
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,6 @@ RSpec.configure do |config|
     CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'foos'
   end
   config.after :each do
-    [Foo, Bar, Baz].each{|m| m.delete_all }
+    [Foo, Bar, Baz, Quu].each {|m| m.delete_all }
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A minimalist's tiny and ultra-fast database cleaner
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - MIT_LICENSE
 - README.md
@@ -116,12 +116,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []