waterpig 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5d52f37188f943be46dc7b4dc9dc77029dd61a
-  data.tar.gz: 74284911ef5ddc9597f020e9226ed2141a0e40e5
+  metadata.gz: 318ff8fa9afe73198a7e40f033a80df4a7f6e756
+  data.tar.gz: e0497a4ce25ea9f435bfcdcd51c368e1c49af4be
 SHA512:
-  metadata.gz: abb67dfdcf7fe87469332d09dc5f20df18d5b03583674005f43302e846d93f14087dc46ce5d418988169a58ab8f5e2acae83564e81d2d7926566f1347a5083e0
-  data.tar.gz: 09688c753841167d77842c3ff7558a9526d826fd56f46adafe64b5f07ea72cd8f8968ef6d692fe8ad5d5e325861c629fbff77ca411ca1602ab121f1e274c40e8
+  metadata.gz: ce3aa8b7b4369f071f1a70d91fdcfe07f844c5788940072ad68fdf51891795e213bcfd1e5e162e302588c420748d5cce813d7bb3fa051eeb600be3ff6385697b
+  data.tar.gz: 275f405d9b585bbae00e209a0cece55684435d6c243d78220525efdee52d058d615c577c7cc2c660cbe27b2a9501d817b78d1fdcb428db979c19476fb5898ef6

data/lib/waterpig/request-wait-middleware.rb

@@ -0,0 +1,70 @@
+require 'thread'
+
+module Waterpig
+
+  # This Rack middleware is designed to resolve common timing problems with
+  # end-to-end tests. Without it, specs will often finish and :after hooks will
+  # get executed while a request is still "in flight". The result can be, for
+  # example, specs failing because the database has been wiped before a request
+  # truly finishes.
+  #
+  # This middleware counts requests and allows other processes (e.g. testing
+  # processes) to block via RequestWaitMiddle.wait_for_idle() so that they do
+  # not proceed until all requests have completed.
+  class RequestWaitMiddleware
+    @@idle_mutex = Mutex.new
+
+    @@waiting_requests = {}
+    @@block_requests = false
+
+    # This is the only method one would normally call: wrap calls that e.g. drop
+    # the test database in wait_for_idle{ <code> } in order to be sure that
+    # outstanding requests are complete
+    def self.wait_for_idle
+      @@block_requests = true
+
+      @@idle_mutex.synchronize do
+        yield
+      end
+
+      @@block_requests = false
+    end
+
+    def block_requests?
+      @@block_requests
+    end
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      increment_active_requests(env)
+      if block_requests?
+        block_request
+      else
+        @app.call(env)
+      end
+    ensure
+      decrement_active_requests(env)
+    end
+
+    BLOCKED = [503, {}, ["Test is over - server no longer available"]].freeze
+
+    def block_request
+      BLOCKED
+    end
+
+    def increment_active_requests(env)
+      @@idle_mutex.lock unless @@idle_mutex.owned?
+      @@waiting_requests[env.object_id] = true
+    end
+
+    def decrement_active_requests(env)
+      @@waiting_requests.delete(env.object_id)
+      if @@waiting_requests.empty?
+        @@idle_mutex.unlock
+      end
+    end
+  end
+end

data/lib/waterpig/template-refresh.rb

@@ -0,0 +1,122 @@
+module Waterpig
+
+
+  # Tool to handle migrations and rebuilds on a test template database.  For
+  # explanation of what the test templated DB is and how it's used, see the
+  # README.
+  #
+  # This should auto detect any needed migrations in that database. However, it
+  # does not detect changes to db/seeds.rb, so if you have changed seeds
+  # without adding a DB migration, you will need to drop and rebuild the
+  # test_template.
+  module TemplateRefresh
+    Base = ActiveRecord::Base
+    Migrator = ActiveRecord::Migrator
+    DatabaseTasks = ActiveRecord::Tasks::DatabaseTasks
+
+    extend self
+
+    def load_config
+      Base.configurations       = DatabaseTasks.database_configuration || {}
+      Migrator.migrations_paths = DatabaseTasks.migrations_paths
+    end
+
+    def purge_env(env)
+      DatabaseTasks.purge(config_for(env))
+    end
+
+    def with_temporary_connection(env)
+      begin
+        should_reconnect = Base.connection_pool.active_connection?
+
+        yield
+      ensure
+        if should_reconnect
+          Base.establish_connection(config_for(DatabaseTasks.env))
+        end
+      end
+    end
+
+    #Assumes schema_format == ruby
+    def load_schema(env)
+      ActiveRecord::Schema.verbose = false
+      DatabaseTasks.load_schema_for config_for(env), :ruby, ENV['SCHEMA']
+    end
+
+    def load_seed
+      DatabaseTasks.load_seed
+      # load('spec/test_seeds.rb')
+    end
+
+
+    def config_for(env)
+      Base.configurations.fetch(env.to_s)
+    end
+
+    def connection_for(env)
+      Base.establish_connection(env).connection
+    end
+
+    def if_needs_migration(env)
+      if Migrator.needs_migration?(connection_for(env))
+        begin
+          current_config = Base.connection_config
+          Base.clear_all_connections!
+
+          yield
+
+        ensure
+          Base.establish_connection(current_config)
+
+          ActiveRecord::Migration.check_pending!
+        end
+      end
+    end
+
+    def ensure_created(env)
+      Base.establish_connection(env).connection
+    rescue ActiveRecord::NoDatabaseError
+      DatabaseTasks.create(config_for(env))
+    end
+
+
+    def load_if_pending!(env)
+      ensure_created(env)
+      if_needs_migration(env) do
+        puts "Refreshing unmigrated test env: #{env}"
+        purge_env(env)
+        with_temporary_connection(env) do
+          load_schema(env)
+          load_seed
+        end
+      end
+    end
+
+    def commandeer_database(env)
+      config = config_for(env)
+      connection_for(env).select_all(
+        "select pid, pg_terminate_backend(pid) " +
+        "from pg_stat_activity where datname='#{config['database']}' AND state='idle';")
+    end
+
+    def refresh_database(env)
+      Rails.logger.fatal("Resetting test DB...")
+      config = config_for(env)
+
+      tasks = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(config)
+
+      start = Time.now
+      Rails.logger.fatal("Dropping")
+      begin
+        tasks.drop
+      end
+      Rails.logger.fatal("Creating")
+      begin
+        tasks.create
+      end
+      message = "Test database recopied in #{Time.now - start}s"
+      #puts message
+      Rails.logger.fatal(message)
+    end
+  end
+end

data/spec/embarrassing.rb

@@ -3,6 +3,28 @@ Sequel.sqlite
 
 require 'waterpig'
 require 'waterpig/deadbeat-connections'
+module ActiveRecord
+  class Base
+  end
+
+  module Tasks
+    class DatabaseTasks
+    end
+    class PostgresDatabaseTasks
+    end
+  end
+
+  class Migration
+  end
+
+  class Migrator
+  end
+
+  class Schema
+  end
+end
+require 'waterpig/request-wait-middleware'
+require 'waterpig/template-refresh'
 
 describe "Nothing" do
   it "should do more" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterpig
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Judson Lester
@@ -82,6 +82,8 @@ files:
 - lib/waterpig/selenium_chrome.rb
 - lib/waterpig/database-cleaner.rb
 - lib/waterpig/deadbeat-connections.rb
+- lib/waterpig/template-refresh.rb
+- lib/waterpig/request-wait-middleware.rb
 - lib/waterpig/tinymce-tools.rb
 - lib/waterpig/browser-integration.rb
 - lib/waterpig/browser-console-logger.rb
@@ -103,7 +105,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- waterpig-0.8.0 Documentation
+- waterpig-0.8.1 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement