puffing-billy 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7dab062648498106cd36d92beb9ac60d785258e
-  data.tar.gz: 2eb64804cc5f68b5dba48b20c589140609136f7f
+  metadata.gz: c947cba0ecd347fd64162b9d54f81b554332de78
+  data.tar.gz: 7f1d4c7bb3b60f1dd38aaeaafbe3ac908e5cbb42
 SHA512:
-  metadata.gz: 4187b46b234b85781c70d0b7c6b627741b97618036cc28fe6f1e9129aa26623f72e2bd7b9b17b913d55427ea7b88e7afa8b0ae6852d7ebfa75ac0b690f372c37
-  data.tar.gz: ad0efae508e1016672e7b37185e4b04c5701bb22615fb40d8d1169023a4ad9e0587286ea3c8bc79394a4b21c7cc9d88ccf4aa40109fb0084a19a71e57e4bda9b
+  metadata.gz: 2804533a54d46131aaf4545047a84813bea526ddd5129ee72caaf604e700faa55418bd09e5e7bce0abd4981fda98427ddda78b4cb5faf44beb25970e11cecbbb
+  data.tar.gz: e17d6928069e53f911b01bb64d29eb8a06a447b7688f883d37dfb133e0c05107344c4fa0e4d402dd743b00305dff6a1c0ff6211643e7b7973a160634d62b47fd

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+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)
+
 v0.6.0, 2015-08-25
 ------------------
 

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    puffing-billy (0.5.1)
+    puffing-billy (0.6.1)
       addressable
       em-http-request (~> 1.1.0)
       em-synchrony
-      eventmachine (= 1.0.4)
+      eventmachine (~> 1.0.4)
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
@@ -50,7 +50,7 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.4)
       eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.4)
+    eventmachine (1.0.8)
     eventmachine_httpserver (0.2.1)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)

data/README.md

@@ -363,6 +363,20 @@ RSpec.configure do |config|
 end
 ```
 
+As an alternative if you're using VCR, you can ignore requests coming from the browser.
+One way of doing that is by adding to your `rails_helper.rb` the excerpt below:
+
+```ruby
+VCR.configure do |config|
+  config.ignore_request do |request|
+    request.headers.include?('Referer')
+  end
+end
+```
+
+Note that this approach may cause unexpected behavior if your backend sends the Referer HTTP header (which is unlikely).
+
+
 ## Resources
 
 * [Bring Ruby VCR to Javascript testing with Capybara and puffing-billy](http://architects.dzone.com/articles/bring-ruby-vcr-javascript)

data/lib/billy/handlers/proxy_handler.rb

@@ -22,7 +22,7 @@ module Billy
         end
 
         req = EventMachine::HttpRequest.new(url, opts)
-        req = req.send(method.downcase, build_request_options(headers, body))
+        req = req.send(method.downcase, build_request_options(url, headers, body))
 
         if req.error
           return { error: "Request to #{url} failed with error: #{req.error}" }
@@ -50,12 +50,15 @@ module Billy
       nil
     end
 
-    private
+  private
 
-    def build_request_options(headers, body)
+    def build_request_options(url, headers, body)
       headers = Hash[headers.map { |k, v| [k.downcase, v] }]
       headers.delete('accept-encoding')
 
+      uri = Addressable::URI.parse(url)
+      headers.merge!({'authorization' => [uri.user, uri.password]}) if uri.userinfo
+
       req_opts = {
         redirects: 0,
         keepalive: false,
@@ -98,9 +101,13 @@ module Billy
     end
 
     def whitelisted_url?(url)
-      !Billy.config.whitelist.index do |v|
-        v =~ /^#{url.host}(?::#{url.port})?$/
-      end.nil?
+      Billy.config.whitelist.any? do |value|
+        if value.is_a?(Regexp)
+          url.to_s =~ value || url.omit(:port).to_s =~ value
+        else
+          value =~ /^#{url.host}(?::#{url.port})?$/
+        end
+      end
     end
 
     def blacklisted_path?(path)

data/lib/billy/proxy.rb

@@ -16,7 +16,7 @@ module Billy
     def start(threaded = true)
       if threaded
         Thread.new { main_loop }
-        sleep(0.01) while @signature.nil?
+        sleep(0.01) while (not defined?(@signature)) || @signature.nil?
       else
         main_loop
       end
@@ -49,7 +49,7 @@ module Billy
 
         @signature = EM.start_server('127.0.0.1', Billy.config.proxy_port, ProxyConnection) do |p|
           p.handler = request_handler
-          p.cache = @cache
+          p.cache = @cache if defined?(@cache)
         end
 
         Billy.log(:info, "puffing-billy: Proxy listening on #{url}")

data/lib/billy/proxy_connection.rb

@@ -35,7 +35,7 @@ module Billy
       if @parser.http_method == 'CONNECT'
         restart_with_ssl(@parser.request_url)
       else
-        if @ssl
+        if defined?(@ssl) && @ssl
           uri = Addressable::URI.parse(@parser.request_url)
           @url = "https://#{@ssl}#{[uri.path, uri.query].compact.join('?')}"
         else

data/lib/billy/version.rb

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

data/puffing-billy.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'cucumber'
   gem.add_runtime_dependency 'addressable'
-  gem.add_runtime_dependency 'eventmachine', '= 1.0.4'
+  gem.add_runtime_dependency 'eventmachine', '~> 1.0.4'
   gem.add_runtime_dependency 'em-synchrony'
   gem.add_runtime_dependency 'em-http-request', '~> 1.1.0'
   gem.add_runtime_dependency 'eventmachine_httpserver'

data/spec/lib/billy/handlers/proxy_handler_spec.rb

@@ -5,7 +5,7 @@ describe Billy::ProxyHandler do
   let(:request) do
     {
       method:   'post',
-      url:      'http://example.test:8080/index?some=param',
+      url:      'http://usern:pw@example.test:8080/index?some=param',
       headers:  { 'Accept-Encoding'  => 'gzip',
                   'Cache-Control'    => 'no-cache' },
       body:     'Some body'
@@ -50,6 +50,27 @@ describe Billy::ProxyHandler do
                                             request[:body])).to be false
           end
         end
+
+        context 'as a regex' do
+          before do
+            expect(Billy.config).to receive(:whitelist) { [%r{example\.test\/a}] }
+          end
+
+          it 'handles requests for the host without a port' do
+            expect(subject.handles_request?(request[:method],
+                                            'http://example.test/a',
+                                            request[:headers],
+                                            request[:body])).to be true
+          end
+
+          it 'handles requests for the host with a port' do
+            expect(subject.handles_request?(request[:method],
+                                            'http://example.test:8080/a',
+                                            request[:headers],
+                                            request[:body])).to be true
+          end
+        end
+
         context 'without a port' do
           before do
             expect(Billy.config).to receive(:whitelist) { ['example.test'] }
@@ -186,4 +207,20 @@ describe Billy::ProxyHandler do
       end
     end
   end
+
+  describe '#build_request_options' do
+    it 'creates authorization header when URL has basic auth' do
+      request_options = subject.send(:build_request_options, request[:url],
+                                                             request[:headers],
+                                                             request[:body])
+      expect(request_options[:head]).to have_key 'authorization'
+    end
+
+    it 'does not include authorization header without basic auth' do
+      request_options = subject.send(:build_request_options, request[:url].gsub('usern:pw@',''),
+                                                             request[:headers],
+                                                             request[:body])
+      expect(request_options[:head]).not_to have_key 'authorization'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Olly Smith
@@ -196,14 +196,14 @@ dependencies:
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency