ardb 0.9.0 → 0.10.0

data/lib/ardb.rb

@@ -65,7 +65,7 @@ module Ardb
   class Adapter
     include Singleton
 
-    attr_reader :current
+    attr_accessor :current
 
     def init
       @current = Adapter.send(Ardb.config.db.adapter)

data/lib/ardb/adapter/base.rb

@@ -17,6 +17,14 @@ class Ardb::Adapter::Base
 
   def drop_tables(*args); raise NotImplementedError; end
 
+  def load_schema
+    # silence STDOUT
+    current_stdout = $stdout.dup
+    $stdout = File.new('/dev/null', 'w')
+    load Ardb.config.schema_path
+    $stdout = current_stdout
+  end
+
   def ==(other_adapter)
     self.class == other_adapter.class
   end

data/lib/ardb/adapter/postgresql.rb

@@ -19,15 +19,19 @@ class Ardb::Adapter
     end
 
     def drop_db
-      ActiveRecord::Base.establish_connection(self.public_schema_settings)
-      ActiveRecord::Base.connection.tap do |conn|
-        conn.execute "UPDATE pg_catalog.pg_database"\
-                     " SET datallowconn=false WHERE datname='#{self.database}'"
-        # this SELECT actually runs a command: it terminates all the connections
-        # http://www.postgresql.org/docs/9.2/static/functions-admin.html#FUNCTIONS-ADMIN-SIGNAL-TABLE
-        conn.execute "SELECT pg_terminate_backend(pid)"\
-                     " FROM pg_stat_activity WHERE datname='#{self.database}'"
-        conn.execute "DROP DATABASE IF EXISTS #{self.database}"
+      begin
+        ActiveRecord::Base.establish_connection(self.public_schema_settings)
+        ActiveRecord::Base.connection.tap do |conn|
+          conn.execute "UPDATE pg_catalog.pg_database"\
+                       " SET datallowconn=false WHERE datname='#{self.database}'"
+          # this SELECT actually runs a command: it terminates all the connections
+          # http://www.postgresql.org/docs/9.2/static/functions-admin.html#FUNCTIONS-ADMIN-SIGNAL-TABLE
+          conn.execute "SELECT pg_terminate_backend(pid)"\
+                       " FROM pg_stat_activity WHERE datname='#{self.database}'"
+          conn.execute "DROP DATABASE IF EXISTS #{self.database}"
+        end
+      rescue PG::Error => e
+        raise e unless e.message =~ /does not exist/
       end
     end
 

data/lib/ardb/adapter_spy.rb

@@ -0,0 +1,59 @@
+module Ardb
+
+  module AdapterSpy
+
+    def self.new(&block)
+      block ||= proc{ }
+      record_spy = Class.new{ include Ardb::AdapterSpy }
+      record_spy.class_eval(&block)
+      record_spy
+    end
+
+    def self.included(klass)
+      klass.class_eval do
+        include InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+
+      attr_accessor :drop_tables_called_count, :load_schema_called_count
+      attr_accessor :drop_db_called_count, :create_db_called_count
+
+      def drop_tables_called_count
+        @drop_tables_called_count ||= 0
+      end
+
+      def drop_tables(*args, &block)
+        self.drop_tables_called_count += 1
+      end
+
+      def load_schema_called_count
+        @load_schema_called_count ||= 0
+      end
+
+      def load_schema(*args, &block)
+        self.load_schema_called_count += 1
+      end
+
+      def drop_db_called_count
+        @drop_db_called_count ||= 0
+      end
+
+      def drop_db(*args, &block)
+        self.drop_db_called_count += 1
+      end
+
+      def create_db_called_count
+        @create_db_called_count ||= 0
+      end
+
+      def create_db(*args, &block)
+        self.create_db_called_count += 1
+      end
+
+    end
+
+  end
+
+end

data/lib/ardb/test_helpers.rb

@@ -13,12 +13,20 @@ module Ardb::TestHelpers
   end
 
   def load_schema
-    # silence STDOUT
-    current_stdout = $stdout.dup
-    $stdout = File.new('/dev/null', 'w')
-    load Ardb.config.schema_path
-    $stdout = current_stdout
+    Ardb.adapter.load_schema
   end
 
-end
+  def reset_db!
+    Ardb.adapter.drop_db
+    Ardb.adapter.create_db
+    self.load_schema
+  end
 
+  def reset_db
+    @reset_db ||= begin
+      self.reset_db!
+      true
+    end
+  end
+
+end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/test/unit/adapter/base_tests.rb

@@ -12,7 +12,7 @@ class Ardb::Adapter::Base
 
     should have_reader :config_settings, :database
     should have_imeths :foreign_key_add_sql, :foreign_key_drop_sql
-    should have_imeths :create_db, :drop_db
+    should have_imeths :create_db, :drop_db, :load_schema
 
     should "use the config's db settings " do
       assert_equal Ardb.config.db_settings, subject.config_settings
@@ -38,4 +38,32 @@ class Ardb::Adapter::Base
 
   end
 
+  class LoadSchemaTests < BaseTests
+    desc "given a schema"
+    setup do
+      ::FAKE_SCHEMA_LOAD = OpenStruct.new(:count => 0)
+      @orig_schema_path = Ardb.config.schema_path
+      Ardb.config.schema_path = 'fake_schema.rb'
+    end
+    teardown do
+      Ardb.config.schema_path = @orig_schema_path
+    end
+
+    should "load the schema suppressing $stdout" do
+      orig_stdout = $stdout.dup
+      captured_stdout = ""
+      $stdout = StringIO.new(captured_stdout)
+
+      assert_equal 0, FAKE_SCHEMA_LOAD.count
+      subject.load_schema
+      assert_equal 1, FAKE_SCHEMA_LOAD.count
+      subject.load_schema
+      assert_equal 2, FAKE_SCHEMA_LOAD.count
+      assert_empty captured_stdout
+
+      $stdout = orig_stdout
+    end
+
+  end
+
 end

data/test/unit/adapter_spy_tests.rb

@@ -0,0 +1,66 @@
+require 'assert'
+require 'ardb/adapter_spy'
+
+module Ardb::AdapterSpy
+
+  class MyAdapter
+    include Ardb::AdapterSpy
+  end
+
+  class BaseTests < Assert::Context
+    desc "Ardb::AdapterSpy"
+    setup do
+      @adapter = MyAdapter.new
+    end
+    subject{ @adapter }
+
+    should have_accessors :drop_tables_called_count, :load_schema_called_count
+    should have_accessors :drop_db_called_count, :create_db_called_count
+    should have_imeths :drop_tables, :load_schema, :drop_db, :create_db
+
+    should "included the record spy instance methods" do
+      assert_includes Ardb::AdapterSpy::InstanceMethods, subject.class.included_modules
+    end
+
+    should "default all call counts to zero" do
+      assert_equal 0, subject.drop_tables_called_count
+      assert_equal 0, subject.load_schema_called_count
+      assert_equal 0, subject.drop_db_called_count
+      assert_equal 0, subject.create_db_called_count
+    end
+
+    should "add a call count when each method is called" do
+      subject.drop_tables
+      assert_equal 1, subject.drop_tables_called_count
+
+      subject.load_schema
+      assert_equal 1, subject.load_schema_called_count
+
+      subject.drop_db
+      assert_equal 1, subject.drop_db_called_count
+
+      subject.create_db
+      assert_equal 1, subject.create_db_called_count
+    end
+
+  end
+
+  class NewMethTests < BaseTests
+    desc "`new` method"
+    setup do
+      @adapter_spy_class = Ardb::AdapterSpy.new do
+        attr_accessor :name
+      end
+      @adapter = @adapter_spy_class.new
+    end
+    subject{ @adapter }
+
+    should "build a new spy class and use any custom definition" do
+      assert_includes Ardb::AdapterSpy, subject.class.included_modules
+      assert subject.respond_to? :name
+      assert subject.respond_to? :name=
+    end
+
+  end
+
+end

data/test/unit/test_helpers_tests.rb

@@ -7,7 +7,82 @@ module Ardb::TestHelpers
     desc "Ardb test helpers"
     subject{ Ardb::TestHelpers }
 
-    should have_imeths :drop_tables, :load_schema
+    should have_imeths :drop_tables, :load_schema, :reset_db, :reset_db!
+
+  end
+
+  class UsageTests < BaseTests
+    setup do
+      @adapter_spy_class = Ardb::AdapterSpy.new
+      @orig_ardb_adapter = Ardb.adapter
+      Ardb::Adapter.current = @adapter_spy = @adapter_spy_class.new
+    end
+    teardown do
+      Ardb::Adapter.current = @orig_ardb_adapter
+    end
+
+  end
+
+  class DropTablesTests < UsageTests
+    desc "`drop_tables` method"
+
+    should "tell the adapter to drop the tables" do
+      assert_equal 0, @adapter_spy.drop_tables_called_count
+      subject.drop_tables
+      assert_equal 1, @adapter_spy.drop_tables_called_count
+    end
+
+  end
+
+  class LoadSchemaTests < UsageTests
+    desc "`load_schema` method"
+
+    should "tell the adapter to load the schema" do
+      assert_equal 0, @adapter_spy.load_schema_called_count
+      subject.load_schema
+      assert_equal 1, @adapter_spy.load_schema_called_count
+    end
+
+  end
+
+  class ResetDbTests < UsageTests
+    desc "reset db methods"
+
+    should "tell the adapter to drop/create the db and load the schema only once" do
+      assert_equal 0, @adapter_spy.drop_db_called_count
+      assert_equal 0, @adapter_spy.create_db_called_count
+      assert_equal 0, @adapter_spy.load_schema_called_count
+
+      subject.reset_db
+
+      assert_equal 1, @adapter_spy.drop_db_called_count
+      assert_equal 1, @adapter_spy.create_db_called_count
+      assert_equal 1, @adapter_spy.load_schema_called_count
+
+      subject.reset_db
+
+      assert_equal 1, @adapter_spy.drop_db_called_count
+      assert_equal 1, @adapter_spy.create_db_called_count
+      assert_equal 1, @adapter_spy.load_schema_called_count
+    end
+
+    should "force the adapter to drop/create the db and load the schema" do
+      assert_equal 0, @adapter_spy.drop_db_called_count
+      assert_equal 0, @adapter_spy.create_db_called_count
+      assert_equal 0, @adapter_spy.load_schema_called_count
+
+      subject.reset_db!
+
+      assert_equal 1, @adapter_spy.drop_db_called_count
+      assert_equal 1, @adapter_spy.create_db_called_count
+      assert_equal 1, @adapter_spy.load_schema_called_count
+
+      subject.reset_db!
+
+      assert_equal 2, @adapter_spy.drop_db_called_count
+      assert_equal 2, @adapter_spy.create_db_called_count
+      assert_equal 2, @adapter_spy.load_schema_called_count
+    end
 
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,11 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-20 00:00:00 Z
+date: 2013-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: assert
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +31,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  requirement: *id001
-  name: assert
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +46,12 @@ dependencies:
         - 3
         - 2
         version: "3.2"
-  requirement: *id002
-  name: activerecord
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,12 +61,12 @@ dependencies:
         - 3
         - 2
         version: "3.2"
-  requirement: *id003
-  name: activesupport
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: ns-options
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,9 +76,8 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id004
-  name: ns-options
   type: :runtime
+  version_requirements: *id004
 description: Activerecord database tools.
 email: 
 - kelly@kellyredding.com
@@ -101,6 +101,7 @@ files:
 - lib/ardb/adapter/mysql.rb
 - lib/ardb/adapter/postgresql.rb
 - lib/ardb/adapter/sqlite.rb
+- lib/ardb/adapter_spy.rb
 - lib/ardb/cli.rb
 - lib/ardb/migration_helpers.rb
 - lib/ardb/record_spy.rb
@@ -119,6 +120,7 @@ files:
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
 - test/unit/adapter/sqlite_tests.rb
+- test/unit/adapter_spy_tests.rb
 - test/unit/ardb_tests.rb
 - test/unit/config_tests.rb
 - test/unit/migration_helpers_tests.rb
@@ -142,6 +144,7 @@ files:
 - tmp/sqlitetest/config/.gitkeep
 - tmp/testdb/config/.gitkeep
 - tmp/testdb/config/db.rb
+- tmp/testdb/fake_schema.rb
 homepage: http://github.com/redding/ardb
 licenses: []
 
@@ -171,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Activerecord database tools.
@@ -181,6 +184,7 @@ test_files:
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
 - test/unit/adapter/sqlite_tests.rb
+- test/unit/adapter_spy_tests.rb
 - test/unit/ardb_tests.rb
 - test/unit/config_tests.rb
 - test/unit/migration_helpers_tests.rb