puffing-billy 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc4280168375f52adf8bd5452297a202ea9e7b66821ca7d0641d82215a1fe85
-  data.tar.gz: 947d554aa9a49dac255e88db0968092be0446b975bfcad688609976176bd51c0
+  metadata.gz: 0b6481a511001f8deb9af5c1e00a4a3a4b91e96cb1bd7b039ef25e2685e70930
+  data.tar.gz: 037f87e67fc52e5798e3024947f36b5233cd017429589eccda6993691d6529de
 SHA512:
-  metadata.gz: 9c64ebf7794856afabaa2445cdf545489f0ba57e2e57785ffa8ff9b51c5081662c070b18f8229f1f6588121b3a3bf2f8496ce730cb9f36a686c748398f40d941
-  data.tar.gz: c6e850c90888de3f027c1c4c333c359ad2f2dbc0ecd2f6466f11c6fa04ace0078e9c5bb63281202c22d114ad0a703a60ed4a41e7ee7bab9c1b8cf3a92b2d7ccb
+  metadata.gz: 1fe9255112bc4031b859f6a0ad016a6f9c7a2fcef38176ff6a60804f3068e3309e3798be59f6bd1e9fa5dd814753bf6a4b42e541cb46919021d2f4126628a1db
+  data.tar.gz: 6f081f4ec79141bc5ea1d349d12f1edfe219faaec27cec3eeebd3327683a07b994b1c3960f3227b49974538445093475375dd0378332c2c908d22ed803e5ba2d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.1, 2018-05-12
+-------------------
+  * Fix scope breaking change of request/response interception [#242](https://github.com/oesmith/puffing-billy/pull/242)
+
 v1.1.0, 2018-04-29
 -------------------
   * Expose stub instances via puffing billy [#224](https://github.com/oesmith/puffing-billy/pull/224)

data/README.md

@@ -115,9 +115,10 @@ proxy.stub('https://example.com/proc/').and_return(Proc.new { |params, headers,
 # You can also use Puffing Billy to intercept requests and responses. Just pass
 # a Proc and use the pass_request method. You can manipulate the request
 # (headers, URL, HTTP method, etc) and also the response from the upstream
-# server.
+# server. The scope of the delivered callable is the user scope where
+# it was defined.
 proxy.stub('http://example.com/').and_return(Proc.new { |*args|
-  response = pass_request(*args)
+  response = Billy.pass_request(*args)
   response[:headers]['Content-Type'] = 'text/plain'
   response[:body] = 'Hello World!'
   response[:code] = 200

data/lib/billy.rb

@@ -28,4 +28,18 @@ module Billy
   def self.certificate_authority
     @certificate_authority ||= Billy::Authority.new
   end
+
+  # This global shortcut can be used inside of request stubs. You can modify
+  # the request beforehand and/or modify the actual response which is passed
+  # back by this method. But you can also implement a custom proxy passing
+  # method if you like to. This is just a shortcut.
+  def self.pass_request(params, headers, body, url, method)
+      handler = proxy.request_handler.handlers[:proxy]
+      response = handler.handle_request(method, url, headers, body)
+      {
+        code: response[:status],
+        body: response[:content],
+        headers: response[:headers]
+      }
+  end
 end

data/lib/billy/proxy_request_stub.rb

@@ -21,7 +21,7 @@ module Billy
       push_request(method, url, params, headers, body)
 
       if @response.respond_to?(:call)
-        res = instance_exec(params, headers, body, url, method, &@response)
+        res = @response.call(params, headers, body, url, method)
       else
         res = @response
       end
@@ -71,16 +71,6 @@ module Billy
       end
     end
 
-    def pass_request(params, headers, body, url, method)
-      handler = Billy.proxy.request_handler.handlers[:proxy]
-      response = handler.handle_request(method, url, headers, body)
-      {
-        code: response[:status],
-        body: response[:content],
-        headers: response[:headers]
-      }
-    end
-
     private
 
     attr_writer :requests

data/lib/billy/version.rb

@@ -1,3 +1,3 @@
 module Billy
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/features/examples/tumblr_api_spec.rb

@@ -1,24 +1,6 @@
 require 'spec_helper'
 
-describe 'Tumblr API example', type: :feature, js: true do
-  before do
-    proxy.stub('http://blog.howmanyleft.co.uk/api/read/json').and_return(
-      jsonp: {
-        posts: [
-          {
-            'regular-title' => 'News Item 1',
-            'url-with-slug' => 'http://example.com/news/1',
-            'regular-body' => 'News item 1 content here'
-          },
-          {
-            'regular-title' => 'News Item 2',
-            'url-with-slug' => 'http://example.com/news/2',
-            'regular-body' => 'News item 2 content here'
-          }
-        ]
-      })
-  end
-
+RSpec.shared_examples 'tumblr/expectations' do
   it 'should show news stories' do
     visit '/tumblr_api.html'
     expect(page).to have_link('News Item 1', href: 'http://example.com/news/1')
@@ -27,3 +9,51 @@ describe 'Tumblr API example', type: :feature, js: true do
     expect(page).to have_content('News item 2 content here')
   end
 end
+
+describe 'Tumblr API example', type: :feature, js: true do
+  context 'without scope external references' do
+    before do
+      proxy.stub('http://blog.howmanyleft.co.uk/api/read/json').and_return(
+        jsonp: {
+          posts: [
+            {
+              'regular-title' => 'News Item 1',
+              'url-with-slug' => 'http://example.com/news/1',
+              'regular-body' => 'News item 1 content here'
+            },
+            {
+              'regular-title' => 'News Item 2',
+              'url-with-slug' => 'http://example.com/news/2',
+              'regular-body' => 'News item 2 content here'
+            }
+          ]
+        })
+    end
+
+    include_examples 'tumblr/expectations'
+  end
+
+  context 'with scope external references' do
+    let(:posts) do
+      [
+        {
+          'regular-title' => 'News Item 1',
+          'url-with-slug' => 'http://example.com/news/1',
+          'regular-body' => 'News item 1 content here'
+        },
+        {
+          'regular-title' => 'News Item 2',
+          'url-with-slug' => 'http://example.com/news/2',
+          'regular-body' => 'News item 2 content here'
+        }
+      ]
+    end
+
+    before do
+      proxy.stub('http://blog.howmanyleft.co.uk/api/read/json')
+           .and_return(proc { { jsonp: { posts: posts } } })
+    end
+
+    include_examples 'tumblr/expectations'
+  end
+end

data/spec/lib/billy/proxy_request_stub_spec.rb

@@ -157,9 +157,6 @@ describe Billy::ProxyRequestStub do
       expected_headers = { 'header1' => 'three', 'header2' => 'four' }
       expected_body = 'body text'
 
-      # Required due to the instance_exec implementation
-      subject.extend(RSpec::Matchers)
-
       subject.and_return(proc do |params, headers, body, url, method|
         expect(params).to eql expected_params
         expect(headers).to eql expected_headers
@@ -175,15 +172,12 @@ describe Billy::ProxyRequestStub do
       ]
     end
 
-    it 'should use a callable with pass_request' do
+    it 'should use a callable with Billy.pass_request' do
       # Add the missing em-synchrony call which is done by
       # ProxyConnection#handle_request instead.
       EM.synchrony do
-        # Required due to the instance_exec implementation
-        subject.extend(RSpec::Matchers)
-
         subject.and_return(proc do |*args|
-          response = pass_request(*args)
+          response = Billy.pass_request(*args)
           response[:body] = 'modified'
           response[:code] = 205
           response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Olly Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec