waterpig 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e20640440d771664f5460b57a1178345f9ad5ac1
-  data.tar.gz: cb422e922758a986a040ca543e5a8de6e694f851
+  metadata.gz: 2a2a5a3dc8d067e31bd44da7641251085c79f8a9
+  data.tar.gz: e9bf6eb922f230797d4281a5aab4151fed8a0d64
 SHA512:
-  metadata.gz: bf1486128af018b73e88021e0eeef68ee6ad1c339970e4317c70216c6c358f5b03cfde112c2ebd8015f52f3d97563d8017f2b1f623eee87a742ea5377ea812ca
-  data.tar.gz: a3bf55677893c493e49715fc42df9eb810822a3da1a720f47cc9fe274a66d6da2dae8afbfce0095c73a27c0b0d8737b042e32d63b4a80a87ac8185ccf8df31cd
+  metadata.gz: 319ea313489f5e5d6df14637712d008e03dfe120a35f50152b5cfb1657541ae2cc3cf332bea0f80cbc7df027facc790a42b6065e806cbf6d99a58b186a73a66d
+  data.tar.gz: d57ad2069c0d90fdd5274d4969cf02edfab660af5925df482655ea84c6b4f7597c6d36db29dd83ca7e68d122588587e6cdd6d36cf63ae1698919af96e6782930

data/lib/waterpig/browser-integration.rb

@@ -9,6 +9,7 @@ require 'waterpig/save-and-open-on-fail'
 require 'waterpig/ckeditor-tools'
 require 'waterpig/tinymce-tools'
 require 'waterpig/browser-tools'
+require 'waterpig/browser-size'
 require 'waterpig/snap-step'
 
 module Waterpig
@@ -22,10 +23,19 @@ end
 
 RSpec.configure do |config|
   config.add_setting :waterpig_browser_types, :default => [:feature]
+  config.add_setting :waterpig_browser_size_types, :default => [:feature]
+
   config.add_setting :waterpig_autosnap, :default => ENV['WATERPIG_AUTOSNAP']
   config.add_setting :waterpig_driver, :default => ENV['CAPYBARA_DRIVER']
   config.add_setting :waterpig_js_driver, :default => ENV['CAPYBARA_JS_DRIVER']
 
+  config.add_setting :waterpig_browser_sizes, :default => {
+    :mobile  => { :width => 320, :height => 480 },
+    :small   => { :width => 550, :height => 700 },
+    :medium  => { :width => 800, :height => 900 },
+    :desktop => { :width => 1024, :height => 1024 }
+  }
+
 
   config.before(:suite) do
     Capybara.default_driver = Waterpig.pick_capybara_driver(config.waterpig_driver)
@@ -45,4 +55,8 @@ RSpec.configure do |config|
     config.waterpig_autosnap? && config.waterpig_browser_types.include?(value)
   }
   config.include Waterpig::SnapStep, :snapshots_into => proc{|v| v.is_a? String}
+
+  config.include Waterpig::BrowserSize, :type => proc{|value|
+    config.waterpig_browser_size_types && config.waterpig_browser_size_types.include?(value)
+  }
 end

data/lib/waterpig/browser-size.rb

@@ -0,0 +1,18 @@
+module Waterpig
+  module BrowserSize
+    def self.included(group)
+      group.before(:each) do |example|
+        sizes = RSpec.configuration.waterpig_browser_sizes
+        BrowserSize.resize_browser_window(sizes[BrowserSize.current_size(example)])
+      end
+    end
+
+    def self.resize_browser_window(size)
+      Capybara.current_session.driver.browser.manage.window.resize_to(size[:width], size[:height])
+    end
+
+    def self.current_size(example)
+      (example.metadata[:size] || ENV['BROWSER_SIZE'] || :desktop).to_sym
+    end
+  end
+end

data/lib/waterpig/database-cleaner.rb

@@ -9,20 +9,38 @@ RSpec.configure do |config|
   config.add_setting :waterpig_database_truncation_config, :default => {:except => %w[spatial_ref_sys]}
   config.add_setting :waterpig_db_seeds, :default => 'db/seeds.rb'
 
+  def with_showing(show, detailed)
+    begin
+      old_show, old_show_detailed =
+        Rails.application.config.action_dispatch.show_exceptions,
+        Rails.application.config.action_dispatch.show_detailed_exceptions
+      Rails.application.config.action_dispatch.show_exceptions = show
+      Rails.application.config.action_dispatch.show_detailed_exceptions = detailed
+      yield
+    ensure
+      Rails.application.config.action_dispatch.show_exceptions = old_show
+      Rails.application.config.action_dispatch.show_detailed_exceptions = old_show_detailed
+    end
+  end
+
   config.before :all, :type => proc{ |value| config.waterpig_truncation_types.include?(value)} do
-    Rails.application.config.action_dispatch.show_exceptions = true
-    DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
-    unless config.waterpig_exclude_seeds_types.include?(self.class.metadata[:type])
-      if config.waterpig_db_seeds?
-        load config.waterpig_db_seeds
+    with_showing(true, false) do
+      DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
+      unless config.waterpig_exclude_seeds_types.include?(self.class.metadata[:type])
+        if config.waterpig_db_seeds?
+          load config.waterpig_db_seeds
+        end
       end
     end
   end
 
   config.after :all, :type => proc{ |value| config.waterpig_truncation_types.include?(value)} do
-    DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
-    if config.waterpig_db_seeds?
-      load config.waterpig_db_seeds
+    with_showing(true, true) do
+      Rails.application.config.action_dispatch.show_detailed_exceptions = true
+      DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
+      if config.waterpig_db_seeds?
+        load config.waterpig_db_seeds
+      end
     end
   end
 

data/lib/waterpig/deadbeat-connections.rb

@@ -0,0 +1,32 @@
+module Waterpig
+  class DeadbeatConnectionRelease
+    def initialize(app)
+      @app = app
+    end
+
+    #This is a brittle hack for what appears to be a bug in ActiveRecord 4:
+    #connections aren't being properly released after their owning threads die
+    def call(env)
+      response = @app.call(env)
+      response[2] = ::Rack::BodyProxy.new(response[2]) do
+        ActiveRecord::Base.connection_handler.connection_pool_list.each do |pool|
+          reservers = pool.instance_variable_get("@reserved_connections").keys
+          deadbeats = reservers - Thread.list.map(&:object_id)
+          Rails.logger.info{ "Releasing connections held by these no-longer-living Threads: #{deadbeats}" } unless deadbeats.empty?
+          deadbeats.each do |deadbeat_id|
+            pool.release_connection(deadbeat_id)
+          end
+        end
+      end
+
+      response
+    rescue Object => ex
+      require 'pp'
+      Rails.logger.fatal "Problem responding to request in test"
+      Rails.logger.fatal [ex.class, ex.message, ex.backtrace].join("\n")
+      Rails.logger.fatal env.pretty_inspect
+      Rails.logger.fatal response.pretty_inspect
+      raise
+    end
+  end
+end

data/spec/embarrassing.rb

@@ -2,6 +2,7 @@ require 'sequel'
 Sequel.sqlite
 
 require 'waterpig'
+require 'waterpig/deadbeat-connections'
 
 describe "Nothing" do
   it "should do more" do

data/spec_help/spec_helper.rb

@@ -1,9 +1,14 @@
 require 'rspec'
 require 'rspec/core/formatters/base_formatter'
-require 'cadre/rspec'
+require 'cadre/rspec3'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
-  config.add_formatter(Cadre::RSpec::NotifyOnCompleteFormatter)
-  config.add_formatter(Cadre::RSpec::QuickfixFormatter)
+  if config.formatters.empty?
+    config.add_formatter(:progress)
+    #but do consider:
+    #config.add_formatter(Cadre::RSpec3::TrueFeelingsFormatter)
+  end
+  config.add_formatter(Cadre::RSpec3::NotifyOnCompleteFormatter)
+  config.add_formatter(Cadre::RSpec3::QuickfixFormatter)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterpig
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -65,12 +65,14 @@ files:
 - lib/waterpig/ckeditor-tools.rb
 - lib/waterpig/selenium_chrome.rb
 - lib/waterpig/database-cleaner.rb
+- lib/waterpig/deadbeat-connections.rb
 - lib/waterpig/tinymce-tools.rb
 - lib/waterpig/browser-integration.rb
 - lib/waterpig/poltergeist.rb
 - lib/waterpig/warning-suppressor.rb
 - lib/waterpig/snap-step.rb
 - lib/waterpig/browser-tools.rb
+- lib/waterpig/browser-size.rb
 - spec/embarrassing.rb
 - spec_help/spec_helper.rb
 - spec_help/gem_test_suite.rb
@@ -84,7 +86,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- waterpig-0.3.0 Documentation
+- waterpig-0.4.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement