agile-proxy 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 806cb5ed2d0d286c13adb4d4ab3dc7bcad28917d
-  data.tar.gz: ab62ffd2e6b2b11908314548d0598599619cd998
+  metadata.gz: 7faec1aa540783f6fe42b674e1aeea119a470b15
+  data.tar.gz: 1b01c98d23e6c95eb894601b4b05c3420a4219df
 SHA512:
-  metadata.gz: 99266a1f6aab8c91a2fa1ae70bc7a357a3feb5193ef955da264e953827103a5c39f5b21929a54ff52dc5fd1ce8b80738bf6bdbb20899197bf56d2f9090d855fc
-  data.tar.gz: a778c6e2c5b72bf83c714a5a951aad3d0d34a6f104f0b9e3f90fb78fbe9b34769356d15f4d1e9f5af46be7f4c0aa8d9cae123241c22002530cd9f7d2af194656
+  metadata.gz: 43f930138c348608ef2972536c2192c08716b4603a2bb9234108926da5d2d8e532a9618082a7a54b7f1212e5711d35eb79e0fcd455a31aa33dac3895ced35789
+  data.tar.gz: bfbdf55b64323489c085822e565f1a32f2f3447684142f36c9bf48de9e2a7a9ffc7379bf7b400450e5dafbfe4ce1b799225c4c0bb4754d92950ee3ceb56a574e

data/README.md

@@ -121,4 +121,5 @@ v0.1.15 - 0.1.17 - No functionality change, these were just to try and please tr
 v0.1.18 - Fixed issue with integration test which was showing up now that travis is working again
 v0.1.19 - Recordings now record the request spec id.
             Recordings can now be accessed via /request_specs/:request_spec_id/recordings to provide recordings specific to the request spec
+v0.1.20 - An individual request spec can now be set to 'record_requests' rather than requiring the whole application to be in record mode which slows down every request
 

data/db/migrations/20150221152500_add_record_requests_to_request_specs.rb

@@ -0,0 +1,7 @@
+class AddRecordRequestsToRequestSpecs < ActiveRecord::Migration
+  def change
+    change_table(:request_specs) do |t|
+      t.boolean :record_requests, default: false
+    end
+  end
+end

data/lib/agile_proxy/api/request_specs.rb

@@ -22,7 +22,7 @@ module AgileProxy
           @permitted_params ||= declared(
               params,
               { include_missing: false },
-              [:spec, :note, :response, :http_method, :url, :url_type, :conditions]
+              [:spec, :note, :response, :http_method, :url, :url_type, :conditions, :record_requests]
           )
         end
 

data/lib/agile_proxy/handlers/request_handler.rb

@@ -35,7 +35,8 @@ module AgileProxy
           "Connection to #{request.url}#{body} not stubbed and new http connections are disabled"
         ]
       end
-      if application.record_requests
+      request_spec = env['agile_proxy.request_spec']
+      if application.record_requests || (request_spec && request_spec.record_requests)
         application.recordings.create request_headers: request.headers,
                                       request_body: body,
                                       request_url: request.url,
@@ -43,7 +44,7 @@ module AgileProxy
                                       response_headers: rack_response[1],
                                       response_body: rack_response[2],
                                       response_status: rack_response[0],
-                                      request_spec_id: env['agile_proxy.request_spec_id']
+                                      request_spec_id: request_spec ? request_spec.id : nil
       end
       rack_response
     end

data/lib/agile_proxy/handlers/stub_handler.rb

@@ -62,7 +62,7 @@ module AgileProxy
         route_spec = {
           path => proc do |router_env|
             AgileProxy.log(:info, "agile-proxy: STUB #{method} for '#{request.url}'")
-            router_env['agile_proxy.request_spec_id'] = spec.id
+            router_env['agile_proxy.request_spec'] = spec
             spec.call(HashWithIndifferentAccess.new(router_env['action_dispatch.request.path_parameters'].merge(router_env['action_dispatch.request.query_parameters']).merge(router_env['action_dispatch.request.request_parameters'])), headers, body)
           end
         }

data/lib/agile_proxy/version.rb

@@ -2,5 +2,5 @@
 #
 # The Agile Proxy module is a common namespace for all classes / sub modules.
 module AgileProxy
-  VERSION = '0.1.19'
+  VERSION = '0.1.20'
 end

data/spec/integration/helpers/request_spec_helper.rb

@@ -57,6 +57,7 @@ module AgileProxy
             [@http_url, @https_url, @http_url_no_proxy, @https_url_no_proxy].each do |url|
               @stubs_with_recordings.push Spec.for url, 'index_old', create_request_spec(url: "#{url}/index.html", response: { content_type: 'text/html', content: '<html><body>This Is An Older Mock</body></html>' }) #This is intentional - the system should always use the latest
               @stubs_with_recordings.push Spec.for url, 'index', create_request_spec(url: "#{url}/index.html", response: { content_type: 'text/html', content: '<html><body>Mocked Content</body></html>' })
+              @stubs_with_recordings.push Spec.for url, 'index_recording', create_request_spec(url: "#{url}/indexRecording.html", response: { content_type: 'text/html', content: '<html><body>Mocked Content</body></html>' })
               @stubs_with_recordings.push Spec.for url, 'api_forums', create_request_spec(url: "#{url}/api/forums", response: { content_type: 'application/json', content: JSON.pretty_generate(forums: [], total: 0) })
               @stubs_with_recordings.push Spec.for url, 'api_forums_post', create_request_spec(url: "#{url}/api/forums", http_method: 'POST', response: { content_type: 'application/json', content: '{"created": true}' })
               @stubs_with_recordings.push Spec.for url, 'api_forum_post', create_request_spec(url: "#{url}/api/forums/:forum_id/:post_id", response: { content_type: 'text/html', content: '<html><body><h1>Sorted By: {{sort}}</h1><h2>{{forum_id}}</h2><h3>{{post_id}}</h3></body></html>', is_template: true })

data/spec/integration/specs/lib/server_spec.rb

@@ -65,6 +65,14 @@ shared_examples_for 'a request stub' do |options = {}|
     expect(http.get('/index.html').status).to eql 200
   end
 
+  #TODO When time allows, work out how to easily test this as the stubs are not recorded for anything but recorded tests
+  #the lookup table would need to contain all stubs and we would need a way of indexing them to allow the test to find
+  # the correct one.
+  xit 'Should record a stub if specified in the stub irrespective of whether app is recording or not' do
+    expect(http.get('/indexRecording.html').status).to eql 200
+    expect(recordings_for('index_recording')).to include(recordings_matcher_for('index_recording', '/indexRecording.html'))
+  end
+
   it 'Should stub a different get request with json response' do
     resp = http.get('/api/forums')
     expect(ActiveSupport::JSON.decode(resp.body).symbolize_keys).to eql forums: [], total: 0

data/spec/unit/agile_proxy/api/request_specs_spec.rb

@@ -119,7 +119,7 @@ describe AgileProxy::Api::RequestSpecs, api_test: true do
   end
   describe 'POST /users/1/applications/1/request_specs' do
     let(:request_spec_instance) { request_spec_assoc_class.new }
-    let(:persisted_attributes) { { user_id: 1, application_id: 1, url: 'http://www.test.com', http_method: 'GET' } }
+    let(:persisted_attributes) { { user_id: 1, application_id: 1, url: 'http://www.test.com', http_method: 'GET', record_requests: true } }
     before :each do
       expect(request_spec_instance).to receive(:as_json).with(default_json_spec).and_return(persisted_attributes)
       expect(current_user).to receive(:id).and_return(1)

data/spec/unit/agile_proxy/handlers/request_handler_spec.rb

@@ -8,12 +8,13 @@ describe AgileProxy::RequestHandler do
   end
 
   context 'with stubbed handlers' do
-    let(:env) { to_rack_env(url: 'http://dummy.host.com/index.html').merge('agile_proxy.request_spec_id' => 8) }
+    let(:env) { to_rack_env(url: 'http://dummy.host.com/index.html').merge('agile_proxy.request_spec' => mock_request_spec) }
     let(:stub_handler) { Class.new }
     let(:proxy_handler) { Class.new }
     let(:application_class) { Class.new }
     let(:recordings_class) { Class.new }
     let(:application) { double('Application', record_requests: false, recordings: recordings_class) }
+    let(:mock_request_spec) {double('RequestSpec', id: 8, record_requests: false)}
 
     before do
       stub_const 'AgileProxy::StubHandler', stub_handler
@@ -41,13 +42,20 @@ describe AgileProxy::RequestHandler do
         expect(subject.call(env)).to eql [200, {}, 'Some data']
       end
 
-      it 'Calls application.recordings.create with a reference to the stub if record_requests is true' do
+      it 'Calls application.recordings.create with a reference to the stub if record_requests is true on the application' do
         allow(application).to receive(:record_requests).and_return true
         expect(application.recordings).to receive(:create).with(a_hash_including request_spec_id: 8)
         expect_any_instance_of(stub_handler).to receive(:call).with(env).and_return [200, {}, 'Some data']
         expect_any_instance_of(proxy_handler).to_not receive(:call)
         expect(subject.call(env)).to eql [200, {}, 'Some data']
       end
+      it 'Calls application.recordings.create with a reference to the stub if record_requests is true on the request spec' do
+        allow(mock_request_spec).to receive(:record_requests).and_return true
+        expect(application.recordings).to receive(:create).with(a_hash_including request_spec_id: 8)
+        expect_any_instance_of(stub_handler).to receive(:call).with(env).and_return [200, {}, 'Some data']
+        expect_any_instance_of(proxy_handler).to_not receive(:call)
+        expect(subject.call(env)).to eql [200, {}, 'Some data']
+      end
 
     end
 

data/spec/unit/agile_proxy/handlers/stub_handler_spec.rb

@@ -48,7 +48,6 @@ describe AgileProxy::StubHandler do
         request.body.rewind
         expect(stub).to receive(:call).with({ some: 'param' }, { 'Accept-Encoding' => 'gzip', 'Cache-Control' => 'no-cache' }, body).and_return([200, { 'Content-Type' => 'application/json' }, 'Some Content'])
         expect(handler.call(request.env)).to eql([200, { 'Content-Type' => 'application/json' }, 'Some Content'])
-        expect(request.env).to include('agile_proxy.request_spec_id' => stub.id)
 
       end
       it 'should store the id of the request spec in the rack environment when call is called' do
@@ -58,6 +57,7 @@ describe AgileProxy::StubHandler do
         request.body.rewind
         expect(stub).to receive(:call).with({ some: 'param' }, { 'Accept-Encoding' => 'gzip', 'Cache-Control' => 'no-cache' }, body).and_return([200, { 'Content-Type' => 'application/json' }, 'Some Content'])
         expect(handler.call(request.env)).to eql([200, { 'Content-Type' => 'application/json' }, 'Some Content'])
+        expect(request.env).to include('agile_proxy.request_spec' => stub)
 
       end
       describe 'Routing patterns' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agile-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -2301,6 +2301,7 @@ files:
 - db/migrations/20141106083100_add_username_and_password_to_applications.rb
 - db/migrations/20141119143800_add_record_to_applications.rb
 - db/migrations/20141119174300_create_recordings.rb
+- db/migrations/20150221152500_add_record_requests_to_request_specs.rb
 - db/schema.rb
 - db/seed.rb
 - examples/README.md