puffing-billy 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c947cba0ecd347fd64162b9d54f81b554332de78
-  data.tar.gz: 7f1d4c7bb3b60f1dd38aaeaafbe3ac908e5cbb42
+  metadata.gz: 036f99aa36198814c89f3764027a28b63d46e4d3
+  data.tar.gz: 14820ad20ea2e08038d8c9ed03921be8058831ac
 SHA512:
-  metadata.gz: 2804533a54d46131aaf4545047a84813bea526ddd5129ee72caaf604e700faa55418bd09e5e7bce0abd4981fda98427ddda78b4cb5faf44beb25970e11cecbbb
-  data.tar.gz: e17d6928069e53f911b01bb64d29eb8a06a447b7688f883d37dfb133e0c05107344c4fa0e4d402dd743b00305dff6a1c0ff6211643e7b7973a160634d62b47fd
+  metadata.gz: 5e19c8f782fe8f99743bdb2349123447f7dd8cc6187721facec412650ef12d9d72d9a93155ee2bbcaaf0edfd7084abd61ef4882a6dd2d5e8f721caa96444370b
+  data.tar.gz: d1146aef57cad65dec0692f0492d2a662f923213dc7306128c345a627bbad3da45a79dadc26c2a77b0014a3f87b5caffa08c68cc7c86ad431f746d54946b0533

data/CHANGELOG.md

@@ -1,15 +1,23 @@
+v0.6.2, 2015-11-23
+------------------
+
+  * Enhanced error output for proxy handling [#125](https://github.com/oesmith/puffing-billy/pull/125)
+  * Use options to create webkit driver [#129](https://github.com/oesmith/puffing-billy/pull/129)
+  * Billy config and Capybara::Webkit config compatibility [#130](https://github.com/oesmith/puffing-billy/pull/130)
+  * Output the request method when proxy returns an error [#134](https://github.com/oesmith/puffing-billy/pull/134)
+
 v0.6.1, 2015-08-25
 ------------------
 
-  * Fix `instance variable not initialized` warnings (#107)
-  * Add regex support to whitelist (#111)
-  * Support basic auth in requests (#121)
-  * Added alternative to run VCR in parallel (#122)
+  * Fix `instance variable not initialized` warnings [#107](https://github.com/oesmith/puffing-billy/pull/107)
+  * Add regex support to whitelist [#111](https://github.com/oesmith/puffing-billy/pull/111)
+  * Support basic auth in requests [#121](https://github.com/oesmith/puffing-billy/pull/121)
+  * Added alternative to run VCR in parallel [#122](https://github.com/oesmith/puffing-billy/pull/122)
 
 v0.6.0, 2015-08-25
 ------------------
 
-  * Fix uninitalized constant error in Minitest (#109)
+  * Fix uninitialized constant error in Minitest (#109)
   * Add support for customizing Billy proxy host (#112)
   * Add support for internal proxies (#118)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puffing-billy (0.6.1)
+    puffing-billy (0.6.2)
       addressable
       em-http-request (~> 1.1.0)
       em-synchrony

data/README.md

@@ -250,7 +250,7 @@ that are running on random ports.
 or 304 status codes.  This prevents unauthorized or internal server errors from
 being cached and used for future test runs.
 
-`c.non_successful_error_level` is used to log when non-successful resposnes are
+`c.non_successful_error_level` is used to log when non-successful responses are
 received.  By default, it just writes to the log file, but when set to `:error`
 it throws an error with the URL and status code received for easier debugging.
 

data/lib/billy.rb

@@ -42,11 +42,11 @@ module Billy
 
     if defined?(Capybara::Webkit::Driver)
       Capybara.register_driver :webkit_billy do |app|
-        driver = Capybara::Webkit::Driver.new(app)
-        driver.browser.ignore_ssl_errors
-        driver.browser.set_proxy(host: Billy.proxy.host,
-                                 port: Billy.proxy.port)
-        driver
+        options = {
+          ignore_ssl_errors: false,
+          proxy: {host: Billy.proxy.host, port: Billy.proxy.port}
+        }
+        Capybara::Webkit::Driver.new(app, Capybara::Webkit::Configuration.to_hash.merge(options))
       end
     end
 

data/lib/billy/handlers/proxy_handler.rb

@@ -33,7 +33,7 @@ module Billy
 
           unless allowed_response_code?(response[:status])
             if Billy.config.non_successful_error_level == :error
-              return { error: "Request failed due to response status #{response[:status]} for '#{url}' which was not allowed." }
+              return { error: "#{method} Request failed due to response status #{response[:status]} for '#{url}' which was not allowed." }
             else
               Billy.log(:warn, "puffing-billy: Received response status code #{response[:status]} for '#{url}'")
             end

data/lib/billy/proxy.rb

@@ -50,6 +50,9 @@ module Billy
         @signature = EM.start_server('127.0.0.1', Billy.config.proxy_port, ProxyConnection) do |p|
           p.handler = request_handler
           p.cache = @cache if defined?(@cache)
+          p.errback do |msg|
+            Billy.log :error, msg
+          end
         end
 
         Billy.log(:info, "puffing-billy: Proxy listening on #{url}")

data/lib/billy/proxy_connection.rb

@@ -7,6 +7,8 @@ require 'em-synchrony'
 
 module Billy
   class ProxyConnection < EventMachine::Connection
+    include EventMachine::Deferrable
+
     attr_accessor :handler
     attr_accessor :cache
 

data/lib/billy/version.rb

@@ -1,3 +1,3 @@
 module Billy
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/lib/proxy_spec.rb

@@ -230,17 +230,6 @@ shared_examples_for 'a cache' do
         end
 
         it 'should raise error for non-successful responses when :error' do
-          # When this config setting is set, the EventMachine running the test servers is killed upon error raising
-          # The `raise` is required to bubble up the error to the test running it
-          # The Faraday error is raised upon `close_connection` so this can be non-pending if we can do one of the following:
-          # 1) Remove the `raise error_message` conditionally for this test
-          # 2) Restart the test servers if they aren't running
-          # 3) Change the test servers to start/stop for each test instead of before all
-          # 4) Remove the test server completely and rely on the server instantiated by the app
-          pending 'Unable to test this without affecting the running test servers'
-          # If the 'pending' continues to execute the spec, 'skip' it to avoid EM errors.
-          # If 'pending' stops the test, 'skip' isn't defined but it won't hit this line.
-          skip 'Unable to test this without affecting the running test servers'
           expect { http_error.get('/foo') }.to raise_error(Faraday::Error::ConnectionFailed)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Olly Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec