database_cleaner 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4527ac30a6efa3d7c5938b87344a51f1ab0c7314
-  data.tar.gz: cbdaea723b3b1a2de12449af9b3cef9539e2dd4e
+  metadata.gz: 35bb176b3479b670a9d789e0b6115590fe84aeee
+  data.tar.gz: 30b5dbd03d0b8ac5249712fbe2b1e9ec44809f99
 SHA512:
-  metadata.gz: 196e5a7355500166c4738165b498bb2c4886a1091317a1a9fb99552efcc4f659109f0093778bf3cbfd88eb4afcdec431c30b9f591a037c9900cffd707b7b9670
-  data.tar.gz: 664d22fb94baa71bc7610cb919c3ea8180a55117667b5ac671a6d826c27b586cb40ec1ff4e447f1bc554ac6bb3aa50da5296c55244a1e623250ac99014d7998f
+  metadata.gz: 9e70863bb6c44d9fea1364be4d5308a7221c1b2babd6bc4d4fbbc5515eaee929d54b5bf655d8816ad7f1085f34136dcf7d471437c6c2ed535985e3fe421c3f63
+  data.tar.gz: b93b8e8de63d8d5c7602b6e7ab219ebb4bfa9cfc9013e30f723879538aa1d0ef1943ca1652892836de8cd633a689af083ab639b24dc8370036e360ced9608cfb

data/Gemfile.lock

@@ -162,7 +162,7 @@ GEM
     multi_json (1.2.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql (2.8.1)
+    mysql (2.9.1)
     mysql2 (0.3.16)
     neo4j-community (2.1.5)
     neo4j-core (3.0.8)
@@ -279,7 +279,7 @@ DEPENDENCIES
   mongoid
   mongoid-tree
   moped
-  mysql (~> 2.8.1)
+  mysql (~> 2.9.1)
   mysql2
   neo4j-core
   ohm (~> 0.1.3)

data/History.rdoc

@@ -1,19 +1,30 @@
 == Development (master)
 
+== 1.4.1 2015-03-09
+  * Support for deletion with Sequel. (@cyberdelia)
+  * Use ActiveRecord::Base configuration when different from config file. (@wendy0402)
+  * Removed dependency of Mongo. (@codegourmet)
+  * Fixed issue with tables schema prefix in Postgres. (@phoenixek12)
+  * Use ruby 1.8 syntax. (@daniel-g)
+  * Added license to gemspec. (@chrismar035)
+  * Improved coverage for migrations table. (@jonallured)
+
+== 1.4.0 2014-12-17
+
 === New Features/Changes
-  * Using the deletion strategy with Mysql now only deletes those tables
-    which have had records added to them. (@MadRabbit)
-  * Add support for `pre_count` on Sequel with Mysql. (@vrinek)
-  * Add support for neo4j. (@dpisarewski)
+  * Support for Neo4j. (@dpisarewski)
+  * Support for multiple connections on Mongoid. (@nyarly)
+
+=== Better Performance
+  * Using the deletion strategy with Mysql now only deletes those tables which have had records added to them. (@MadRabbit)
+  * Add support for pre_count on Sequel with Mysql. (@vrinek)
   * Cache collection names in mongo's truncation strategy. (@nyarly)
-  * Support for mongoid multiple connections. (@nyarly)
-  * Support for deletion with Sequel. (@cyberdelia)
 
 === Bug Fixes
-  * Fix `undefined method error` with DataMapper SQLite adaptor. (@lanej)
+  * Fix undefined method error with DataMapper SQLite adaptor. (@lanej)
   * Fully define Mysql2 adaptor constant. (@jgonera)
   * Don't truncate schema tables in Postgres. (@billywatson)
-  * Fix issue #284. (@MartinNowak)
+  * Fix issue where Moped cleaner was missing collections with 'system' in their name. (@MartinNowak)
 
 == 1.3.0 2014-05-23
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 4
-:patch: 0
+:patch: 1

data/examples/Gemfile

@@ -28,7 +28,7 @@ group :development, :test do
 
   gem "sequel", "~> 3.21.0"
   #gem "ibm_db"  # I don't want to add this dependency, even as a dev one since it requires DB2 to be installed
-  gem 'mysql', '~> 2.8.1'
+  gem 'mysql', '~> 2.9.1'
   gem 'mysql2'
   gem 'pg'
   gem 'ohm', '~> 0.1.3'

data/examples/Gemfile.lock

@@ -162,7 +162,7 @@ GEM
     multi_json (1.2.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql (2.8.1)
+    mysql (2.9.1)
     mysql2 (0.3.16)
     neo4j-community (2.1.5)
     neo4j-core (3.0.8)
@@ -279,7 +279,7 @@ DEPENDENCIES
   mongoid
   mongoid-tree
   moped
-  mysql (~> 2.8.1)
+  mysql (~> 2.9.1)
   mysql2
   neo4j-core
   ohm (~> 0.1.3)

data/features/support/env.rb

@@ -2,6 +2,3 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'database_cleaner'
 
 require 'rspec/expectations'
-
-require 'test/unit/assertions'
-

data/lib/database_cleaner/active_record/base.rb

@@ -34,10 +34,19 @@ module DatabaseCleaner
       def load_config
         if self.db != :default && self.db.is_a?(Symbol) && File.file?(ActiveRecord.config_file_location)
           connection_details = YAML::load(ERB.new(IO.read(ActiveRecord.config_file_location)).result)
-          @connection_hash   = connection_details[self.db.to_s]
+          @connection_hash   = valid_config(connection_details)[self.db.to_s]
         end
       end
 
+      def valid_config(connection_file)
+        if !::ActiveRecord::Base.configurations.nil? && !::ActiveRecord::Base.configurations.empty?
+          if connection_file != ::ActiveRecord::Base.configurations
+            return ::ActiveRecord::Base.configurations
+          end
+        end
+        connection_file
+      end
+
       def connection_class
         @connection_class ||= if db && !db.is_a?(Symbol)
                                 db

data/lib/database_cleaner/active_record/transaction.rb

@@ -19,7 +19,7 @@ module DatabaseCleaner::ActiveRecord
         end
       end
       if connection_class.connection.respond_to?(:begin_transaction)
-        connection_class.connection.begin_transaction joinable: false
+        connection_class.connection.begin_transaction :joinable => false
       else
         connection_class.connection.begin_db_transaction
       end

data/lib/database_cleaner/active_record/truncation.rb

@@ -24,7 +24,7 @@ module DatabaseCleaner
       def database_cleaner_view_cache
         @views ||= select_values("select table_name from information_schema.views where table_schema = '#{current_database}'") rescue []
       end
-      
+
       def database_cleaner_table_cache
         # the adapters don't do caching (#130) but we make the assumption that the list stays the same in tests
         @database_cleaner_tables ||= tables
@@ -177,7 +177,7 @@ module DatabaseCleaner
         cur_val = select_value("SELECT currval('#{table}_id_seq');").to_i rescue 0
         cur_val > 0
       end
-      
+
       def has_sequence?(table)
         select_value("SELECT true FROM pg_class WHERE relname = '#{table}_id_seq';")
       end
@@ -190,7 +190,10 @@ module DatabaseCleaner
         rows = select_rows <<-_SQL
           SELECT schemaname || '.' || tablename
           FROM pg_tables
-          WHERE tablename !~ '_prt_' AND schemaname = ANY (current_schemas(false))
+          WHERE 
+            tablename !~ '_prt_' AND 
+            tablename <> '#{::ActiveRecord::Migrator.schema_migrations_table_name}' AND 
+            schemaname = ANY (current_schemas(false))
         _SQL
         rows.collect { |result| result.first }
       end
@@ -242,7 +245,14 @@ module DatabaseCleaner::ActiveRecord
 
     def tables_to_truncate(connection)
       tables_in_db = cache_tables? ? connection.database_cleaner_table_cache : connection.tables
-      (@only || tables_in_db) - @tables_to_exclude - connection.database_cleaner_view_cache
+      to_reject = (@tables_to_exclude + connection.database_cleaner_view_cache)
+      (@only || tables_in_db).reject do |table|
+          if ( m = table.match(/([^.]+)$/) )
+            to_reject.include?(m[1])
+          else
+            false
+          end
+        end
     end
 
     # overwritten

data/lib/database_cleaner/mongo/base.rb

@@ -1,5 +1,3 @@
-require 'mongoid'
-
 module DatabaseCleaner
   module Mongo
     def self.available_strategies

data/lib/database_cleaner/mongo/truncation.rb

@@ -20,7 +20,7 @@ module DatabaseCleaner
       def mongoid_collection_names
         @@mongoid_collection_names ||= Hash.new{|h,k| h[k]=[]}.tap do |names|
           ObjectSpace.each_object(Class) do |klass|
-            next unless klass.ancestors.include?(::Mongoid::Document)
+            next unless klass.ancestors.map(&:to_s).include?('Mongoid::Document')
             next if klass.embedded
             next if klass.collection_name.empty?
             names[klass.db.name] << klass.collection_name

data/lib/database_cleaner/mongoid/truncation.rb

@@ -2,7 +2,6 @@ require 'database_cleaner/mongoid/base'
 require 'database_cleaner/generic/truncation'
 require 'database_cleaner/mongo/truncation_mixin'
 require 'database_cleaner/moped/truncation_base'
-require 'mongoid/tree'
 require 'mongoid/version'
 
 module DatabaseCleaner

data/spec/database_cleaner/active_record/base_spec.rb

@@ -84,6 +84,34 @@ my_db:
           subject.load_config
         end
 
+        context 'use ActiveRecord::Base.configuration' do
+          it 'when config file different with it' do
+            ::ActiveRecord::Base.stub(:configurations).and_return({ "my_db" =>{ "database" => "two"} })
+            subject.load_config
+            subject.connection_hash.should eq({ "database" => "two"})
+          end
+        end
+
+        context 'use config file' do
+          it 'when config file same with it' do
+            ::ActiveRecord::Base.stub(:configurations).and_return({ "my_db" =>{ "database" => "one"} })
+            subject.load_config
+            subject.connection_hash.should eq({ "database" => "one"})
+          end
+
+          it 'when ::ActiveRecord::Base.configurations nil' do
+            ::ActiveRecord::Base.stub(:configurations).and_return(nil)
+            subject.load_config
+            subject.connection_hash.should eq({ "database" => "one"})
+          end
+
+          it 'when ::ActiveRecord::Base.configurations empty' do
+            ::ActiveRecord::Base.stub(:configurations).and_return({})
+            subject.load_config
+            subject.connection_hash.should eq({ "database" => "one"})
+          end
+        end
+
         it "should store the relevant config in connection_hash" do
           subject.load_config
           subject.connection_hash.should eq( "database" => "one" )

data/spec/database_cleaner/active_record/truncation/postgresql_spec.rb

@@ -6,6 +6,15 @@ require 'database_cleaner/active_record/truncation/shared_fast_truncation'
 
 module ActiveRecord
   module ConnectionAdapters
+    describe "schema_migrations table" do
+      it "is not truncated" do
+        active_record_pg_migrate
+        DatabaseCleaner::ActiveRecord::Truncation.new.clean
+        result = active_record_pg_connection.execute("select count(*) from schema_migrations;")
+        result.values.first.should eq ["2"]
+      end
+    end
+
     describe do
       before(:all) { active_record_pg_setup }
 
@@ -42,6 +51,15 @@ module ActiveRecord
         end
       end
 
+      describe ":except option cleanup" do
+        it "should not truncate the tables specified in the :except option" do
+          2.times { User.create }
+
+          ::DatabaseCleaner::ActiveRecord::Truncation.new(:except => ['users']).clean
+          expect( User.count ).to eq 2
+        end
+      end
+
       describe '#database_cleaner_table_cache' do
         it 'should default to the list of tables with their schema' do
           connection.database_cleaner_table_cache.first.should match(/^public\./)

data/spec/database_cleaner/sequel/deletion_spec.rb

@@ -43,8 +43,8 @@ module DatabaseCleaner
     end
 
     supported_configurations = [
-      { url: 'mysql:///', connection_options: db_config['mysql'] },
-      { url: 'postgres:///', connection_options: db_config['postgres'] }
+      { :url => 'mysql:///', :connection_options => db_config['mysql'] },
+      { :url => 'postgres:///', :connection_options => db_config['postgres'] }
     ]
 
     supported_configurations.each do |config|

data/spec/support/active_record/mysql2_setup.rb

@@ -8,18 +8,18 @@ module MySQL2Helper
   # require 'logger'
   # ActiveRecord::Base.logger = Logger.new(STDERR)
 
-  def config
+  def default_config
     db_config['mysql2']
   end
 
   def create_db
-    establish_connection(config.merge(:database => nil))
+    establish_connection(default_config.merge(:database => nil))
 
-    ActiveRecord::Base.connection.drop_database config['database'] rescue nil
-    ActiveRecord::Base.connection.create_database config['database']
+    ActiveRecord::Base.connection.drop_database default_config['database'] rescue nil
+    ActiveRecord::Base.connection.create_database default_config['database']
   end
 
-  def establish_connection config = config
+  def establish_connection(config = default_config)
     ActiveRecord::Base.establish_connection config
   end
 

data/spec/support/active_record/mysql_setup.rb

@@ -7,18 +7,18 @@ module MySQLHelper
   # require 'logger'
   # ActiveRecord::Base.logger = Logger.new(STDERR)
 
-  def config
+  def default_config
     db_config['mysql']
   end
 
   def create_db
-    establish_connection(config.merge(:database => nil))
+    establish_connection(default_config.merge(:database => nil))
 
-    ActiveRecord::Base.connection.drop_database config['database'] rescue nil
-    ActiveRecord::Base.connection.create_database config['database']
+    ActiveRecord::Base.connection.drop_database default_config['database'] rescue nil
+    ActiveRecord::Base.connection.create_database default_config['database']
   end
 
-  def establish_connection config = config
+  def establish_connection(config = default_config)
     ActiveRecord::Base.establish_connection config
   end
 

data/spec/support/active_record/postgresql_setup.rb

@@ -6,22 +6,22 @@ module PostgreSQLHelper
 
   # ActiveRecord::Base.logger = Logger.new(STDERR)
 
-  def config
+  def default_config
     db_config['postgres']
   end
 
   def create_db
-    @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
+    @encoding = default_config['encoding'] || ENV['CHARSET'] || 'utf8'
     begin
-      establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-      ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
+      establish_connection(default_config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.create_database(default_config['database'], default_config.merge('encoding' => @encoding))
     rescue Exception => e
       $stderr.puts e, *(e.backtrace)
-      $stderr.puts "Couldn't create database for #{config.inspect}"
+      $stderr.puts "Couldn't create database for #{default_config.inspect}"
     end
   end
 
-  def establish_connection config = config
+  def establish_connection(config = default_config)
     ActiveRecord::Base.establish_connection(config)
   end
 
@@ -31,6 +31,13 @@ module PostgreSQLHelper
     active_record_load_schema
   end
 
+  def active_record_pg_migrate
+    `dropdb #{default_config['database']}`
+    create_db
+    establish_connection
+    ActiveRecord::Migrator.migrate 'spec/support/active_record/migrations'
+  end
+
   def active_record_pg_connection
     ActiveRecord::Base.connection
   end

data/spec/support/active_record/sqlite3_setup.rb

@@ -6,21 +6,21 @@ module SQLite3Helper
 
   # ActiveRecord::Base.logger = Logger.new(STDERR)
 
-  def config
+  def default_config
     db_config['sqlite3']
   end
 
   def create_db
-    @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
+    @encoding = default_config['encoding'] || ENV['CHARSET'] || 'utf8'
     begin
-      establish_connection(config.merge('database' => 'sqlite3', 'schema_search_path' => 'public'))
+      establish_connection(default_config.merge('database' => 'sqlite3', 'schema_search_path' => 'public'))
     rescue Exception => e
       $stderr.puts e, *(e.backtrace)
-      $stderr.puts "Couldn't create database for #{config.inspect}"
+      $stderr.puts "Couldn't create database for #{default_config.inspect}"
     end
   end
 
-  def establish_connection config = config
+  def establish_connection(config = default_config)
     ActiveRecord::Base.establish_connection(config)
   end
 

data/spec/support/data_mapper/sqlite3_setup.rb

@@ -5,21 +5,21 @@ module DataMapperSQLite3Helper
 
   puts "DataMapper #{DataMapper::VERSION}, sqlite3"
 
-  def config
+  def default_config
     db_config['sqlite3']
   end
 
   def create_db
-    @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
+    @encoding = default_config['encoding'] || ENV['CHARSET'] || 'utf8'
     begin
-      establish_connection(config.merge('database' => 'sqlite3', 'schema_search_path' => 'public'))
+      establish_connection(default_config.merge('database' => 'sqlite3', 'schema_search_path' => 'public'))
     rescue Exception => e
       $stderr.puts e, *(e.backtrace)
-      $stderr.puts "Couldn't create database for #{config.inspect}"
+      $stderr.puts "Couldn't create database for #{default_config.inspect}"
     end
   end
 
-  def establish_connection(config = config)
+  def establish_connection(config = default_config)
     DataMapper.setup(:default, config)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ben Mabey
@@ -360,7 +360,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Strategies for cleaning databases.  Can be used to ensure a clean state
+description: Strategies for cleaning databases. Can be used to ensure a clean state
   for testing.
 email: ben@benmabey.com
 executables: []
@@ -496,8 +496,9 @@ files:
 - spec/support/active_record/sqlite3_setup.rb
 - spec/support/data_mapper/schema_setup.rb
 - spec/support/data_mapper/sqlite3_setup.rb
-homepage: http://github.com/bmabey/database_cleaner
-licenses: []
+homepage: http://github.com/DatabaseCleaner/database_cleaner
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []