agile-proxy 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bbb90ecd388cd7e950d4a7fe7bf6b2c22a81218
-  data.tar.gz: 0d9631df2bce4c44899f1a87e1479eee8ccf5e4a
+  metadata.gz: a81e9033ebf71ca85c882e9c74c0903da777920f
+  data.tar.gz: ad910e5bd7f6aa8fbf198ce40f31103dcb48a7c6
 SHA512:
-  metadata.gz: 91e4deda16860bbe0efa661180a0c4dd0926a59b34ef30686fe91bd72f9b87d1fd9ee3d88f693b93651c8252fd713edfc2b01555f93e49bfac0ffc59b7c25128
-  data.tar.gz: 87955fdff1298490172056333ddc0dfe8a9f17f50dc77c9db3af60e160e7bae7420bc0d2dcba3226a1cc0d67799d978f1e6071a932b09bf86caa721f2a9ab7b8
+  metadata.gz: 901685ec32ead266c8cb50ebd46103e8fbf9e75ce3fb4dd53dd85d142a2d16533254e4ce7492fabffe7cfe3c8adba22cc159f3b86b70bcdca4dc44c85e2994b3
+  data.tar.gz: 972e90191e116c30c0d54c9293b49a548aa2701499ab080c2db9eab4533e801897724346b30a781e3dbddb878076f6ce0dce4a2f682b79b4482998718b025a6c

data/agile-proxy.gemspec

@@ -51,6 +51,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'flavour_saver', '~> 0.3', '>= 0.3.4'
   gem.add_runtime_dependency 'thor', '~> 0.19', '>= 0.19.1'
   gem.add_runtime_dependency 'goliath', '~> 1.0', '>= 1.0.4'
+  gem.add_runtime_dependency 'rack-cache', '~> 1.2', '>= 1.2'
   gem.add_runtime_dependency 'goliath-proxy', '~> 0.0', '>= 0.0.1'
 
 end

data/lib/agile_proxy/handlers/proxy_handler.rb

@@ -33,7 +33,7 @@ module AgileProxy
         req = req.send(method.downcase, build_request_options(request.headers, body))
 
         if req.error
-          return [500, {}, "Request to #{request.url} failed with error: #{req.error}"]
+          return [500, {}, ["Request to #{request.url} failed with error: #{req.error}"]]
         end
 
         if req.response
@@ -47,7 +47,7 @@ module AgileProxy
           return [response[:status], response[:headers], response[:content]]
         end
       end
-      [404, {}, 'Not proxied']
+      [404, {}, ['Not proxied']]
     end
 
     private
@@ -74,9 +74,10 @@ module AgileProxy
       response = {
         status: req.response_header.status,
         headers: req.response_header.raw,
-        content: req.response.force_encoding('BINARY') }
+        content: [req.response.force_encoding('BINARY')] }
       response[:headers].merge!('Connection' => 'close')
       response[:headers].delete('Transfer-Encoding')
+      response[:headers].merge!('Cache-Control' => 'max-age=3600')
       response
     end
 

data/lib/agile_proxy/handlers/request_handler.rb

@@ -2,6 +2,7 @@ require 'agile_proxy/model/application'
 require 'agile_proxy/model/recording'
 require 'rack'
 require 'forwardable'
+require 'agile_proxy/rack/get_only_cache'
 module AgileProxy
   #
   # =The Central Request Handler
@@ -53,9 +54,18 @@ module AgileProxy
     private
 
     def rack_app
-      @__app ||= Rack::Builder.new do
-        run Rack::Cascade.new([StubHandler.new, ProxyHandler.new])
+      stub_handler = stub_handler_app
+      proxy_handler = proxy_handler_app
+      @__app ||= ::Rack::Builder.new do
+        use Rack::GetOnlyCache
+        run ::Rack::Cascade.new([stub_handler, proxy_handler])
       end
     end
+    def stub_handler_app
+      @_stub_handler_app ||= StubHandler.new
+    end
+    def proxy_handler_app
+      @_proxy_handler_app ||= ProxyHandler.new
+    end
   end
 end

data/lib/agile_proxy/handlers/stub_handler.rb

@@ -97,10 +97,10 @@ module AgileProxy
     def rack_app
       route_set = @route_set
       text_handler = plain_text_handler
-      Rack::Builder.new do
+      ::Rack::Builder.new do
         use ActionDispatch::ParamsParser, Mime::TEXT => text_handler
         use MergePostAndGetParams
-        use Rack::ContentLength
+        use ::Rack::ContentLength
         run route_set
       end
     end

data/lib/agile_proxy/model/request_spec.rb

@@ -42,7 +42,7 @@ module AgileProxy
     # @param body [String] The request body
     # @return [Array] The rack response
     def call(params, headers, body)
-      response.nil? ? [204, { 'Content-Type' => 'text/plain' }, ''] : response.to_rack(params, headers, body)
+      response.nil? ? [204, { 'Content-Type' => 'text/plain'}, ''] : response.to_rack(params, headers, body)
     end
   end
 end

data/lib/agile_proxy/model/response.rb

@@ -36,6 +36,7 @@ module AgileProxy
     # @return [Array] A 'rack' response array (status, headers, body)
     def to_rack(input_params, _input_headers, _input_body)
       output_headers = headers.clone
+      output_headers.merge! 'Cache-Control' => 'no-store'
       output_content = content
       output_status_code = status_code
       if is_template

data/lib/agile_proxy/rack/get_only_cache.rb

@@ -0,0 +1,30 @@
+require 'rack-cache'
+require 'action_dispatch/http/request'
+module AgileProxy
+  module Rack
+    class GetOnlyCache
+      def initialize(app)
+        @app = app
+      end
+      def call(env)
+        force_caching(env)
+        request = ::ActionDispatch::Request.new(env)
+        if request.request_method_symbol == :get
+          cache_app.call(env)
+        else
+          @app.call(env)
+        end
+      end
+
+      private
+      def force_caching(env)
+        env.delete 'HTTP_PRAGMA' if env['HTTP_PRAGMA'] == 'no-cache'
+        env.delete 'HTTP_CACHE_CONTROL' if env['HTTP_CACHE_CONTROL'] == 'no-cache'
+      end
+      def cache_app
+        @cache_app ||= ::Rack::Cache.new(@app)
+      end
+
+    end
+  end
+end

data/lib/agile_proxy/servers/api.rb

@@ -26,7 +26,7 @@ module AgileProxy
           runner.address = webserver_host
           runner.port = webserver_port
           runner.app = ::Goliath::Rack::Builder.app do
-            use Rack::Static, root: File.join(ROOT, 'assets'), urls: ['/ui'], index: 'index.html'
+            use ::Rack::Static, root: File.join(ROOT, 'assets'), urls: ['/ui'], index: 'index.html'
             map '/api' do
               run ::AgileProxy::Api::Root.new
             end

data/lib/agile_proxy/servers/request_spec_direct.rb

@@ -22,7 +22,7 @@ module AgileProxy
           runner.address = server_host
           runner.port = server_port
           runner.app = ::Goliath::Rack::Builder.app do
-            use Rack::Static, root: File.join(ROOT, 'assets'), urls: static_dirs, index: 'index.html' unless static_dirs.empty?
+            use ::Rack::Static, root: File.join(ROOT, 'assets'), urls: static_dirs, index: 'index.html' unless static_dirs.empty?
             map '/' do
               run ::AgileProxy::StubHandler.new
             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.23'
+  VERSION = '0.1.24'
 end

data/spec/common_helper.rb

@@ -7,8 +7,8 @@ module AgileProxy
         fake_error_buffer = StringIO.new
         url_parsed = URI.parse(opts[:url])
         env = {
-          'rack.input' => Rack::Lint::InputWrapper.new(fake_input_buffer),
-          'rack.errors' => Rack::Lint::ErrorWrapper.new(fake_error_buffer),
+          'rack.input' => ::Rack::Lint::InputWrapper.new(fake_input_buffer),
+          'rack.errors' => ::Rack::Lint::ErrorWrapper.new(fake_error_buffer),
           'REQUEST_METHOD' => (opts[:method] || 'GET').upcase,
           'REQUEST_PATH' => url_parsed.path,
           'PATH_INFO' => url_parsed.path,

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

@@ -86,7 +86,7 @@ describe AgileProxy::ProxyHandler do
   describe '#call' do
     it 'returns nil if it does not handle the request' do
       expect(subject).to receive(:handles_request?).and_return(false)
-      expect(subject.call(request.env)).to eql [404, {}, 'Not proxied']
+      expect(subject.call(request.env)).to eql [404, {}, ['Not proxied']]
     end
 
     context 'with a handled request' do
@@ -111,20 +111,20 @@ describe AgileProxy::ProxyHandler do
 
       it 'Should pass through a not allowed response' do
         allow(response_header).to receive(:status).and_return(503)
-        expect(subject.call(request.env)).to eql [503, { 'Connection' => 'close' }, 'The response body']
+        expect(subject.call(request.env)).to eql [503, { 'Connection' => 'close', 'Cache-Control' => 'max-age=3600' }, ['The response body']]
       end
       it 'returns any error in the response' do
         allow(em_request).to receive(:error).and_return('ERROR!')
-        expect(subject.call(request.env)).to eql([500, {}, "Request to #{request.url} failed with error: ERROR!"])
+        expect(subject.call(request.env)).to eql([500, {}, ["Request to #{request.url} failed with error: ERROR!"]])
       end
 
       it 'returns a hashed response if the request succeeds' do
-        expect(subject.call(request.env)).to eql([200, { 'Connection' => 'close' }, 'The response body'])
+        expect(subject.call(request.env)).to eql([200, { 'Connection' => 'close', 'Cache-Control' => 'max-age=3600' }, ['The response body']])
       end
 
       it 'returns nil if both the error and response are for some reason nil' do
         allow(em_request).to receive(:response).and_return(nil)
-        expect(subject.call(request.env)).to eql [404, {}, 'Not proxied']
+        expect(subject.call(request.env)).to eql [404, {}, ['Not proxied']]
       end
 
       it 'uses the timeouts defined in configuration' do

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

@@ -13,6 +13,8 @@ describe AgileProxy::RequestHandler do
     let(:proxy_handler) { Class.new }
     let(:application_class) { Class.new }
     let(:recordings_class) { Class.new }
+    let(:rack_builder_class) {Class.new}
+    let(:get_only_cache_class) {Class.new}
     let(:application) { double('Application', record_requests: false, recordings: recordings_class) }
     let(:mock_request_spec) {double('RequestSpec', id: 8, record_requests: false)}
 
@@ -20,7 +22,18 @@ describe AgileProxy::RequestHandler do
       stub_const 'AgileProxy::StubHandler', stub_handler
       stub_const 'AgileProxy::ProxyHandler', proxy_handler
       stub_const 'AgileProxy::Application', application_class
+      stub_const '::Rack::Builder', rack_builder_class
+      stub_const 'AgileProxy::Rack::GetOnlyCache', get_only_cache_class
       allow(application_class).to receive(:where).and_return [application]
+      #Make the rack builder just pass through whatever is passed to 'run' - to avoid the caching middleware etc..
+      rack_builder_instance = rack_builder_class.new
+      allow(rack_builder_class).to receive(:new) do |&blk|
+        rack_builder_instance.instance_eval(&blk)
+      end
+      allow(rack_builder_instance).to receive(:use).with(get_only_cache_class)
+      allow(rack_builder_instance).to receive(:run) do |app|
+        app
+      end
     end
 
     describe '#call' do

data/spec/unit/agile_proxy/model/response_spec.rb

@@ -15,7 +15,7 @@ describe AgileProxy::Response do
     end
     it 'Should respond with a delay using the Em::Synchrony.sleep method' do
       expect(EventMachine::Synchrony).to receive(:sleep).with(0.5)
-      expect(subject.to_rack({}, {}, '')).to eql([200, { 'Content-Type' => 'text/plain' }, ['Test']])
+      expect(subject.to_rack({}, {}, '')).to eql([200, { 'Content-Type' => 'text/plain', 'Cache-Control' => 'no-store' }, ['Test']])
     end
 
   end
@@ -27,10 +27,10 @@ describe AgileProxy::Response do
         subject.content_type = 'text/plain'
       end
       it 'Should pass the params to the template and the output should be correct' do
-        expect(subject.to_rack({ name: 'World' }, {}, '')).to eql([200, { 'Content-Type' => 'text/plain' }, ['Hello World']])
+        expect(subject.to_rack({ name: 'World' }, {}, '')).to eql([200, { 'Content-Type' => 'text/plain', 'Cache-Control' => 'no-store' }, ['Hello World']])
       end
       it 'Should deal with if a parameter is missing' do
-        expect(subject.to_rack({}, {}, '')).to eql([200, { 'Content-Type' => 'text/plain' }, ["Hello "]])
+        expect(subject.to_rack({}, {}, '')).to eql([200, { 'Content-Type' => 'text/plain', 'Cache-Control' => 'no-store' }, ["Hello "]])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agile-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -518,6 +518,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: goliath-proxy
   requirement: !ruby/object:Gem::Requirement
@@ -2228,6 +2248,7 @@ files:
 - lib/agile_proxy/model/response.rb
 - lib/agile_proxy/model/user.rb
 - lib/agile_proxy/proxy_connection.rb
+- lib/agile_proxy/rack/get_only_cache.rb
 - lib/agile_proxy/route.rb
 - lib/agile_proxy/router.rb
 - lib/agile_proxy/server.rb
@@ -2280,7 +2301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An agile, programmable, controllable flexible proxy server for development