database_rewinder 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b508301ffcd515a842bbaf9b69cb2f259f7d37bf
-  data.tar.gz: 28006751946237e176b620e7bac07527cd99ebd0
+  metadata.gz: 3bf8192dabd4d1fb1fad33301a15a13ce5ee7488
+  data.tar.gz: 5ffe5087a213f1491dbe1927ef891e0497006370
 SHA512:
-  metadata.gz: dd07c81ea30272bef5bc22eb0bdeaa1e043ed3eeeab8e5e34a7273ce0ed5bb6fab3876c774c1440a5b2fa10f8b155523ed094d7bc4f11b142f97a2a15bb36cd5
-  data.tar.gz: c34c37f908f7b2e8a2a4181c395a0f23f74605a00005a4776bdc41c53cc65585d736bd4f9c54e0045715c12c66dfb0876398d68d69bd13c0475f7756a2617cb9
+  metadata.gz: e838b4cc0a35731019ff1c4cab84b651ff80bd240cd0958ec2c0893f26c09e3ad90761f8bf3620e7524bbe4491620ac9fe0690c47bf9717494162a706a2013f4
+  data.tar.gz: faf1091315a8592c5c2b94597d0e12d1629c493c04bddf2eb96c72ce43a7689dbfe7c70ddaaebe1e22393cb9e0b21d3189ff33c4bb1dd3ce0e02d9acf2da0bae

data/README.md

@@ -71,7 +71,7 @@ RSpec.configure do |config|
     # 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)
+    # or with a meaningless something first, then {connection: DB_NAME} as the second argument (DatabaseCleaner compatible)
     DatabaseRewinder[:active_record, connection: 'an_active_record_db']
 
     DatabaseRewinder.clean_all
@@ -80,6 +80,7 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseRewinder.clean
   end
+end
 ```
 
 ### Pro Tip
@@ -91,11 +92,6 @@ 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.5.1'
+  spec.version       = '0.5.2'
   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

@@ -37,14 +37,7 @@ module DatabaseRewinder
     #    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
+    def [](connection)
       @cleaners.detect {|c| c.connection_name == connection} || create_cleaner(connection)
     end
 
@@ -70,7 +63,7 @@ module DatabaseRewinder
         end
       end or return
 
-      match = sql.match(/\AINSERT INTO (?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
+      match = sql.match(/\AINSERT(?: IGNORE)? INTO (?:\.*[`"]?([^.\s`"]+)[`"]?)*/i)
       return unless match
 
       table = match[1]
@@ -84,12 +77,12 @@ module DatabaseRewinder
       if @clean_all
         clean_all
       else
-        cleaners.each {|c| c.clean}
+        cleaners.each(&:clean)
       end
     end
 
     def clean_all
-      cleaners.each {|c| c.clean_all}
+      cleaners.each(&:clean_all)
     end
 
     # cache AR connection.tables

data/lib/database_rewinder/cleaner.rb

@@ -55,10 +55,10 @@ module DatabaseRewinder
       @inserted_tables = []
     end
 
-    def with_automatic_reconnect(pool, &block)
+    def with_automatic_reconnect(pool)
       reconnect = pool.automatic_reconnect
       pool.automatic_reconnect = true
-      block.call
+      yield
     ensure
       pool.automatic_reconnect = reconnect
     end

data/lib/database_rewinder/compatibility.rb

@@ -11,9 +11,20 @@ module DatabaseRewinder
       @only, @except = options[:only], options[:except]
       cleaners.each {|c| c.strategy = nil, options}
     end
+
+    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
+      super connection
+    end
   end
   class << self
-    include Compatibility
+    prepend Compatibility
   end
 
   class Cleaner

data/spec/database_rewinder_spec.rb

@@ -93,6 +93,11 @@ describe DatabaseRewinder do
         its(:inserted_tables) { should == ['foos'] }
       end
     end
+
+    context 'when database accepts INSERT IGNORE INTO statement' do
+      let(:sql) { "INSERT IGNORE INTO `foos` (`name`) VALUES ('alice'), ('bob') ON DUPLICATE KEY UPDATE `foos`.`updated_at`=VALUES(`updated_at`)" }
+      its(:inserted_tables) { should == ['foos'] }
+    end
   end
 
   describe '.clean' do

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: database_rewinder
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-05-19 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: []