agile-proxy 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0ac0c54c3b6fbb655ba9996eeb3a2d994be8e1
-  data.tar.gz: 029090ba04333c73aabec281024e6a172e53d54f
+  metadata.gz: 74ae4ece459f7aec91a77ac5daefe1b1978de480
+  data.tar.gz: 1b1e68ecff0556340c41281a1f24faa3a6b75202
 SHA512:
-  metadata.gz: 6393cc970654e874f2756aeca50474a8ad1e1b5118c0fa07d6520629c0610addddc87d2cbc3225c798008a9d7c8065f358a2abf96ba166c1e980597ede380f65
-  data.tar.gz: d8b6e4455fca2fb1983a27c6864e97629819cbb07ba260df1465443429e5401fae127e6e360c9a6b67424e5ac61a09a9e9049799ec37cdfdc632a74ef8cec795
+  metadata.gz: e604574ae397091d8909ad20981f4d4a03dac2fbc28c7885fb588a071234f6b6ab5be27aef4750158f0857d522742cac69add078f09dc4c783b7e647460152bc
+  data.tar.gz: af0e99b04466f2c5120f552f8fa78e4753eae7273552fc4ca2d0a41cd8e5fd49e6c1f1686db4370c4b9989acb974d20d052228eeda12177c2089883292cab911

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    agile-proxy (0.1.10)
+    agile-proxy (0.1.11)
       activerecord (~> 4.1.6)
       em-http-request (~> 1.1.2)
       em-synchrony (~> 1.0.3)

data/bin/agile_proxy

@@ -31,7 +31,7 @@ module AgileProxy
       end
 
       def environment
-        ENV['AGILE_PROXY_ENV'] || Dir.pwd == File.expand_path('..', File.dirname(__FILE__)) ? 'development' : 'production'
+        ENV['AGILE_PROXY_ENV'] || (Dir.pwd == File.expand_path('..', File.dirname(__FILE__)) ? 'development' : 'production')
       end
     end
     package_name 'Http Flexible Proxy'

data/config.yml

@@ -1,6 +1,6 @@
 development:
     adapter: sqlite3
-    database: 'db/development.db'
+    database: ':memory:'
 test:
     adapter: sqlite3
     database: 'db/test.db'

data/lib/agile_proxy/api/request_specs.rb

@@ -58,7 +58,7 @@ module AgileProxy
         delete do
           authenticate!
           scope = current_application.request_specs
-          scope.delete_all
+          scope.destroy_all
           { request_specs: [], total: 0 }
         end
         desc 'Create a new request specification'

data/lib/agile_proxy/handlers/stub_handler.rb

@@ -47,6 +47,13 @@ module AgileProxy
     end
 
     def add_to_router(request, headers, body, route_set)
+      # This needs a bit of explaining as the router did not quite behave as expected.
+      # This proc calls route definition methods such as get, post etc.. with the path and handler
+      # the handler being an inline proc.
+      # But, we also pass a constraints handler
+      # After constraints are handled though, the 'action_dispatch.request.parameters' are deleted
+      # from the env, so our handler preserves them in agile_proxy.parameters.
+      # A bit weird, but it works reliably.
       proc do |spec|
         path = URI.parse(spec.url).path
         path = '/' if path == ''
@@ -55,10 +62,16 @@ module AgileProxy
         route_spec = {
           path => proc do |router_env|
             AgileProxy.log(:info, "agile-proxy: STUB #{method} for '#{request.url}'")
-            spec.call(router_env['action_dispatch.request.parameters'], headers, body)
+            spec.call(router_env['agile_proxy.parameters'], headers, body)
           end
         }
-        route_spec[:constraints] = ActiveSupport::JSON.decode(spec.conditions).symbolize_keys unless spec.conditions.empty?
+        route_spec[:constraints] = ->(request) {
+          ret_value = spec.conditions_json.all? do |k, v|
+            request.params.key?(k) && request.params[k] == v
+          end
+          request.env['agile_proxy.parameters'] = request.env['action_dispatch.request.parameters']
+          ret_value
+        }
         route_set.send method, route_spec
       end
     end

data/lib/agile_proxy/model/request_spec.rb

@@ -29,7 +29,7 @@ module AgileProxy
     # This method returns a JSON decoded version of this as a HASH
     # @return [Hash] decoded conditions
     def conditions_json
-      ActiveSupport::JSON.decode(conditions)
+      ActiveSupport::JSON.decode(conditions).with_indifferent_access
     end
     # This method's output is a 'rack' response, but its input is not.
     # When the router has determined that this request spec is the one that is going to be sent to the client,

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.10'
+  VERSION = '0.1.11'
 end

data/spec/integration/helpers/request_spec_helper.rb

@@ -43,6 +43,7 @@ module AgileProxy
               create_request_spec url: "#{url}/api/forums/:forum_id/:post_id", http_method: 'DELETE', response: { content_type: 'application/json', content: '{"deleted": true}' }
               create_request_spec url: "#{url}/api/forums/:forum_id/:post_id", conditions: '{"post_id": "special"}', response: { content_type: 'text/html', content: '<html><body><h1>Sorted By: {{sort}}</h1><h2>{{forum_id}}</h2><h3>{{post_id}}</h3><p>This is a special response</p></body></html>', is_template: true }
               create_request_spec url: "#{url}/api/forums/:forum_id/:post_id", conditions: '{"post_id": "special", "sort": "eversospecial"}', response: { content_type: 'text/html', content: '<html><body><h1>Sorted By: {{sort}}</h1><h2>{{forum_id}}</h2><h3>{{post_id}}</h3><p>This is an ever so special response</p></body></html>', is_template: true }
+              create_request_spec url: "#{url}/api/forums/:forum_id", http_method: 'POST',response: { content_type: 'text/html', content: '<html><body><h1></h1><h2>WRONG RESULT</h2><h3>{{forum_id}}</h3><p>This is an incorrect result probably because the conditions are being ignored ?</p></body></html>'}
               create_request_spec url: "#{url}/api/forums/:forum_id", http_method: 'POST', conditions: '{"posted_var":"special_value"}', response: { content_type: 'text/html', content: '<html><body><h1></h1><h2>{{posted_var}}</h2><h3>{{forum_id}}</h3><p>This should get data from the POSTed data</p></body></html>', is_template: true }
               create_request_spec url: "#{url}/api/forums/:forum_id/posts", response: { content_type: 'application/json', content: JSON.pretty_generate(posts: [
                    { forum_id: '{{forum_id}}', subject: 'My first post' },

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

@@ -144,7 +144,7 @@ describe AgileProxy::Api::RequestSpecs, api_test: true do
   end
   describe 'DELETE /users/1/applications/1/request_specs' do
     before :each do
-      expect(request_spec_assoc_class).to receive(:delete_all)
+      expect(request_spec_assoc_class).to receive(:destroy_all)
     end
     it 'Should delete all request specs for the users application' do
       delete '/v1/users/1/applications/1/request_specs'

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

@@ -31,18 +31,18 @@ describe AgileProxy::StubHandler do
 
     describe '#handle_request' do
       it 'returns 404 if the request is not stubbed' do
-        stub = double('stub', http_method: 'GET', url: 'http://example.test:8080/index', conditions: {}, call: [404, {}, 'Not found'])
+        stub = double('stub', http_method: 'GET', url: 'http://example.test:8080/index', conditions_json: {}, call: [404, {}, 'Not found'])
         expect(request_spec_class).to receive(:where).and_return double('association', all: [stub])
         expect(handler.call(to_rack_env(url: 'http://example.test:8080/index'))).to eql [404, {}, 'Not found']
       end
 
       it 'returns a response hash if the request is stubbed' do
-        stub = double('stub', http_method: 'GET', url: 'http://example.test:8080/index', conditions: {}, call: [200, { 'Content-Type' => 'application/json' }, 'Some content'])
+        stub = double('stub', http_method: 'GET', url: 'http://example.test:8080/index', conditions_json: {}, call: [200, { 'Content-Type' => 'application/json' }, 'Some content'])
         expect(request_spec_class).to receive(:where).and_return double('association', all: [stub])
         expect(handler.call(request.env)).to eql([200, { 'Content-Type' => 'application/json' }, 'Some content'])
       end
       it 'Passes on the correct parameters to the stub call method' do
-        stub = double('stub', http_method: 'GET', url: 'http://example.test:8080/index', conditions: {})
+        stub = double('stub', http_method: 'GET', url: 'http://example.test:8080/index', conditions_json: {})
         expect(request_spec_class).to receive(:where).and_return double('association', all: [stub])
         body = request.body.read
         request.body.rewind
@@ -52,7 +52,7 @@ describe AgileProxy::StubHandler do
       end
       describe 'Routing patterns' do
         describe 'With a simple GET match on the root of a domain' do
-          let(:request_stub) { double 'stub', url: 'http://example.com', http_method: 'GET', conditions: {} }
+          let(:request_stub) { double 'stub', url: 'http://example.com', http_method: 'GET', conditions_json: {} }
           before :each do
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://example.com%').and_return double('association', all: [request_stub])
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://subdomain.example.com%').and_return double('association', all: [])
@@ -67,7 +67,7 @@ describe AgileProxy::StubHandler do
 
         end
         describe 'With a simple GET match inside a domain' do
-          let(:request_stub) { double 'stub for simple get inside a domain', url: 'http://example.com/index', http_method: 'GET', conditions: {} }
+          let(:request_stub) { double 'stub for simple get inside a domain', url: 'http://example.com/index', http_method: 'GET', conditions_json: {} }
           before :each do
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://example.com%').and_return double('association', all: [request_stub])
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://subdomain.example.com%').and_return double('association', all: [])
@@ -83,7 +83,7 @@ describe AgileProxy::StubHandler do
 
         end
         describe 'With a simple POST match on the root of a domain' do
-          let(:request_stub) { double 'stub', url: 'http://example.com', http_method: 'POST', conditions: {} }
+          let(:request_stub) { double 'stub', url: 'http://example.com', http_method: 'POST', conditions_json: {} }
           before :each do
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://example.com%').and_return double('association', all: [request_stub])
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://subdomain.example.com%').and_return double('association', all: [])
@@ -98,7 +98,7 @@ describe AgileProxy::StubHandler do
 
         end
         describe 'With a more complex route with conditions inside a domain' do
-          let(:request_stub) { double 'stub for complex route inside a domain', url: 'http://example.com/users/:user_id/index', http_method: 'GET', conditions: { user_id: '1' }.to_json }
+          let(:request_stub) { double 'stub for complex route inside a domain', url: 'http://example.com/users/:user_id/index', http_method: 'GET', conditions_json: { user_id: '1' } }
           before :each do
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://example.com%').and_return double('association', all: [request_stub])
             expect(request_stub).to receive(:call).and_return([200, {}, ''])
@@ -112,7 +112,7 @@ describe AgileProxy::StubHandler do
           end
         end
         describe 'With a more complex route with conditions including query params inside a domain' do
-          let(:request_stub) { double 'stub for complex route inside a domain', url: 'http://example.com/users/:user_id/index', http_method: 'GET', conditions: { user_id: '1', extra_1: 'extra_1', extra_2: 'extra_2' }.to_json }
+          let(:request_stub) { double 'stub for complex route inside a domain', url: 'http://example.com/users/:user_id/index', http_method: 'GET', conditions_json: { user_id: '1', extra_1: 'extra_1', extra_2: 'extra_2' } }
           before :each do
             allow(request_spec_class).to receive(:where).with('url LIKE ?', 'http://example.com%').and_return double('association', all: [request_stub])
             allow(request_stub).to receive(:call).and_return([200, {}, ''])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agile-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake