database_cleaner 1.7.0 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a0ef67709709d9ad8373dbc723dc3c5b965766a7e48b40badf5d4392558a6bd
-  data.tar.gz: 141f0a4e38d548ca0f100dd25f7c305cf459d87970eff5b8283d1a7b79eb0734
+  metadata.gz: 51b1c0f591c9266160e7ba246ab5a2e0edc88ff8e55aa10b205dad2371db9222
+  data.tar.gz: cbea6b1677f20cd1bc95eb0578df54933cdd329a034e67ef876b8bf9f1d406c6
 SHA512:
-  metadata.gz: f8161cfd306d227da75c2d997eeae124f191d9382b81a7e884ac43a5e272b4a931386427e700ef11af9f5416f6916c467c77104e46441b6b9a5e6329191c3516
-  data.tar.gz: 52f01680d172a214fa97d9f495c644b329014c74e53c862aa7aa7c91c26b0ca0769e684632997c564a2001f60fc212e03dabca789e0b27b3d1a93d1cd964f5aa
+  metadata.gz: 73ddb8b888360027d2f09c8c1f04a2e71605dad8b1166744df0b9b61c4c4ae382a5f43631857fe34ef8f899e7c0733351eddb014b6c729b8e394bd609ef484de
+  data.tar.gz: e3a654d8957c9f200750c244995e293a7a487c82f9885204cd6e29ac382daf1acc6101c751a25e42cdd418dd1afe6b9c90b46bb2386ec08573afa447dc468122

data/CONTRIBUTE.markdown

@@ -11,8 +11,7 @@ upstream:
 ## 2. Make sure the tests run fine
 
 - `bundle install`
-- Copy `db/sample.config.yml` to `db/config.yml` and edit it
-- Make sure to create the databases specified in `db/config.yml`
+- Copy `spec/support/sample.config.yml` to `spec/support/config.yml` and edit it
 - Run the tests with `bundle exec rspec`
 
 Note that if you don't have all the supported databases installed and running,

data/Gemfile.lock

@@ -1,22 +1,51 @@
 PATH
   remote: .
   specs:
-    database_cleaner (1.6.3)
+    database_cleaner (1.8.5)
+
+PATH
+  remote: adapters
+  specs:
+    database_cleaner-active_record (1.8.0)
+      activerecord
+      database_cleaner (~> 1.8.0)
+    database_cleaner-couch_potato (1.8.0)
+      couch_potato
+      database_cleaner (~> 1.8.0)
+    database_cleaner-data_mapper (1.8.0)
+      database_cleaner (~> 1.8.0)
+      datamapper
+      dm-transactions
+    database_cleaner-mongo (1.8.0)
+      database_cleaner (~> 1.8.0)
+      mongo
+    database_cleaner-mongo_mapper (1.8.1)
+      database_cleaner (~> 1.8.0)
+      mongo_mapper
+    database_cleaner-mongoid (1.8.1)
+      database_cleaner (~> 1.8.0)
+      database_cleaner-mongo (~> 1.8.0)
+      mongoid
+    database_cleaner-moped (1.8.0)
+      database_cleaner (~> 1.8.0)
+      moped
+    database_cleaner-neo4j (1.8.0)
+      database_cleaner (~> 1.8.0)
+      neo4j-core
+    database_cleaner-ohm (1.8.1)
+      database_cleaner (~> 1.8.0)
+      database_cleaner-redis (~> 1.8.0)
+      ohm
+    database_cleaner-redis (1.8.0)
+      database_cleaner (~> 1.8.0)
+      redis
+    database_cleaner-sequel (1.8.0)
+      database_cleaner (~> 1.8.0)
+      sequel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
     activemodel (3.0.0)
       activesupport (= 3.0.0)
       builder (~> 2.1.2)
@@ -38,20 +67,20 @@ GEM
       bcrypt (>= 3.1.3)
     bcrypt-ruby (3.1.5-java)
       bcrypt (>= 3.1.3)
-    bson (1.11.1)
-    bson (1.11.1-java)
-    bson_ext (1.11.1)
-      bson (~> 1.11.1)
+    bson (1.12.5)
+    bson (1.12.5-java)
+    bson_ext (1.12.5)
+      bson (~> 1.12.5)
     builder (2.1.2)
-    coderay (1.1.0)
+    coderay (1.1.2)
     couch_potato (1.3.0)
       activemodel
       couchrest (~> 1.2.0)
       json (~> 1.6)
-    couchrest (1.2.0)
-      mime-types (~> 1.15)
-      multi_json (~> 1.0)
-      rest-client (~> 1.6.1)
+    couchrest (1.2.1)
+      mime-types (>= 1.15)
+      multi_json (~> 1.7, ~> 1.0)
+      rest-client (~> 1.8.0)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -69,7 +98,7 @@ GEM
       dm-transactions (~> 1.2.0)
       dm-types (~> 1.2.0)
       dm-validations (~> 1.2.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     dm-aggregates (1.2.0)
       dm-core (~> 1.2.0)
     dm-constraints (1.2.0)
@@ -112,29 +141,36 @@ GEM
       data_objects (= 0.10.14)
       do_jdbc (= 0.10.14)
       jdbc-sqlite3 (>= 3.5.8)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
     fastercsv (1.5.5)
-    ffi (1.9.6)
-    ffi (1.9.6-java)
+    ffi (1.9.25)
+    ffi (1.9.25-java)
     formatador (0.2.5)
     gherkin (2.11.6)
       json (>= 1.7.6)
     gherkin (2.11.6-java)
       json (>= 1.7.6)
-    guard (1.8.3)
+    guard (2.14.2)
       formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (2.5.4)
-      guard (>= 1.1)
-      rspec (~> 2.11)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -144,15 +180,14 @@ GEM
     json (1.8.6)
     json (1.8.6-java)
     json_pure (1.8.1)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    mongo (1.11.1)
-      bson (= 1.11.1)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
+    mime-types (2.99.3)
+    mongo (1.12.5)
+      bson (= 1.12.5)
     mongo_ext (0.19.3)
     mongo_mapper (0.12.0)
       activemodel (~> 3.0)
@@ -165,11 +200,12 @@ GEM
     mongoid-tree (0.7.0)
       mongoid (~> 2.0)
     moped (1.5.2)
-    multi_json (1.2.0)
+    multi_json (1.13.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql (2.9.1)
     mysql2 (0.3.18)
+    nenv (0.3.0)
     neo4j-community (2.1.5)
     neo4j-core (3.0.8)
       activesupport
@@ -185,67 +221,57 @@ GEM
     nest (1.1.2)
       redis
     net-http-persistent (2.9.4)
+    netrc (0.11.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     ohm (0.1.5)
       nest (~> 1.0)
     os (0.9.6)
     pg (0.18.2)
     plucky (0.5.2)
       mongo (~> 1.5)
-    pry (0.10.1)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.1-java)
+      method_source (~> 0.9.0)
+    pry (0.11.3-java)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
       spoon (~> 0.0)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
     rake (11.1.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
-    rdoc (4.1.2)
-      json (~> 1.4)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     redis (3.1.0)
-    rest-client (1.6.8)
-      mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     sequel (3.21.0)
-    slop (3.6.0)
-    spoon (0.0.4)
+    shellany (0.0.1)
+    spoon (0.0.6)
       ffi
     sqlite3 (1.3.10)
     stringex (1.5.1)
-    thor (0.14.6)
+    thor (0.20.0)
     tzinfo (0.3.48)
+    unf (0.1.4)
+      unf_ext
+    unf (0.1.4-java)
+    unf_ext (0.0.7.5)
     uuidtools (2.1.5)
     zip (2.0.2)
 
@@ -261,11 +287,24 @@ DEPENDENCIES
   couch_potato
   cucumber
   database_cleaner!
+  database_cleaner-active_record!
+  database_cleaner-couch_potato!
+  database_cleaner-data_mapper!
+  database_cleaner-mongo!
+  database_cleaner-mongo_mapper!
+  database_cleaner-mongoid!
+  database_cleaner-moped!
+  database_cleaner-neo4j!
+  database_cleaner-ohm!
+  database_cleaner-redis!
+  database_cleaner-sequel!
   datamapper
   dm-migrations
   dm-sqlite-adapter
   guard-rspec
   json_pure
+  listen (~> 3.0.0)
+  mongo (~> 1.12.0)
   mongo_ext
   mongo_mapper
   mongoid
@@ -277,10 +316,10 @@ DEPENDENCIES
   ohm (~> 0.1.3)
   pg
   rake
-  rspec-rails (~> 2.14.2)
+  rspec
   sequel (~> 3.21.0)
   sqlite3
   tzinfo
 
 BUNDLED WITH
-   1.15.0
+   1.17.3

data/History.rdoc

@@ -1,9 +1,53 @@
 == Development (master)
 
+== 1.8.5 2020-05-04
+
+=== Bug Fixes
+  * Fix :mongo strategy: https://github.com/DatabaseCleaner/database_cleaner/pull/645
+
+== 1.8.4 2020-04-02
+
+=== Bug Fixes
+  * Fix false positive deprecation warnings on Windows: https://github.com/DatabaseCleaner/database_cleaner/pull/633
+
+== 1.8.3 2020-02-18
+
+=== Bug Fixes
+  * Fix performance issue of DatabaseCleaner::Base#orm_module: https://github.com/DatabaseCleaner/database_cleaner/pull/625
+
+== 1.8.2 2020-02-01
+
 === Bug Fixes
+  * Fix database_cleaner-ohm autodetected adapter loading: https://github.com/DatabaseCleaner/database_cleaner/pull/619
+  * Fix database_cleaner-mongo_mapper autodetected adapter loading: @botandrose
+  * Fix database_cleaner-mongoid autodetected adapter loading: https://github.com/DatabaseCleaner/database_cleaner/pull/617
+  * Exclude ar_internal_metadata from truncation on Rails 5: https://github.com/DatabaseCleaner/database_cleaner/pull/588
+
 === Changes
+  * Deprecate ohm adapter: https://github.com/DatabaseCleaner/database_cleaner/pull/619
+
+== 1.8.1 2020-01-30
+
+=== Bug Fixes
+  * Remove undeclared active_support dependency: https://github.com/DatabaseCleaner/database_cleaner/pull/612
 
-== 1.7.0 2017-04-19
+== 1.8.0 2020-01-29
+
+=== Bug Fixes
+  * Fix MySQL deprecation warnings with Rails 5: https://github.com/DatabaseCleaner/database_cleaner/pull/574
+  * Fix MySQL truncation with `pre_count: true`: https://github.com/DatabaseCleaner/database_cleaner/pull/498
+  * Fix primary key sequence resetting in Sequel with Postgres and SQLite: https://github.com/DatabaseCleaner/database_cleaner/pull/538/files
+  * ActiveRecord truncation adapter doesn't work with Oracle: https://github.com/DatabaseCleaner/database_cleaner/pull/542
+
+=== Changes
+  * Extract ORM adapters into gems: https://github.com/DatabaseCleaner/database_cleaner/pull/560
+  * Allow postgres:///dbname as a local url: https://github.com/DatabaseCleaner/database_cleaner/pull/569
+  * Add an optional URL whitelist safeguard: https://github.com/DatabaseCleaner/database_cleaner/pull/526
+  * Add `local` tld to safeguard check: https://github.com/DatabaseCleaner/database_cleaner/pull/547
+  * Speed up ActiveRecord deletion strategy: https://github.com/DatabaseCleaner/database_cleaner/pull/534
+  * Consider `sqlite:` database urls to be local: https://github.com/DatabaseCleaner/database_cleaner/pull/529
+
+== 1.7.0 2018-04-19
 
 === Bug Fixes
   * Remove unnecessary folders from gem: https://github.com/DatabaseCleaner/database_cleaner/pull/508

data/README.markdown

@@ -1,149 +1,76 @@
+<!--
+**If you're viewing this at https://github.com/DatabaseCleaner/database_cleaner,
+you're reading the documentation for the `master` branch.
+[View documentation for the latest release
+(1.7.0).](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.7.0/README.markdown)**
+-->
 # Database Cleaner
 
 [![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner)
 [![Code Climate](https://codeclimate.com/github/DatabaseCleaner/database_cleaner/badges/gpa.svg)](https://codeclimate.com/github/DatabaseCleaner/database_cleaner)
+![Gem Version](https://badge.fury.io/rb/database_cleaner.svg)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=database_cleaner&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=database_cleaner&package-manager=bundler&version-scheme=semver)
 
-Database Cleaner is a set of strategies for cleaning your database in Ruby.
+Database Cleaner is a set of gems containing strategies for cleaning your database in Ruby.
 
 The original use case was to ensure a clean state during tests.
 Each strategy is a small amount of code but is code that is usually needed in any ruby app that is testing with a database.
 
 ## Gem Setup
 
+Instead of using the `database_cleaner` gem directly, each ORM has its own gem. Most projects will only need the `database_cleaner-active_record` gem:
+
 ```ruby
 # Gemfile
 group :test do
-  gem 'database_cleaner'
+  gem 'database_cleaner-active_record'
 end
 ```
 
-## Supported Databases, Libraries and Strategies
-
-ActiveRecord, DataMapper, Sequel, MongoMapper, Mongoid, CouchPotato, Ohm and Redis are supported.
-
-Here is an overview of the strategies supported for each library:
-
-<table>
-  <tbody>
-    <tr>
-      <th>ORM</th>
-      <th>Truncation</th>
-      <th>Transaction</th>
-      <th>Deletion</th>
-    </tr>
-    <tr>
-      <td> ActiveRecord </td>
-      <td> Yes</td>
-      <td> <b>Yes</b></td>
-      <td> Yes</td>
-    </tr>
-    <tr>
-      <td> DataMapper</td>
-      <td> Yes</td>
-      <td> <b>Yes</b></td>
-      <td> No</td>
-    </tr>
-    <tr>
-      <td> CouchPotato</td>
-      <td> <b>Yes</b></td>
-      <td> No</td>
-      <td> No</td>
-    </tr>
-    <tr>
-      <td> MongoMapper</td>
-      <td> <b>Yes</b></td>
-      <td> No</td>
-      <td> No</td>
-    </tr>
-    <tr>
-      <td> Mongoid</td>
-      <td> <b>Yes</b></td>
-      <td> No</td>
-      <td> No</td>
-    </tr>
-    <tr>
-      <td> Sequel</td>
-      <td> <b>Yes</b></td>
-      <td> Yes</td>
-      <td> Yes</td>
-    </tr>
-    <tr>
-      <td>Redis</td>
-      <td><b>Yes</b></td>
-      <td>No</td>
-      <td>No</td>
-    </tr>
-    <tr>
-      <td>Ohm</td>
-      <td><b>Yes</b></td>
-      <td>No</td>
-      <td>No</td>
-    </tr>
-    <tr>
-      <td>Neo4j</td>
-      <td>Yes</td>
-      <td>Yes*</td>
-      <td>Yes*</td>
-    </tr>
-  </tbody>
-</table>
-
-\* Truncation and Deletion strategies for Neo4j will just delete all nodes and relationships from the database.
-
-<table>
-  <tbody>
-    <tr>
-      <th>Driver</th>
-      <th>Truncation</th>
-      <th>Transaction</th>
-      <th>Deletion</th>
-    </tr>
-    <tr>
-      <td> Mongo</td>
-      <td> Yes</td>
-      <td> No</td>
-      <td> No</td>
-    </tr>
-    <tr>
-      <td> Moped</td>
-      <td> Yes</td>
-      <td> No</td>
-      <td> No</td>
-    </tr>
-  </tbody>
-</table>
-
-(Default strategy for each library is denoted in bold)
-
-Database Cleaner also includes a `null` strategy (that does no cleaning at all) which can be used with any ORM library.
-You can also explicitly use it by setting your strategy to `nil`.
+If you are using multiple ORMs, just load multiple gems:
 
-For support or to discuss development please use the [Google Group](http://groups.google.com/group/database_cleaner).
 
-## What strategy is fastest?
+```ruby
+# Gemfile
+group :test do
+  gem 'database_cleaner-active_record'
+  gem 'database_cleaner-redis'
+end
+```
 
-For the SQL libraries the fastest option will be to use `:transaction` as transactions are simply rolled back. If you can use this strategy you should. However, if you wind up needing to use multiple database connections in your tests (i.e. your tests run in a different process than your application) then using this strategy becomes a bit more difficult. You can get around the problem a number of ways.
+## List of adapters
 
-One common approach is to force all processes to use the same database connection ([common ActiveRecord hack](http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/)) however this approach has been reported to result in non-deterministic failures.
+Here is an overview of the databases and ORMs supported by each adapter:
 
-Another approach is to have the transactions rolled back in the application's process and relax the isolation level of the database (so the tests can read the uncommitted transactions).
+MySQL, PostgreSQL, SQLite, etc
+* [database_cleaner-active_record](adapters/database_cleaner-active_record)
+* [database_cleaner-sequel](adapters/database_cleaner-sequel)
+* [database_cleaner-data_mapper](adapters/database_cleaner-data_mapper)
 
-An easier, but slower, solution is to use the `:truncation` or `:deletion` strategy.
+CouchDB
+* [database_cleaner-couch_potato](adapters/database_cleaner-couch_potato)
 
-So what is fastest out of `:deletion` and `:truncation`? Well, it depends on your table structure and what percentage of tables you populate in an average test. The reasoning is out of the scope of this README but here is a [good SO answer on this topic for Postgres](http://stackoverflow.com/questions/11419536/postgresql-truncation-speed/11423886#11423886).
+MongoDB
+ * [database_cleaner-mongoid](adapters/database_cleaner-mongoid)
+ * [database_cleaner-mongo_mapper](adapters/database_cleaner-mongo_mapper)
+ * [database_cleaner-moped](adapters/database_cleaner-moped)
+ * [database_cleaner-mongo](adapters/database_cleaner-mongo)
 
-Some people report much faster speeds with `:deletion` while others say `:truncation` is faster for them. The best approach therefore is it try all options on your test suite and see what is faster.
+Redis
+ * [database_cleaner-redis](adapters/database_cleaner-redis)
+ * [database_cleaner-ohm](adapters/database_cleaner-ohm)
 
-If you are using ActiveRecord then take a look at the [additional options](#additional-activerecord-options-for-truncation) available for `:truncation`.
+Neo4j
+ * [database_cleaner-neo4j](adapters/database_cleaner-neo4j)
 
-## Dependencies
+More details on available configuration options can be found in the README for the specific adapter gem that you're using.
 
-Because database_cleaner supports multiple ORMs, it doesn't make sense to include all the dependencies for each one in the gemspec. However, the DataMapper adapter does depend on dm-transactions. Therefore, if you use DataMapper, you must include dm-transactions in your Gemfile/bundle/gemset manually.
+For support or to discuss development please use the [Google Group](https://groups.google.com/group/database_cleaner).
 
 ## How to use
 
 ```ruby
-require 'database_cleaner'
+require 'database_cleaner/active_record'
 
 DatabaseCleaner.strategy = :truncation
 
@@ -161,15 +88,12 @@ DatabaseCleaner.strategy = :truncation, {:only => %w[widgets dogs some_other_tab
 DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
 ```
 
-With Ohm and Redis, `:only` and `:except` take a list of strings to be
-passed to [`keys`](http://redis.io/commands/keys)).
-
 (I should point out the truncation strategy will never truncate your schema_migrations table.)
 
 Some strategies need to be started before tests are run (for example the `:transaction` strategy needs to know to open up a transaction). This can be accomplished by calling `DatabaseCleaner.start` at the beginning of the run, or by running the tests inside a block to `DatabaseCleaner.cleaning`. So you would have:
 
 ```ruby
-require 'database_cleaner'
+require 'database_cleaner/active_record'
 
 DatabaseCleaner.strategy = :transaction
 
@@ -191,7 +115,7 @@ At times you may want to do a single clean with one strategy.
 For example, you may want to start the process by truncating all the tables, but then use the faster transaction strategy the remaining time. To accomplish this you can say:
 
 ```ruby
-require 'database_cleaner'
+require 'database_cleaner/active_record'
 
 DatabaseCleaner.clean_with :truncation
 
@@ -200,17 +124,26 @@ DatabaseCleaner.strategy = :transaction
 # then make the DatabaseCleaner.start and DatabaseCleaner.clean calls appropriately
 ```
 
-### Additional ActiveRecord options for Truncation
+## What strategy is fastest?
+
+For the SQL libraries the fastest option will be to use `:transaction` as transactions are simply rolled back. If you can use this strategy you should. However, if you wind up needing to use multiple database connections in your tests (i.e. your tests run in a different process than your application) then using this strategy becomes a bit more difficult. You can get around the problem a number of ways.
 
-The following options are available for ActiveRecord's `:truncation` strategy _only_ for MySQL and Postgres.
+One common approach is to force all processes to use the same database connection ([common ActiveRecord hack](http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/)) however this approach has been reported to result in non-deterministic failures.
 
-* `:pre_count` - When set to `true` this will check each table for existing rows before truncating it.  This can speed up test suites when many of the tables to be truncated are never populated. Defaults to `:false`. (Also, see the section on [What strategy is fastest?](#what-strategy-is-fastest))
-* `:reset_ids` - This only matters when `:pre_count` is used, and it will make sure that a tables auto-incrementing id is reset even if there are no rows in the table (e.g. records were created in the test but also removed before DatabaseCleaner gets to it). Defaults to `true`.
+Another approach is to have the transactions rolled back in the application's process and relax the isolation level of the database (so the tests can read the uncommitted transactions).
 
-The following option is available for ActiveRecord's `:truncation` and `:deletion` strategy for any DB.
+An easier, but slower, solution is to use the `:truncation` or `:deletion` strategy.
 
-* `:cache_tables` - When set to `true` the list of tables to truncate or delete from will only be read from the DB once, otherwise it will be read before each cleanup run. Set this to `false` if (1) you create and drop tables in your tests, or (2) you change Postgres schemas (`ActiveRecord::Base.connection.schema_search_path`) in your tests (for example, in a multitenancy setup with each tenant in a different Postgres schema). Defaults to `true`.
+So what is fastest out of `:deletion` and `:truncation`? Well, it depends on your table structure and what percentage of tables you populate in an average test. The reasoning is out of the scope of this README but here is a [good SO answer on this topic for Postgres](https://stackoverflow.com/questions/11419536/postgresql-truncation-speed/11423886#11423886).
 
+Some people report much faster speeds with `:deletion` while others say `:truncation` is faster for them. The best approach therefore is it try all options on your test suite and see what is faster.
+
+If you are using ActiveRecord then take a look at the [additional options](#additional-activerecord-options-for-truncation) available for `:truncation`.
+
+Database Cleaner also includes a `null` strategy (that does no cleaning at all) which can be used with any ORM library.
+You can also explicitly use it by setting your strategy to `nil`.
+
+## Test Framework Examples
 
 ### RSpec Example
 
@@ -345,14 +278,9 @@ If you're using Cucumber with Rails, just use the generator that ships with cucu
 Otherwise, to add DatabaseCleaner to your project by hand, create a file `features/support/database_cleaner.rb` that looks like this:
 
 ```ruby
-begin
-  require 'database_cleaner'
-  require 'database_cleaner/cucumber'
+require 'database_cleaner/active_record'
 
-  DatabaseCleaner.strategy = :truncation
-rescue NameError
-  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
-end
+DatabaseCleaner.strategy = :truncation
 
 Around do |scenario, block|
   DatabaseCleaner.cleaning(&block)
@@ -370,11 +298,14 @@ Sometimes you need to use multiple ORMs in your application.
 You can use DatabaseCleaner to clean multiple ORMs, and multiple connections for those ORMs.
 
 ```ruby
-#How to specify particular orms
+require 'database_cleaner/active_record'
+require 'database_cleaner/mongo_mapper'
+
+# How to specify particular orms
 DatabaseCleaner[:active_record].strategy = :transaction
 DatabaseCleaner[:mongo_mapper].strategy = :truncation
 
-#How to specify particular connections
+# How to specify particular connections
 DatabaseCleaner[:active_record, { :connection => :two }]
 
 # You may also pass in the model directly:
@@ -383,68 +314,6 @@ DatabaseCleaner[:active_record, { :model => ModelWithDifferentConnection }]
 
 Usage beyond that remains the same with `DatabaseCleaner.start` calling any setup on the different configured connections, and `DatabaseCleaner.clean` executing afterwards.
 
-### Configuration options
-
-<table>
-  <tbody>
-    <tr>
-      <th>ORM</th>
-      <th>How to access</th>
-      <th>Notes</th>
-    </tr>
-    <tr>
-      <td> Active Record </td>
-      <td> <code>DatabaseCleaner[:active_record]</code></td>
-      <td> Connection specified as <code>:symbol</code> keys, loaded from <code>config/database.yml</code>. You may also pass in the ActiveRecord model under the <code>:model</code> key.</td>
-    </tr>
-    <tr>
-      <td> Data Mapper</td>
-      <td> <code>DatabaseCleaner[:data_mapper]</code></td>
-      <td> Connection specified as <code>:symbol</code> keys, loaded via Datamapper repositories </td>
-    </tr>
-    <tr>
-      <td> Mongo Mapper</td>
-      <td> <code>DatabaseCleaner[:mongo_mapper]</code></td>
-      <td> Multiple connections not yet supported</td>
-    </tr>
-    <tr>
-      <td> Mongoid</td>
-      <td> <code>DatabaseCleaner[:mongoid]</code></td>
-      <td> Multiple databases supported for Mongoid 3. Specify <code>DatabaseCleaner[:mongoid, {:connection =&gt; :db_name}]</code> </td>
-    </tr>
-    <tr>
-      <td> Moped</td>
-      <td> <code>DatabaseCleaner[:moped]</code></td>
-      <td> It is necessary to configure database name with <code>DatabaseCleaner[:moped].db = db_name</code> otherwise name `default` will be used.</td>
-    </tr>
-    <tr>
-      <td> Couch Potato</td>
-      <td> <code>DatabaseCleaner[:couch_potato]</code></td>
-      <td> Multiple connections not yet supported</td>
-    </tr>
-    <tr>
-      <td> Sequel</td>
-      <td> <code>DatabaseCleaner[:sequel]</code></td>
-      <td> Multiple databases supported; specify <code>DatabaseCleaner[:sequel, {:connection =&gt; Sequel.connect(uri)}]</code></td>
-    </tr>
-    <tr>
-      <td>Redis</td>
-      <td><code>DatabaseCleaner[:redis]</code></td>
-      <td>Connection specified as Redis URI</td>
-    </tr>
-    <tr>
-      <td>Ohm</td>
-      <td><code>DatabaseCleaner[:ohm]</code></td>
-      <td>Connection specified as Redis URI</td>
-    </tr>
-    <tr>
-      <td>Neo4j</td>
-      <td><code>DatabaseCleaner[:neo4j]</code></td>
-      <td>Database type and path(URI) <code>DatabaseCleaner[:neo4j, connection: {type: :server_db, path: 'http://localhost:7475'}].</code></td>
-    </tr>
-  </tbody>
-</table>
-
 ## Why?
 
 One of my motivations for writing this library was to have an easy way to turn on what Rails calls "transactional_fixtures" in my non-rails ActiveRecord projects.
@@ -455,15 +324,15 @@ After copying and pasting code to do this several times I decided to package it
 
 #### DatabaseCleaner is trying to use the wrong ORM
 
-DatabaseCleaner has an autodetect mechanism where if you do not explicitly define your ORM it will use the first ORM it can detect that is loaded.
+DatabaseCleaner has a deprecated autodetect mechanism where if you do not explicitly define your ORM it will use the first ORM it can detect that is loaded.
 
 Since ActiveRecord is the most common ORM used that is the first one checked for.
 
-Sometimes other libraries (e.g. ActiveAdmin) will load other ORMs (e.g. ActiveRecord) even though you are using a different ORM.  This will result in DatabaseCleaner trying to use the wrong ORM (e.g. ActiveRecord) unless you explicitly define your ORM like so:
+Sometimes other libraries (e.g. ActiveAdmin) will load other ORMs (e.g. ActiveRecord) even though you are using a different ORM.  This will result in DatabaseCleaner trying to use the wrong ORM (e.g. ActiveRecord) unless you explicitly require the correct adapter gem:
 
 ```ruby
-# How to setup your ORM explicitly
-DatabaseCleaner[:mongoid].strategy = :truncation
+# Gemfile
+gem "database_cleaner-mongoid"
 ```
 
 ### STDERR is being flooded when using Postgres
@@ -485,29 +354,12 @@ test:
   min_messages: WARNING
 </pre>
 
-### Nothing happens in JRuby with Sequel using transactions
-
-Due to an inconsistency in JRuby's implementation of Fibers, Sequel gives a different connection to `DatabaseCleaner.start` than is used for tests run between `.start` and `.clean`. This can be worked around by running your tests in a block like `DatabaseCleaner.cleaning { run_my_tests }` instead, which does not use Fibers.
-
-### Model fails to load with Neo4j using transactions
-
-When you are using [neo4j](https://github.com/neo4jrb/neo4j) gem it creates schema and reads indexes upon loading models. These operations can't be done during a transaction. You have to preload your models before DatabaseCleaner starts a transaction.
-
-Add to your rails_helper or spec_helper after requiring database_cleaner:
-
-```ruby
-require 'database_cleaner'
-Dir["#{Rails.root}/app/models/**/*.rb"].each do |model|
-  load model
-end
-```
-
 ## Safeguards
 
 DatabaseCleaner comes with safeguards against:
 
 * Running in production (checking for `ENV`, `RACK_ENV`, and `RAILS_ENV`)
-* Running against a remote database (checking for a `DATABASE_URL` that does not include `localhost`)
+* Running against a remote database (checking for a `DATABASE_URL` that does not include `localhost`, `.local` or `127.0.0.1`)
 
 Both safeguards can be disabled separately as follows.
 
@@ -525,17 +377,13 @@ DatabaseCleaner.allow_production = true
 DatabaseCleaner.allow_remote_database_url = true
 ```
 
-## Debugging
-
-In rare cases DatabaseCleaner will encounter errors that it will log.  By default it uses STDOUT set to the ERROR level but you can configure this to use whatever Logger you desire.
-
-Here's an example of using the `Rails.logger` in `env.rb`:
+In Ruby, a URL whitelist can be specified. When specified, DatabaseCleaner will only allow `DATABASE_URL` to be equal
+to one of the values specified in the url whitelist like so:
 
 ```ruby
-DatabaseCleaner.logger = Rails.logger
+DatabaseCleaner.url_whitelist = ['postgres://postgres@localhost', 'postgres://foo@bar']
 ```
 
-
 ## COPYRIGHT
 
-Copyright (c) 2014 Ben Mabey. See LICENSE for details.
+See [LICENSE](LICENSE) for details.