capybara-screenshot 1.0.13 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2c4277a621182718153bba9b9bae60234ddfd17
-  data.tar.gz: 6af401d8ae56c2849916c0145f0f0ce928cc92ac
+SHA256:
+  metadata.gz: b73d3b8338a3c2f426d7835f4396565c0bfe28b939f610337c331099f93f52b5
+  data.tar.gz: c5ec9f343c703e5ac2700b84dcde63a094c3609787ea7b1cfbbd1f470a5b0ce4
 SHA512:
-  metadata.gz: 0696563bcf86da3827f2d8392f2555c56e2f830b0ff6c76bad72d5ac2c1b8ddb37730fee26c51924dbd0f4edc4cf8054949adac7506bf01b45cd955fc200c676
-  data.tar.gz: 55ebe3341f404a7c57d5265ca6478127e3b3b4f277a0f2d130f87d5724b0d38d6d441fed4488ab13d0194826432ad0491f6a52b754dc19e578f6f33f61be1a83
+  metadata.gz: 4cd11454a82290ef985a5341e0dad1eaea6296ca5b6ea1f17522a5f8f43b6c68dd71cfd17426c8204fd352488b6ea876d2e8493b2ec0ce2e575590e13302b456
+  data.tar.gz: d17d96491ebc960f4fa47eec58b9dd60610c4a7839e878d8d40c3003cb054e891fc38e958ba42dbcf7ded095385fbb725cdd9e33e368fec51cd89358653c3576

data/.travis.yml

@@ -1,18 +1,17 @@
 language: ruby
-script: "rake travis:ci"
+script: "bundle exec rake travis:ci"
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - 2.2.1
-  - jruby-19mode
-  - jruby-1.7.13
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 gemfile:
-  - gemfiles/cucumber.1.2.gemfile
-  - gemfiles/cucumber.1.3.0.gemfile
+  - gemfiles/cucumber.1.3.gemfile
+  - gemfiles/cucumber.2.4.gemfile
   - gemfiles/latest.gemfile
-  - gemfiles/rspec.2.14.gemfile
-  - gemfiles/rspec.2.99.gemfile
   - gemfiles/rspec.3.0.gemfile
-  - gemfiles/spinach.0.7.gemfile
-  - gemfiles/spinach.0.8.0.gemfile
+  - gemfiles/rspec.3.3.gemfile
+  - gemfiles/spinach.0.8.gemfile

data/Appraisals

@@ -1,31 +1,29 @@
-appraise "rspec.2.14" do
-  gem "rspec", "2.14"
-end
-
-appraise "rspec.2.99" do
-  gem "rspec", "2.99"
-end
-
 appraise "rspec.3.0" do
   gem "rspec", "3.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
-appraise "cucumber.1.2" do
-  gem "cucumber", "1.2"
+appraise "rspec.3.3" do
+  gem "rspec", "~> 3.3.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
-appraise "cucumber.1.3.0" do
-  gem "cucumber", "1.3.0"
+appraise "cucumber.1.3" do
+  gem "cucumber", "~>1.3.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
-appraise "spinach.0.7" do
-  gem "spinach", "0.7"
+appraise "cucumber.2.4" do
+  gem "cucumber", "~>2.4.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
-appraise "spinach.0.8.0" do
-  gem "spinach", "0.8.0"
+appraise "spinach.0.8" do
+  gem "spinach", "~>0.8.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
 appraise "latest" do
   # will get latest versions of all gems
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end

data/CHANGELOG.md

@@ -1,3 +1,72 @@
+21 Dec 2021 - 1.0.25 -> 1.0.26
+
+* [Take screenshots of current window (when using multiple windows)](https://github.com/mattheworiordan/capybara-screenshot/pull/287)
+* [Fix embedding screenshots into cucumber HTML reports](https://github.com/mattheworiordan/capybara-screenshot/pull/288)
+
+4 Oct 2020 - 1.0.24 -> 1.0.25
+
+* [Fix Cucumber 5 deprecation warnings](https://github.com/mattheworiordan/capybara-screenshot/pull/274)
+* [Add support for Cuprite driver](https://github.com/mattheworiordan/capybara-screenshot/pull/270)
+* [Rails system spec compatibility](https://github.com/mattheworiordan/capybara-screenshot/pull/264)
+
+24 Nov 2019 - 1.0.23 -> 1.0.24
+
+* [Support Apparition driver](https://github.com/mattheworiordan/capybara-screenshot/commit/273317b241d1d1d8600b32fad998742894424f3b)
+
+10 Jun 2019 - 1.0.22 -> 1.0.23
+
+* [Support for Capybara sessions implicitly](https://github.com/mattheworiordan/capybara-screenshot/pull/255). Thanks https://github.com/TylerRick
+* [Support for S3 bucket host configuration](https://github.com/mattheworiordan/capybara-screenshot/pull/252). Thanks https://github.com/machty
+
+21 Oct 2018 - 1.0.21 -> 1.0.22
+
+* [Support for S3 URL in HTML screenshots](https://github.com/mattheworiordan/capybara-screenshot/pull/239)
+* [Fix for partial Rails environments](https://github.com/mattheworiordan/capybara-screenshot/pull/238)
+* [Capybara 3 support in CI](https://github.com/mattheworiordan/capybara-screenshot/pull/236)
+
+03 May 2018 - 1.0.20 -> 1.0.21
+
+* [Bug fix: Fix Ruby version compares in Gemspec](https://github.com/mattheworiordan/capybara-screenshot/pull/231)
+
+03 May 2018 - 1.0.19 -> 1.0.20
+
+* [Bug fix: Only take screenshots for feature tests](https://github.com/mattheworiordan/capybara-screenshot/pull/223)
+
+10 April 2018 - 1.0.18 -> 1.0.19
+
+* Big thanks for [Geremia Taglialatela](https://github.com/tagliala) for [padding Capybara 3 support and fixing the builds](https://github.com/mattheworiordan/capybara-screenshot/pull/230)
+
+2 November 2017 - 1.0.17 -> 1.0.18
+
+* [RSpec 3.3 support](https://github.com/mattheworiordan/capybara-screenshot/pull/213)
+* [Add support for selenium_chrome and selenium_chrome_headless](https://github.com/mattheworiordan/capybara-screenshot/pull/219)
+* [Less dependencies for S3 uploads](https://github.com/mattheworiordan/capybara-screenshot/pull/218)
+
+Special thanks to the fine contribution from [Matt Bricston](https://github.com/mattbrictson)
+
+17 July 2017 - 1.0.16 -> 1.0.17
+
+* [Better handling of `page.current_path` exceptions for Spinach](https://github.com/mattheworiordan/capybara-screenshot/pull/208)
+
+12 July 2017 - 1.0.15 -> 1.0.16
+
+* [Support s3 key name prefixes](https://github.com/mattheworiordan/capybara-screenshot/pull/202)
+
+12 July 2017 - 1.0.14 -> 1.0.15
+
+* [SVG badges added](https://github.com/mattheworiordan/capybara-screenshot/pull/207)
+* [Ensure the reporter module is not loaded multiple times](https://github.com/mattheworiordan/capybara-screenshot/pull/205)
+* [S3 object config option](https://github.com/mattheworiordan/capybara-screenshot/pull/204)
+* [Saver can use injected page](https://github.com/mattheworiordan/capybara-screenshot/pull/181)
+* [After* callbacks](https://github.com/mattheworiordan/capybara-screenshot/pull/171)
+
+15 Sep 2016 - 1.0.13 -> 1.0.14
+
+* CI stable again - dropped CI support for older versions of Ruby and JRuby.  It is just too painful and there is no evidence that our users need this or that Capybara Screenshot is indeed broken.  It is better to have a reliable build system so that PRs can get merged in reliably and easily.
+* Fixed an inconsistency in the use of `save_and_open_page_path`
+* Improved debugging of Aruba tests so that contributors can easily understand why their builds break
+* Path fixes thanks to [Ryan McGarvey](https://github.com/ryanmcgarvey)
+
 23 May 2016 - 1.0.12 -> 1.0.13
 
 * Fixes [mkmf bug 162](https://github.com/mattheworiordan/capybara-screenshot/issues/162) and [mkmf bug 174](https://github.com/mattheworiordan/capybara-screenshot/issues/174)

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in capybara-screenshot.gemspec
 gemspec
 
-gem 'rake'
-gem 'appraisal'
-gem 'aruba', '~> 0.14.0'
+gem 'rack', '~> 1.0'
+gem 'rake', '~> 13.0'
+gem 'appraisal', '~> 2.0'
+gem 'aruba', '~> 0.14.0'

data/README.md

@@ -1,30 +1,31 @@
 capybara-screenshot gem
 =======================
 
-[![Build Status](https://travis-ci.org/mattheworiordan/capybara-screenshot.png)](https://travis-ci.org/mattheworiordan/capybara-screenshot)
-[![Code Climate](https://d3s6mut3hikguw.cloudfront.net/github/mattheworiordan/capybara-screenshot.png)](https://codeclimate.com/github/mattheworiordan/capybara-screenshot)
+[![Build Status](https://travis-ci.org/mattheworiordan/capybara-screenshot.svg)](https://travis-ci.org/mattheworiordan/capybara-screenshot)
+[![Code Climate](https://d3s6mut3hikguw.cloudfront.net/github/mattheworiordan/capybara-screenshot.svg)](https://codeclimate.com/github/mattheworiordan/capybara-screenshot)
 [![Gem Version](https://badge.fury.io/rb/capybara-screenshot.svg)](http://badge.fury.io/rb/capybara-screenshot)
 
-#### Capture a screen shot for every test failure automatically!
+#### Capture a screenshot for every test failure automatically!
 
-`capybara-screenshot` used with [Capybara](https://github.com/jnicklas/capybara) and [Cucumber](http://cukes.info/), [Rspec](https://www.relishapp.com/rspec) or [Minitest](https://github.com/seattlerb/minitest), will capture a screen shot for each failure in your test suite.  The HTML for the failed page, and a screenshot image (when using [capybara-webkit](https://github.com/thoughtbot/capybara-webkit), [Selenium](http://seleniumhq.org/) or [poltergeist](https://github.com/jonleighton/poltergeist)) is saved into `$APPLICATION_ROOT/tmp/capybara`.
+`capybara-screenshot` used with [Capybara](https://github.com/jnicklas/capybara) alongside [Cucumber](http://cukes.info/), [Rspec](https://www.relishapp.com/rspec) or [Minitest](https://github.com/seattlerb/minitest), will capture a screenshot for each failure in your test suite. Associated screenshot and HTML file
+of the failed page (when using [capybara-webkit](https://github.com/thoughtbot/capybara-webkit), [Selenium](http://seleniumhq.org/), [poltergeist](https://github.com/jonleighton/poltergeist) or [cuprite](https://github.com/machinio/cuprite)) is saved into `$APPLICATION_ROOT/tmp/capybara`.
 
-Having screenshots readily available for each test failure is incredibly helpful when trying to quickly diagnose a problem in your failing steps.  You can view the source code, and have a screen shot of the page (when applicable), at the time of each failure.
+Available screenshots for each test failure is incredibly helpful for diagnosing problems quickly in your failing steps. You have the ability to view screenshots (when applicable) and source code at the time of each failure.
 
-_Please note that Ruby 1.9+ is required to use this Gem.  For Ruby 1.8 support, please see the [capybara-screenshot Ruby 1.8 branch](https://github.com/mattheworiordan/capybara-screenshot/tree/ruby-1.8-support)_
+_Please note that Ruby 1.9+ is required to use this Gem. For Ruby 1.8 support, please see the [capybara-screenshot Ruby 1.8 branch](https://github.com/mattheworiordan/capybara-screenshot/tree/ruby-1.8-support)_
 
 Installation
 -----
 
 ### Step 1: install the gem
 
-Using Bundler, add the following to your Gemfile
+Using Bundler, add the following to your Gemfile:
 
 ```ruby
 gem 'capybara-screenshot', :group => :test
 ```
 
-or install manually using Ruby Gems:
+Alternatively, manually install using Ruby Gems:
 
 ```
 gem install capybara-screenshot
@@ -76,7 +77,7 @@ Typically in 'test/test_helper.rb', please add:
 require 'capybara-screenshot/testunit'
 ```
 
-By default, screenshots will be captured for `Test::Unit` tests in the path 'test/integration'.  You can add additional paths as:
+By default, screenshots will be captured for `Test::Unit` tests in the path 'test/integration'.  You can add additional paths:
 
 ```ruby
 Capybara::Screenshot.testunit_paths << 'test/feature'
@@ -86,33 +87,50 @@ Capybara::Screenshot.testunit_paths << 'test/feature'
 Manual screenshots
 ----
 
-If you require more control, you can generate the screenshot on demand rather than on failure. This is useful
-if the failure occurs at a point where the screen shot is not as useful for debugging a rendering problem. This
-can be more useful if you disable the auto-generate on failure feature with the following config
+If you require more control, screenshots can be generated on demand rather than on failure. This is useful
+when screenshots produced at the time of failure are not as useful for debugging a rendering problem.
+Differentiating between manual and failure screenshots can be improved by disabling the auto-generate on
+failure feature:
 
 ```ruby
 Capybara::Screenshot.autosave_on_failure = false
 ```
 
-Anywhere the Capybara DSL methods (visit, click etc.) are available so too are the screenshot methods.
+Anywhere the Capybara DSL methods (visit, click etc.) are available so too are the screenshot methods:
 
 ```ruby
 screenshot_and_save_page
 ```
 
-Or for screenshot only, which will automatically open the image.
+Or for screenshot only, which will automatically open the image:
 
 ```ruby
 screenshot_and_open_image
 ```
 
-These are just calls on the main library methods.
+These are just calls on the main library methods:
 
 ```ruby
 Capybara::Screenshot.screenshot_and_save_page
 Capybara::Screenshot.screenshot_and_open_image
 ```
 
+Better looking HTML screenshots
+-------------------------------
+
+By the default, HTML screenshots will not look very good when opened in a browser.  This happens because the browser can't correctly resolve relative paths like `<link href="/assets/...." />`, which stops CSS, images, etc... from being loaded.  To get a nicer looking page, configure Capybara with:
+
+```ruby
+Capybara.asset_host = 'http://localhost:3000'
+```
+
+This will cause Capybara to add `<base>http://localhost:3000</base>` to the HTML file, which gives the browser enough information to resolve relative paths.  Next, start a rails server in development mode, on port 3000, to respond to requests for assets:
+
+```bash
+rails s -p 3000
+```
+
+Now when you open the page, you should have something that looks much better.  You can leave this setup in place and use the default HTML pages when you don't care about the presentation, or start the rails server when you need something better looking.
 
 Driver configuration
 --------------------
@@ -149,7 +167,7 @@ Custom screenshot filename
 --------------------------
 
 If you want to control the screenshot filename for a specific test library, to inject the test name into it for example,
-you can override how the basename is generated for the file like so
+you can override how the basename is generated for the file:
 
 ```ruby
 Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
@@ -157,7 +175,7 @@ Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
 end
 ```
 
-By default capybara-screenshot will append a timestamp to the basename. If you want to disable this behavior set the following option:
+By default capybara-screenshot will append a timestamp to the basename. If you want to disable this behavior, set the following option:
 
 ```ruby
 Capybara::Screenshot.append_timestamp = false
@@ -167,25 +185,25 @@ Capybara::Screenshot.append_timestamp = false
 Custom screenshot directory
 --------------------------
 By default, when running under Rails, Sinatra, and Padrino, screenshots are saved into `$APPLICATION_ROOT/tmp/capybara`. Otherwise, they're saved under `Dir.pwd`.
-If you want to customize the location, override the file path as:
+If you want to customize the location, override the file path:
 
 ```ruby
-Capybara.save_and_open_page_path = "/file/path"
+Capybara.save_path = "/file/path"
 ```
 
 
 Uploading screenshots to S3
 --------------------------
-You can configure capybara-screenshot to automatically save your screenshots to an AWS S3 bucket. 
+You can configure capybara-screenshot to automatically save your screenshots to an AWS S3 bucket.
 
-First, install the `aws-sdk` gem or add it to your Gemfile
+First, install the `aws-sdk-s3` gem or add it to your Gemfile:
 
 ```ruby
-gem 'capybara-screenshot', :group => :test
-gem 'aws-sdk', :group => :test
+gem 'aws-sdk-s3', group: :test
+gem 'capybara-screenshot', group: :test
 ```
 
-Next, configure capybara-screenshot with your S3 credentials, the bucket to save to, and an optional region (default: `us-east-1`). 
+Next, configure capybara-screenshot with your S3 credentials, the bucket to save to, and an optional region (default: `us-east-1`):
 
 ```ruby
 Capybara::Screenshot.s3_configuration = {
@@ -194,14 +212,37 @@ Capybara::Screenshot.s3_configuration = {
     secret_access_key: "my_secret_access_key",
     region: "eu-central-1"
   },
-  bucket_name: "my_screenshots"
+  bucket_name: "my_screenshots",
+  # Optionally: Specify the host used to access the uploaded screenshots
+  bucket_host: "my_screenshots.s3-eu-central-1.amazonaws.com",
+}
+```
+
+The access key used for S3 uploads need to have at least the `s3:PutObject` permission.
+
+**Note**: If you do not provide the `bucket_host` configuration option, additionally the `s3:GetBucketLocation` permission is required on the bucket for uploads to succeed.
+
+It is also possible to specify the object parameters such as acl.
+Configure the capybara-screenshot with these options in this way:
+
+```ruby
+Capybara::Screenshot.s3_object_configuration = {
+  acl: 'public-read'
 }
 ```
 
+You may optionally specify a `:key_prefix` when generating the S3 keys, which can be used to create virtual [folders](http://docs.aws.amazon.com/AmazonS3/latest/UG/FolderOperations.html) in S3, e.g.:
+
+```ruby
+Capybara::Screenshot.s3_configuration = {
+  ... # other config here
+  key_prefix: "some/folder/"
+}
+```
 
 Pruning old screenshots automatically
 --------------------------
-By default screenshots are saved indefinitely, if you want them to be automatically pruned on a new failure, then you can specify one of the following prune strategies as follows:
+By default, screenshots are saved indefinitely. If you want them to be automatically pruned on a new failure, then you can specify one of the following prune strategies as follows:
 
 ```ruby
 # Keep only the screenshots generated from the last failing test suite
@@ -211,6 +252,30 @@ Capybara::Screenshot.prune_strategy = :keep_last_run
 Capybara::Screenshot.prune_strategy = { keep: 20 }
 ```
 
+Callbacks
+---------
+
+You can hook your own logic into callbacks after the html/screenshot has been saved:
+
+```ruby
+# after Saver#save_html
+Capybara::Screenshot.after_save_html do |path|
+  mail = Mail.new do
+    delivery_method :sendmail
+    from     'capybara-screenshot@example.com'
+    to       'dev@example.com'
+    subject  'Capybara Screenshot'
+    add_file File.read path
+  end
+  mail.delivery_method :sendmail
+  mail.deliver
+end
+
+# after Saver#save_screenshot
+Capybara::Screenshot.after_save_screenshot do |path|
+  # ...
+end
+```
 
 Information about screenshots in RSpec output
 ---------------------------------------------
@@ -254,7 +319,7 @@ Please raise an issue at [https://github.com/mattheworiordan/capybara-screenshot
 
 #### Contributions
 
-Contributions are welcome.  Please fork this gem, and submit a pull request.  New features must include test coverage and must pass on all versions of the testing frameworks supported.  Run `appraisal "bundle exec rspec && bundle exec cucumber"` locally to test your changes against all versions of testing framework gems supported.
+Contributions are welcome.  Please fork this gem and then submit a pull request.  New features must include test coverage and must pass on all versions of the testing frameworks supported.  Run `appraisal` to set up the your Gems. then `appraisal "rake travis:ci"` locally to test your changes against all versions of testing framework gems supported.
 
 #### Rubygems
 
@@ -265,11 +330,12 @@ About
 
 This gem was written by **Matthew O'Riordan**, with contributions from [many kind people](https://github.com/mattheworiordan/capybara-screenshot/network/members).
 
- - [http://mattheworiordan.com](http://mattheworiordan.com)
+ - [http://mattheworiordan.com](http://mattheworiordan.com), [Technical co-founder & CEO of Ably Realtime](https://ably.com/)
  - [@mattheworiordan](http://twitter.com/#!/mattheworiordan)
- - [Linked In](http://www.linkedin.com/in/lemon)
+ - [Linked In](http://www.linkedin.com/in/mattoriordan)
+
 
 License
 -------
 
-Copyright © 2014 Matthew O'Riordan, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+Copyright © 2020 Matthew O'Riordan, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/capybara-screenshot.gemspec

@@ -12,14 +12,21 @@ Gem::Specification.new do |s|
   s.summary     = %q{Automatically create snapshots when Cucumber steps fail with Capybara and Rails}
   s.description = %q{When a Cucumber step fails, it is useful to create a screenshot image and HTML file of the current page}
   s.license     = 'MIT'
+  s.metadata    = {
+    "bug_tracker_uri"   => "https://github.com/mattheworiordan/capybara-screenshot/issues",
+    "changelog_uri"     => "https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md",
+    "documentation_uri" => "https://www.rubydoc.info/gems/capybara-screenshot/#{s.version}",
+    "source_code_uri"   => "https://github.com/mattheworiordan/capybara-screenshot/tree/v#{s.version}",
+  }
 
-  s.rubyforge_project = "capybara-screenshot"
-
-  if RUBY_VERSION < "1.9"
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("1.9")
     s.add_dependency 'capybara', ['>= 1.0', '< 2']
-  else
+  elsif Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.2.2")
     s.add_dependency 'capybara', ['>= 1.0', '< 3']
+  else
+    s.add_dependency 'capybara', ['>= 1.0', '< 4']
   end
+
   s.add_dependency 'launchy'
 
   s.add_development_dependency 'rspec'
@@ -30,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'spinach'
   s.add_development_dependency 'minitest'
-  s.add_development_dependency 'aws-sdk'
+  s.add_development_dependency 'aws-sdk-s3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/cucumber.1.3.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
+gem "cucumber", "~>1.3.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
+
+gemspec :path => "../"

data/gemfiles/cucumber.2.4.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
+gem "cucumber", "~>2.4.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
+
+gemspec :path => "../"

data/gemfiles/latest.gemfile

@@ -2,7 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "rake"
-gem "appraisal"
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
 
 gemspec :path => "../"

data/gemfiles/rspec.3.0.gemfile

@@ -2,8 +2,11 @@
 
 source "http://rubygems.org"
 
-gem "rake"
-gem "appraisal"
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
 gem "rspec", "3.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
 
 gemspec :path => "../"

data/gemfiles/rspec.3.3.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
+gem "rspec", "~> 3.3.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
+
+gemspec :path => "../"

data/gemfiles/spinach.0.8.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
+gem "spinach", "~>0.8.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
+
+gemspec :path => "../"

data/lib/capybara-screenshot/callbacks.rb

@@ -0,0 +1,44 @@
+module Capybara
+  module Screenshot
+    module Callbacks
+      class CallbackSet < Array
+        def call *args
+          each do |callback|
+            callback.call(*args)
+          end
+        end
+      end
+
+      module ClassMethods
+        def callbacks
+          @callbacks ||= {}
+        end
+
+        def define_callback name
+          callbacks[name] ||= CallbackSet.new
+
+          define_singleton_method name do |&block|
+            callbacks[name] << block
+          end
+        end
+
+        def run_callbacks name, *args
+          if cb_set = callbacks[name]
+            cb_set.call(*args)
+          end
+        end
+      end
+
+      module InstanceMethods
+        def run_callbacks name, *args
+          self.class.run_callbacks name, *args
+        end
+      end
+
+      def self.included receiver
+        receiver.extend         ClassMethods
+        receiver.send :include, InstanceMethods
+      end
+    end
+  end
+end

data/lib/capybara-screenshot/capybara.rb

@@ -1,6 +1,20 @@
-require "capybara-screenshot"
-
 module Capybara
+  class << self
+    module ScreenshotOverrides
+      def using_session(name, &block)
+        original_session_name = Capybara.session_name
+        Capybara::Screenshot.final_session_name = name
+        super(name, &block)
+        Capybara::Screenshot.final_session_name = original_session_name
+      end
+
+      # No longer needed. Kept for backwards compatibility only.
+      alias_method :using_session_with_screenshot, :using_session
+    end
+
+    prepend ScreenshotOverrides
+  end
+
   module DSL
     # Adds class methods to Capybara module and gets mixed into
     # the current scope during Cucumber and RSpec tests
@@ -12,15 +26,17 @@ module Capybara
     def screenshot_and_open_image
       Capybara::Screenshot.screenshot_and_open_image
     end
+  end
 
-    def using_session_with_screenshot(name,&blk)
-      original_session_name = Capybara.session_name
-      Capybara::Screenshot.final_session_name = name
-      using_session_without_screenshot(name,&blk)
-      Capybara::Screenshot.final_session_name = original_session_name
-    end
+  module SessionScreenshotOverrides
+    def within_window(window_or_handle)
+      super
+    rescue Exception
+      Thread.current[:capybara_screenshot_offending_window] = window_or_handle
 
-    alias_method :using_session_without_screenshot, :using_session
-    alias_method :using_session, :using_session_with_screenshot
+      raise
+    end
   end
+
+  Session.prepend SessionScreenshotOverrides
 end