database_rewinder 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417842274697cd6d5616271d7c532fe3cf5a2801
-  data.tar.gz: 6f7bdafdf2c10fc2ad460be38d967ace506828ec
+  metadata.gz: 4fffba2eb153141b4eba049ab2967097718de4e8
+  data.tar.gz: aa36ca325c1596c835ec595306412dd5c0f68267
 SHA512:
-  metadata.gz: 13e3e31d2eb7794f48c4036a8edfdab939564d4adce4750dd30f1188a13e519e1bb9f735b24f35d3efb03dc484ef1fe4d8a2834b980258ca784c4a00b43d6853
-  data.tar.gz: 10106fb52e312a5e2254e2773f4f4415bcbf2729d144e4a4f8709ec1e2682053d26b16750e7a29f4f975e424123c4501404e16488fa4afa4b246c9b4788d916d
+  metadata.gz: 56db3ef0a01ee81a6c6d2e8dcbcfcd87172fd71eaa1c01df0b1492a2fe5266affc0ba8f446fc7c8d589d2fab515af8dc5ebd74aaa7763d82b55d6de597258a75
+  data.tar.gz: e54db71f5bcb3903bcdc4e9bf949be2cead0230df19eba62f15285b07302b331b8a4662b8ea9abc02f049646585ace7b8a2230ea66ff22f3bb4294e819c0665b

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1

data/README.md

@@ -1,5 +1,7 @@
 # DatabaseRewinder
 
+[![Build Status](https://travis-ci.org/amatsuda/database_rewinder.svg)](http://travis-ci.org/amatsuda/database\_rewinder)
+
 database\_rewinder is a minimalist's tiny and ultra-fast database cleaner.
 
 ## Features
@@ -16,7 +18,7 @@ So, the more number of tables you have in your database, the more benefit you wi
 
 ### Credit
 
-This strategy was originally devised and implemented by @eudoxa.
+This strategy was originally devised and implemented by Shingo Morita (@eudoxa) at COOKPAD Inc.
 
 ## Supported versions
 

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.2.0'
+  spec.version       = '0.3.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = "A minimalist's tiny and ultra-fast database cleaner"
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '< 2.99'
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/database_rewinder.rb

@@ -1,27 +1,28 @@
 require_relative 'database_rewinder/cleaner'
-require_relative 'database_rewinder/railtie'
 
 module DatabaseRewinder
   VERSION = Gem.loaded_specs['database_rewinder'].version.to_s
 
   class << self
+    # Set your DB configuration here if you'd like to use something else than the AR configuration
+    attr_writer :database_configuration
+
     def init
-      @cleaners, @table_names_cache, @clean_all, @only, @except = [], {}, false
-      @db_config = YAML::load(ERB.new(Rails.root.join('config/database.yml').read).result)
+      @cleaners, @table_names_cache, @clean_all, @only, @except, @database_configuration = [], {}, false
+    end
+
+    def database_configuration
+      @database_configuration || ActiveRecord::Base.configurations
     end
 
     def create_cleaner(connection_name)
-      config = @db_config[connection_name] or raise %Q[Database configuration named "#{connection_name}" is not configured.]
+      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}
     end
 
     def [](_orm, connection: nil, **)
-      if (cl = @cleaners.detect {|c| c.connection_name == connection})
-        return cl
-      end
-
-      create_cleaner connection
+      @cleaners.detect {|c| c.connection_name == connection} || create_cleaner(connection)
     end
 
     def all=(v)
@@ -36,9 +37,11 @@ module DatabaseRewinder
     def record_inserted_table(connection, sql)
       config = connection.instance_variable_get(:'@config')
       database = config[:database]
+      #NOTE What's the best way to get the app dir besides Rails.root? I know Dir.pwd here might not be the right solution, but it should work in most cases...
+      root_dir = defined?(Rails) ? Rails.root : Dir.pwd
       cleaner = cleaners.detect do |c|
         if (config[:adapter] == 'sqlite3') && (config[:database] != ':memory:')
-          File.expand_path(c.db, Rails.root) == File.expand_path(database, Rails.root)
+          File.expand_path(c.db, root_dir) == File.expand_path(database, root_dir)
         else
           c.db == database
         end
@@ -64,18 +67,6 @@ module DatabaseRewinder
       cleaners.each {|c| c.clean_all}
     end
 
-    # for database_cleaner compat
-    def clean_with(*args)
-      cleaners.each {|c| c.clean_with *args}
-    end
-
-    # for database_cleaner compat
-    def start; end
-    def strategy=(args)
-      options = args.is_a?(Array) ? args.extract_options! : {}
-      @only, @except = options[:only], options[:except]
-    end
-
     # cache AR connection.tables
     def all_table_names(connection)
       db = connection.instance_variable_get(:'@config')[:database]
@@ -83,3 +74,11 @@ module DatabaseRewinder
     end
   end
 end
+
+begin
+  require 'rails'
+  require_relative 'database_rewinder/railtie'
+rescue LoadError
+  DatabaseRewinder.init
+  require_relative 'database_rewinder/active_record_monkey'
+end

data/lib/database_rewinder/cleaner.rb

@@ -1,6 +1,6 @@
 module DatabaseRewinder
   class Cleaner
-    attr_accessor :db, :connection_name, :inserted_tables, :pool
+    attr_accessor :db, :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)
@@ -27,19 +27,6 @@ module DatabaseRewinder
       reset
     end
 
-    def clean_with(_strategy, only: nil, except: nil, **)
-      @only += Array(only) unless only.blank?
-      @except += Array(except) unless except.blank?
-      clean_all
-    end
-
-    # for database_cleaner compat
-    def strategy=(args)
-      options = args.is_a?(Array) ? args.extract_options! : {}
-      @only += Array(options[:only]) unless options[:only].blank?
-      @except += Array(options[:except]) unless options[:except].blank?
-    end
-
     private
     def delete_all(ar_conn, tables)
       tables = tables & @only if @only.any?
@@ -66,3 +53,5 @@ module DatabaseRewinder
     end
   end
 end
+
+require_relative 'compatibility'

data/lib/database_rewinder/compatibility.rb

@@ -0,0 +1,38 @@
+module DatabaseRewinder
+  module Compatibility
+    def clean_with(*args)
+      cleaners.each {|c| c.clean_with(*args)}
+    end
+
+    def start; end
+
+    def strategy=(args)
+      options = args.is_a?(Array) ? args.extract_options! : {}
+      @only, @except = options[:only], options[:except]
+      cleaners.each {|c| c.strategy = nil, options}
+    end
+  end
+  class << self
+    include Compatibility
+  end
+
+  class Cleaner
+    module Compatibility
+      def clean_with(_strategy, only: nil, except: nil, **)
+        originals = @only, @except
+        self.only, self.except = Array(only), Array(except)
+        clean_all
+      ensure
+        self.only, self.except = originals
+      end
+
+      def strategy=(args)
+        options = args.is_a?(Array) ? args.extract_options! : {}
+        self.only = Array(options[:only]) if options.key?(:only)
+        self.except = Array(options[:except]) if options.key?(:except)
+      end
+    end
+
+    include Compatibility
+  end
+end

data/lib/database_rewinder/railtie.rb

@@ -1,5 +1,3 @@
-require 'rails'
-
 module DatabaseRewinder
   class Railtie < ::Rails::Railtie
     initializer 'database_rewinder', after: 'active_record.initialize_database' do

data/spec/cleaner_spec.rb

@@ -3,41 +3,32 @@ require 'spec_helper'
 module DatabaseRewinder
   describe Cleaner do
     describe '#strategy=' do
-      before { @cleaner = described_class.new }
+      before { @cleaner = described_class.new(only: ['foos'], except: 'bars') }
 
-      context 'when only strategy is given' do
+      context 'without options' do
         before { @cleaner.strategy = :truncation }
 
-        it 'should ignore strategy' do
-          expect(@cleaner.instance_variable_get(:@only)).to eq([])
-          expect(@cleaner.instance_variable_get(:@except)).to eq([])
-        end
-      end
-
-      context 'when only option is given' do
-        before { @cleaner.strategy = :truncation, { only: ['foos'] } }
-
-        it 'should set only option' do
+        it 'should keep instance variables' do
           expect(@cleaner.instance_variable_get(:@only)).to eq(['foos'])
-          expect(@cleaner.instance_variable_get(:@except)).to eq([])
+          expect(@cleaner.instance_variable_get(:@except)).to eq(['bars'])
         end
       end
 
-      context 'when except option is given' do
-        before { @cleaner.strategy = :truncation, { except: ['foos'] } }
+      context 'with options (an array or a string)' do
+        before { @cleaner.strategy = :truncation, { only: ['bars'], except: 'bazs' } }
 
-        it 'should set only option' do
-          expect(@cleaner.instance_variable_get(:@only)).to eq([])
-          expect(@cleaner.instance_variable_get(:@except)).to eq(['foos'])
+        it 'should overwrite instance variables' do
+          expect(@cleaner.instance_variable_get(:@only)).to eq(['bars'])
+          expect(@cleaner.instance_variable_get(:@except)).to eq(['bazs'])
         end
       end
 
-      context 'when only and except option are given' do
-        before { @cleaner.strategy = :truncation, { only: ['foos'], except: ['bars'] } }
+      context 'with options (an empty array or nil)' do
+        before { @cleaner.strategy = :truncation, { only: [], except: nil } }
 
-        it 'should set only option' do
-          expect(@cleaner.instance_variable_get(:@only)).to eq(['foos'])
-          expect(@cleaner.instance_variable_get(:@except)).to eq(['bars'])
+        it 'should overwrite instance variables even if they are empty/nil' do
+          expect(@cleaner.instance_variable_get(:@only)).to eq([])
+          expect(@cleaner.instance_variable_get(:@except)).to eq([])
         end
       end
     end

data/spec/database_rewinder_spec.rb

@@ -1,25 +1,33 @@
 require 'spec_helper'
 
 describe DatabaseRewinder do
-  before { DatabaseRewinder.init }
+  before do
+    DatabaseRewinder.init
+  end
 
   describe '.[]' do
     before do
-      DatabaseRewinder.instance_variable_set :'@db_config', {'foo' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
+      DatabaseRewinder.database_configuration = {'foo' => {'adapter' => 'sqlite3', 'database' => ':memory:'}}
       DatabaseRewinder[:aho, connection: 'foo']
     end
+    after do
+      DatabaseRewinder.database_configuration = nil
+    end
     subject { DatabaseRewinder.instance_variable_get(:'@cleaners').map {|c| c.connection_name} }
     it { should == ['foo'] }
   end
 
   describe '.record_inserted_table' do
     before do
-      DatabaseRewinder.instance_variable_set :'@db_config', {'foo' => {'adapter' => 'sqlite3', 'database' => 'db/test.sqlite3'}}
+      DatabaseRewinder.database_configuration = {'foo' => {'adapter' => 'sqlite3', 'database' => 'db/test.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) }
       DatabaseRewinder.record_inserted_table(connection, 'INSERT INTO "foos" ("name") VALUES (?)')
     end
+    after do
+      DatabaseRewinder.database_configuration = nil
+    end
     subject { @cleaner }
 
     its(:inserted_tables) { should == ['foos'] }
@@ -51,36 +59,67 @@ describe DatabaseRewinder do
     end
   end
 
-  describe '.strategy=' do
-    context 'when no option is specified' do
-      before { described_class.strategy = :truncate }
-      it 'should set strategy' do
-        expect(described_class.instance_variable_get(:@only)).to be_nil
-        expect(described_class.instance_variable_get(:@except)).to be_nil
-      end
+  describe '.clean_with' do
+    before do
+      @cleaner = DatabaseRewinder.cleaners.first
+      @only = @cleaner.instance_variable_get(:@only)
+      @except = @cleaner.instance_variable_get(:@except)
+      Foo.create! name: 'foo1'
+      Bar.create! name: 'bar1'
+      DatabaseRewinder.clean_with :truncation, options
     end
 
-    context 'when only option is specified' do
-      before { described_class.strategy = :truncate, { only: %w{foos} } }
-      it 'should set only option' do
-        expect(described_class.instance_variable_get(:@only)).to eq(['foos'])
-        expect(described_class.instance_variable_get(:@except)).to be_nil
+    context 'with only option' do
+      let(:options) { { only: ['foos'] } }
+      it 'should clean with only option and restore original one' do
+        Foo.count.should == 0
+        Bar.count.should == 1
+        expect(@cleaner.instance_variable_get(:@only)).to eq(@only)
       end
     end
 
-    context 'when except option is specified' do
-      before { described_class.strategy = :truncate, { except: %w{foos} } }
-      it 'should set except option' do
-        expect(described_class.instance_variable_get(:@only)).to be_nil
-        expect(described_class.instance_variable_get(:@except)).to eq(['foos'])
+    context 'with except option' do
+      let(:options) { { except: ['bars'] } }
+      it 'should clean with except option and restore original one' do
+        Foo.count.should == 0
+        Bar.count.should == 1
+        expect(@cleaner.instance_variable_get(:@except)).to eq(@except)
       end
     end
+  end
+
+  describe '.strategy=' do
+    context 'call first with options' do
+      before do
+        DatabaseRewinder.strategy = :truncate, { only: ['foos'], except: ['bars'] }
+      end
+
+      it 'should set options' do
+        expect(DatabaseRewinder.instance_variable_get(:@only)).to eq(['foos'])
+        expect(DatabaseRewinder.instance_variable_get(:@except)).to eq(['bars'])
+      end
+
+      it 'should create cleaner with options' do
+        cleaner = DatabaseRewinder.instance_variable_get(:@cleaners).first
+        expect(cleaner.instance_variable_get(:@only)).to eq(['foos'])
+        expect(cleaner.instance_variable_get(:@except)).to eq(['bars'])
+      end
+
+      context 'call again with different options' do
+        before do
+          DatabaseRewinder.strategy = :truncate, { only: ['bazs'], except: [] }
+        end
+
+        it 'should overwrite options' do
+          expect(DatabaseRewinder.instance_variable_get(:@only)).to eq(['bazs'])
+          expect(DatabaseRewinder.instance_variable_get(:@except)).to eq([])
+        end
 
-    context 'when only and except option are specified' do
-      before { described_class.strategy = :truncate, { only: %w{foos}, except: %w{bars} } }
-      it 'should set only and except options' do
-        expect(described_class.instance_variable_get(:@only)).to eq(['foos'])
-        expect(described_class.instance_variable_get(:@except)).to eq(['bars'])
+        it 'should overwrite cleaner with new options' do
+          cleaner = DatabaseRewinder.instance_variable_get(:@cleaners).first
+          expect(cleaner.instance_variable_get(:@only)).to eq(['bazs'])
+          expect(cleaner.instance_variable_get(:@except)).to eq([])
+        end
       end
     end
   end

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - MIT_LICENSE
 - README.md
@@ -96,6 +97,7 @@ files:
 - lib/database_rewinder.rb
 - lib/database_rewinder/active_record_monkey.rb
 - lib/database_rewinder/cleaner.rb
+- lib/database_rewinder/compatibility.rb
 - lib/database_rewinder/railtie.rb
 - spec/active_record_monkey_spec.rb
 - spec/cleaner_spec.rb
@@ -123,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A minimalist's tiny and ultra-fast database cleaner