agile-proxy 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc83345bdd428e0b53171381e809cd739281a32
-  data.tar.gz: 52dc13eeb368e9d19cb2f3cc1f2248d6320a573c
+  metadata.gz: 3bbb90ecd388cd7e950d4a7fe7bf6b2c22a81218
+  data.tar.gz: 0d9631df2bce4c44899f1a87e1479eee8ccf5e4a
 SHA512:
-  metadata.gz: e10828a0c1eaf12ee379f4b4de473c5a64afd514722897561b21e2a4327a27f7d93836043ee26103eb282840bd9c1a92ff1a0532566c5c9423abe9956f4f29ca
-  data.tar.gz: f287eb594c2ba7d69e3b19d640bbde4a1beec400cecb40d5c4ee17b5d12532019e7cf32ba767cba245338aa5c41a1d9ad5bd10ec3ca3a2d8734fa07000e74eaa
+  metadata.gz: 91e4deda16860bbe0efa661180a0c4dd0926a59b34ef30686fe91bd72f9b87d1fd9ee3d88f693b93651c8252fd713edfc2b01555f93e49bfac0ffc59b7c25128
+  data.tar.gz: 87955fdff1298490172056333ddc0dfe8a9f17f50dc77c9db3af60e160e7bae7420bc0d2dcba3226a1cc0d67799d978f1e6071a932b09bf86caa721f2a9ab7b8

data/.gitignore

@@ -6,4 +6,5 @@ assets/ui/bower_components
 .yardoc
 db/*.db
 coverage/
-Gemfile.lock
+Gemfile.lock
+vendor/gems

data/README.md

@@ -124,4 +124,5 @@ v0.1.19 - Recordings now record the request spec id.
 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
 v0.1.21 - Switched to goliath instead of thin.  The gem now installs under jruby as well as other platforms.
 v0.1.22 - Reverted 0.1.21 - Integration tests worked fine, but failed in real world scenario - never ending responses from stubs
+v0.1.23 - Switched to goliath instead of thin.  The gem now installs under jruby as well as other platforms.
 

data/agile-proxy.gemspec

@@ -21,11 +21,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'faraday', '~> 0.9', '>= 0.9.0'
   gem.add_development_dependency 'poltergeist', '~> 1.5', '>= 1.5.1'
   gem.add_development_dependency 'selenium-webdriver', '~> 2.43', '>= 2.43.0'
-  gem.add_development_dependency 'rack', '~> 1.6', '>= 1.6.0'
   gem.add_development_dependency 'guard', '~> 2.6', '>= 2.6.1'
   gem.add_development_dependency 'rb-inotify', '~> 0.9', '>= 0.9.5'
   gem.add_development_dependency 'cucumber', '~> 1.3', '>= 1.3.17'
-  gem.add_development_dependency 'airborne', '~> 0.1', '>= 0.1.10'
   gem.add_development_dependency 'rest-client', '~> 1.7', '>= 1.7.2'
   gem.add_development_dependency 'require_all', '~> 1.3', '>= 1.3.2'
   gem.add_development_dependency 'faker', '~> 1.2', '>= 1.2.0'
@@ -35,16 +33,24 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'eventmachine', '~> 1.0', '>= 1.0.3'
   gem.add_runtime_dependency 'em-synchrony', '~> 1.0', '>= 1.0.3'
   gem.add_runtime_dependency 'em-http-request', '~> 1.1', '>= 1.1.2'
-  gem.add_runtime_dependency 'eventmachine_httpserver', '~> 0.2', '>= 0.2.1'
-  gem.add_runtime_dependency 'http_parser.rb', '~> 0.6', '>= 0.6.0'
-  gem.add_runtime_dependency 'multi_json', '~> 1.10', '>= 1.10.1'
-  gem.add_runtime_dependency 'thin', '~> 1.6', '>= 1.6.2'
   gem.add_runtime_dependency 'grape', '~> 0.10', '>= 0.10.1'
   gem.add_runtime_dependency 'activerecord', '~> 4.2', '>= 4.2.0'
-  gem.add_runtime_dependency 'sqlite3', '~> 1.3', '>= 1.3.10'
+  if RUBY_PLATFORM =~ /java/
+    #JVM Only
+    gem.add_runtime_dependency 'activerecord-jdbc-adapter'
+    gem.add_runtime_dependency 'activerecord-jdbcsqlite3-adapter'
+  else
+    #Non JVM
+    gem.add_runtime_dependency 'sqlite3', '~> 1.3', '>= 1.3.10'
+  end
+
+
+
   gem.add_runtime_dependency 'grape-kaminari', '~> 0.1', '>= 0.1.7'
   gem.add_runtime_dependency 'shoulda-matchers', '2.8.0.rc2'
   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 'rack-parser', '~> 0.6', '>= 0.6.1'
+  gem.add_runtime_dependency 'goliath', '~> 1.0', '>= 1.0.4'
+  gem.add_runtime_dependency 'goliath-proxy', '~> 0.0', '>= 0.0.1'
+
 end

data/echo_server.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require 'goliath'
+require 'active_support/core_ext/class/attribute_accessors'
+class Echo < Goliath::API
+  cattr_accessor :counter
+  def response_code
+    ENV['STATUS_CODE'] || 200
+  end
+  def response(env)
+    self.counter = counter || 0
+    req_body = env['rack.input'].read
+    request_info = "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}"
+    res_body = request_info
+    res_body += "\n#{req_body}" unless req_body.empty?
+    self.counter += 1
+    [response_code, { 'HTTP-X-EchoServer' => request_info, 'HTTP-X-EchoCount' => "#{counter}" }, res_body]
+  end
+end

data/lib/agile_proxy/handlers/request_handler.rb

@@ -36,8 +36,9 @@ module AgileProxy
         ]
       end
       request_spec = env['agile_proxy.request_spec']
+      exclude_headers = ['@env', 'rack.errors', 'rack.logger']
       if application.record_requests || (request_spec && request_spec.record_requests)
-        application.recordings.create request_headers: request.headers,
+        application.recordings.create request_headers: request.headers.reject {|key, value| exclude_headers.include?(key)},
                                       request_body: body,
                                       request_url: request.url,
                                       request_method: request.request_method,

data/lib/agile_proxy/handlers/stub_handler.rb

@@ -2,7 +2,6 @@ require 'agile_proxy/handlers/handler'
 require 'agile_proxy/model/request_spec'
 require 'agile_proxy/router'
 require 'agile_proxy/model/application'
-require 'rack/parser'
 require 'action_dispatch'
 require 'base64'
 module AgileProxy
@@ -101,6 +100,7 @@ module AgileProxy
       Rack::Builder.new do
         use ActionDispatch::ParamsParser, Mime::TEXT => text_handler
         use MergePostAndGetParams
+        use Rack::ContentLength
         run route_set
       end
     end

data/lib/agile_proxy/model/recording.rb

@@ -1,4 +1,5 @@
 require_relative 'application'
+require 'active_record'
 module AgileProxy
   #
   # = The recording model

data/lib/agile_proxy/model/response.rb

@@ -44,7 +44,7 @@ module AgileProxy
         output_content = template.render data
       end
       EventMachine::Synchrony.sleep(delay) if delay > 0
-      [output_status_code, output_headers, output_content]
+      [output_status_code, output_headers, [output_content]]
     end
   end
 end

data/lib/agile_proxy/proxy_connection.rb

@@ -1,24 +1,27 @@
 require 'uri'
 require 'eventmachine'
-require 'http/parser'
-require 'em-http'
-require 'evma_httpserver'
-require 'em-synchrony'
 require 'stringio'
 require 'rack'
+require 'goliath/request'
+require 'goliath/env'
 
 module AgileProxy
   #
   # = The Proxy Connection
   #
   # This class is the event machine connection used by the proxy.  Every request creates a new instance of this
-  class ProxyConnection < EventMachine::Connection
-    attr_accessor :handler
+  class ProxyConnection < Goliath::Connection
+    def logger
+      ::AgileProxy.config.logger
+    end
     def post_init
-      @parser = Http::Parser.new(self)
+      super
+      #@proxy_parser = Http::Parser.new(self)
+      @proxy_parser = Http::Parser.new
     end
 
     def receive_data(data)
+      #@proxy_parser << data
       @parser << data
     end
 
@@ -36,24 +39,25 @@ module AgileProxy
     end
 
     def on_message_complete
-      if @parser.http_method == 'CONNECT'
-        restart_with_ssl(@parser.request_url)
+      if @proxy_parser.http_method == 'CONNECT'
+        restart_with_ssl(@proxy_parser.request_url)
       else
         if @ssl
-          uri = URI.parse(@parser.request_url)
+          uri = URI.parse(@proxy_parser.request_url)
           @url = "https://#{@ssl}#{[uri.path, uri.query].compact.join('?')}"
         else
-          @url = @parser.request_url
+          @url = @proxy_parser.request_url
         end
         handle_request
       end
     end
 
+
     protected
 
     def restart_with_ssl(url)
       @ssl = url
-      @parser = Http::Parser.new(self)
+      @proxy_parser = Http::Parser.new(self)
       @original_headers = @headers.clone
       send_data("HTTP/1.0 200 Connection established\r\nProxy-agent: Http-Flexible-Proxy/0.0.0\r\n\r\n")
       start_tls(
@@ -64,11 +68,9 @@ module AgileProxy
 
     def handle_request
       EM.synchrony do
-        request = ActionDispatch::Request.new(env)
-        request.params  # This will populate action_dispatch.request.parameters
-        handler.call(env).tap do |response|
-          send_response(response)
-        end
+        request = ::Goliath::Request.new(handler, self, env)
+        request.set_deferred_status :succeeded
+        request.process
       end
     end
 
@@ -79,10 +81,11 @@ module AgileProxy
       fake_input_buffer = StringIO.new(@body)
       fake_error_buffer = StringIO.new
       url_parsed = URI.parse(@url)
-      @__env = {
+      @__env = ::Goliath::Env.new
+      @__env.merge!({
         'rack.input' => Rack::Lint::InputWrapper.new(fake_input_buffer),
         'rack.errors' => Rack::Lint::ErrorWrapper.new(fake_error_buffer),
-        'REQUEST_METHOD' => @parser.http_method,
+        'REQUEST_METHOD' => @proxy_parser.http_method,
         'REQUEST_PATH' => url_parsed.path,
         'PATH_INFO' => url_parsed.path,
         'QUERY_STRING' => url_parsed.query || '',
@@ -90,9 +93,11 @@ module AgileProxy
         'rack.url_scheme' => url_parsed.scheme,
         'CONTENT_LENGTH' => @body.length,
         'SERVER_NAME' => url_parsed.host,
-        'SERVER_PORT' => url_parsed.port
+        'SERVER_PORT' => url_parsed.port,
+        'rack.logger' => logger
 
-      }
+
+                    })
       @headers.merge(@original_headers || {}).each do |name, value|
         converted_name = "HTTP_#{name.gsub(/-/, '_').upcase}"
         @__env[converted_name] = value
@@ -102,12 +107,6 @@ module AgileProxy
       @__env
     end
 
-    def send_response(response)
-      res = EM::DelegatedHttpResponse.new(self)
-      res.status = response[0]
-      res.headers = response[1]
-      res.content = response[2]
-      res.send_response
-    end
+
   end
 end

data/lib/agile_proxy/server.rb

@@ -3,13 +3,27 @@ require 'yaml'
 require 'cgi'
 require 'uri'
 require 'eventmachine'
-require 'thin'
 require 'grape'
 require 'agile_proxy/api/root'
 require 'agile_proxy/servers/api'
 require 'agile_proxy/servers/request_spec'
 require 'agile_proxy/servers/request_spec_direct'
 require 'forwardable'
+
+require 'goliath/api'
+require 'goliath/runner'
+
+# Example demonstrating how to use a custom Goliath runner
+#
+
+class Custom < Goliath::API
+  def response(env)
+    [200, {}, "hello!"]
+  end
+end
+
+
+
 module AgileProxy
   #
   # This class is responsible for controlling the underlying proxy and web servers

data/lib/agile_proxy/servers/api.rb

@@ -1,6 +1,7 @@
 require 'rack'
-require 'thin'
 require 'grape'
+require 'goliath/api'
+require 'goliath/runner'
 require 'agile_proxy/api/root'
 
 module AgileProxy
@@ -19,21 +20,19 @@ module AgileProxy
         # @param webserver_host [String] The host for the server to run on
         # @param webserver_port [Integer] The port for the server to run on
         def start(webserver_host, webserver_port)
-          # The sinatra web server
-          dispatch = Rack::Builder.app do
+          #
+          # The API runner
+          runner = ::Goliath::Runner.new([], nil)
+          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'
             map '/api' do
               run ::AgileProxy::Api::Root.new
             end
           end
-          # Start the web server.
-          ::Rack::Server.start(
-              app: dispatch,
-              server: 'thin',
-              Host: webserver_host,
-              Port: webserver_port,
-              signals: false
-          )
+          runner.run
+
         end
       end
     end

data/lib/agile_proxy/servers/request_spec.rb

@@ -1,4 +1,6 @@
 require 'eventmachine'
+require 'goliath/api'
+require 'goliath/proxy'
 module AgileProxy
   module Servers
     #
@@ -6,6 +8,7 @@ module AgileProxy
     # This server is responsible for handling or passing through a request, depending
     # on if it has a matching 'Request Specification'
     class RequestSpec
+
       # Starts the server
       def self.start
         new.start
@@ -15,16 +18,23 @@ module AgileProxy
       end
       # Starts the server
       def start
-        @signature = EM.start_server('127.0.0.1', AgileProxy.config.proxy_port, ProxyConnection) do |p|
-          p.handler = @request_handler
-        end
+        #
+        # The API runner
+        runner = ::Goliath::Proxy::Runner.new([], nil)
+        runner.address = '127.0.0.1'
+        runner.port = AgileProxy.config.proxy_port
+        app = @request_handler
+        runner.app = app
+        runner.run
         self
+
       end
       # The port the server is running on
       # @return [Integer] The port the server is running on
       def port
-        Socket.unpack_sockaddr_in(EM.get_sockname(@signature)).first
+        return AgileProxy.config.proxy_port
       end
+      private
     end
   end
 end

data/lib/agile_proxy/servers/request_spec_direct.rb

@@ -1,6 +1,6 @@
 require 'rack'
-require 'thin'
-
+require 'goliath/api'
+require 'goliath/runner'
 module AgileProxy
   module Servers
     #
@@ -17,21 +17,17 @@ module AgileProxy
         # @param server_host [String] The host for the server to run on
         # @param server_port [Integer] The port for the server to run on
         def start(server_host, server_port, static_dirs = [])
-          # The sinatra web server
-          dispatch = Rack::Builder.app do
+
+          runner = ::Goliath::Runner.new([], nil)
+          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?
             map '/' do
               run ::AgileProxy::StubHandler.new
             end
           end
-          # Start the web server.
-          ::Rack::Server.start(
-              app: dispatch,
-              server: 'thin',
-              Host: server_host,
-              Port: server_port,
-              signals: false
-          )
+          runner.run
         end
       end
     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.22'
+  VERSION = '0.1.23'
 end

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

@@ -56,13 +56,17 @@ shared_examples_for 'a request stub' do |options = {}|
     stub = find_stub(http, name)
     {recordings: a_collection_containing_exactly(a_hash_including request_body: '', request_url: "#{http.url_prefix}#{path.gsub(/^\//, '')}", request_method: 'GET', request_spec_id: stub.body[:id])}
   end
+
   it 'should stub GET requests' do
-    expect(http.get('/index.html').body).to eql '<html><body>Mocked Content</body></html>'
+    response = http.get('/index.html')
+    expect(response.body).to eql '<html><body>Mocked Content</body></html>'
+    expect(response.headers).to include('content-length' => "40")
     expect(recordings_for 'index').to include(recordings_matcher_for('index', '/index.html')) if recording
   end
 
   it 'should stub GET response statuses' do
-    expect(http.get('/index.html').status).to eql 200
+    response = http.get('/index.html')
+    expect(response.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
@@ -77,7 +81,7 @@ shared_examples_for 'a request stub' do |options = {}|
     resp = http.get('/api/forums')
     expect(ActiveSupport::JSON.decode(resp.body).symbolize_keys).to eql forums: [], total: 0
     expect(resp.status).to eql 200
-    expect(resp.headers['Content-Type']).to eql 'application/json'
+    expect(resp.headers).to include('content-type' => 'application/json', 'content-length' => resp.body.length.to_s)
     expect(recordings_for 'api_forums').to include(recordings_matcher_for('api_forums', '/api/forums')) if recording
   end
 
@@ -85,43 +89,44 @@ shared_examples_for 'a request stub' do |options = {}|
     resp = http.get '/api/forums/my_forum/posts'
     expect(ActiveSupport::JSON.decode(resp.body)).to eql 'posts' => [{ 'forum_id' => 'my_forum', 'subject' => 'My first post' }, { 'forum_id' => 'my_forum', 'subject' => 'My second post' }, { 'forum_id' => 'my_forum', 'subject' => 'My third post' }], 'total' => 3
     expect(resp.status).to eql 200
-    expect(resp.headers['Content-Type']).to eql 'application/json'
+    expect(resp.headers).to include('content-type' => 'application/json', 'content-length' => resp.body.length.to_s)
   end
 
   it 'Should get the mocked content for api/forums/:forum_id/:post_id with parameter substitution including query parameters' do
     resp = http.get '/api/forums/my_forum/my_post?sort=id'
     expect(resp.body).to eql '<html><body><h1>Sorted By: id</h1><h2>my_forum</h2><h3>my_post</h3></body></html>'
     expect(resp.status).to eql 200
-    expect(resp.headers['Content-Type']).to eql 'text/html'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
   end
   it 'Should get the mocked content for api/forums/:forum_id/:post_id.html with parameter substitution including query parameters' do
     resp = http.get '/api/forums/my_forum/my_post.html?sort=id'
     expect(resp.body).to eql '<html><body><h1>Sorted By: id</h1><h2>my_forum</h2><h3>my_post</h3></body></html>'
     expect(resp.status).to eql 200
-    expect(resp.headers['Content-Type']).to eql 'text/html'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
   end
   it 'Should respond with an error for api/forums/:forum_id/:post_id.html with parameter substitution with a missing query parameter' do
     resp = http.get '/api/forums/my_forum/my_post.html'
     expect(resp.body).to eql '<html><body><h1>Sorted By: </h1><h2>my_forum</h2><h3>my_post</h3></body></html>'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
     expect(resp.status).to eql 200
   end
   it 'Should match the route by posted json data and the posted data can be output via the template' do
     resp = http.post '/api/forums/my_forum', '{"posted_var": "special_value"}', 'Content-Type' => 'application/json'
     expect(resp.body).to eql '<html><body><h1></h1><h2>special_value</h2><h3>my_forum</h3><p>This should get data from the POSTed data</p></body></html>'
     expect(resp.status).to eql 200
-    expect(resp.headers['Content-Type']).to eql 'text/html'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
   end
   it 'Should match the route by posted plain text data and the posted data can be output via the template' do
     resp = http.post '/api/forums/my_forum', "posted_var=special_value\n", 'Content-Type' => 'text/plain'
     expect(resp.body).to eql '<html><body><h1></h1><h2>special_value</h2><h3>my_forum</h3><p>This should get data from the POSTed data</p></body></html>'
     expect(resp.status).to eql 200
-    expect(resp.headers['Content-Type']).to eql 'text/html'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
   end
   it 'Should match the route by posted plain text data and the posted data can be output via the template' do
     resp = http.post '/api/forums/my_forum', "dummy=\nposted_var=special_value\n", 'Content-Type' => 'text/plain'
     expect(resp.body).to eql '<html><body><h1></h1><h2>special_value</h2><h3>my_forum</h3><p>This should get data from the POSTed data</p></body></html>'
     expect(resp.status).to eql 200
-    expect(resp.headers['Content-Type']).to eql 'text/html'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
   end
   # it 'Should match the route by posted xml data and the posted data can be output via the template' do
   #   resp = http.post "/api/forums/my_forum", '<posted_var>special_value</posted_var>', {'Content-Type' => 'application/xml'}
@@ -131,31 +136,33 @@ shared_examples_for 'a request stub' do |options = {}|
   it 'Should match the route by posted url encoded data and the posted data can be output via the template' do
     resp = http.post '/api/forums/my_forum', 'posted_var=special_value', 'Content-Type' => 'application/x-www-form-urlencoded'
     expect(resp.body).to eql '<html><body><h1></h1><h2>special_value</h2><h3>my_forum</h3><p>This should get data from the POSTed data</p></body></html>'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
     expect(resp.status).to eql 200
   end
   it 'Should match the route by posted multipart encoded data and the posted data can be output via the template' do
     resp = http.post '/api/forums/my_forum', 'posted_var=special_value', 'Content-Type' => 'multipart/form-data'
     expect(resp.body).to eql '<html><body><h1></h1><h2>special_value</h2><h3>my_forum</h3><p>This should get data from the POSTed data</p></body></html>'
+    expect(resp.headers).to include('content-type' => 'text/html', 'content-length' => resp.body.length.to_s)
     expect(resp.status).to eql 200
   end
 
   it 'should stub POST requests' do
     resp = http.post('/api/forums', foo: :bar)
     expect(resp.body).to eql '{"created": true}'
-    expect(resp.headers['Content-Type']).to eql 'application/json'
+    expect(resp.headers).to include('content-type' => 'application/json', 'content-length' => resp.body.length.to_s)
 
   end
 
   it 'should stub PUT requests' do
     resp = http.put('/api/forums/forum_1/my_post', foo: :bar)
     expect(resp.body).to eql '{"updated": true}'
-    expect(resp.headers['Content-Type']).to eql 'application/json'
+    expect(resp.headers).to include('content-type' => 'application/json', 'content-length' => resp.body.length.to_s)
   end
 
   it 'should stub DELETE requests' do
     resp = http.delete('/api/forums/forum_1/my_post')
     expect(resp.body).to eql '{"deleted": true}'
-    expect(resp.headers['Content-Type']).to eql 'application/json'
+    expect(resp.headers).to include('content-type' => 'application/json', 'content-length' => resp.body.length.to_s)
   end
 end
 

data/spec/integration_spec_helper.rb

@@ -10,6 +10,7 @@ RSpec.configure do |config|
   config.before :all, :type => :integration do
     start_test_servers
     start_proxy_server
+    debug_me = true
   end
 
 end

data/spec/support/test_server.rb

@@ -1,23 +1,80 @@
-require 'eventmachine'
-require 'thin'
 require 'faraday'
 require 'agile_proxy/cli'
+require 'socket'
+
+
 
-module Thin
-  module Backends
-    class TcpServer
-      def get_port
-        # seriously, eventmachine, how hard does getting a port have to be?
-        Socket.unpack_sockaddr_in(EM.get_sockname(@signature)).first
-      end
-    end
-  end
-end
 
 module AgileProxy
   module TestServer
+    class DummyApi
+      def response(env)
+        [200, {}, "hello!"]
+      end
+    end
+    class Server
+      attr_accessor :server_port
+      def initialize(world)
+        @world = world
+        at_exit do
+          cleanup
+        end
+        #Thin::Logging.silent = true
+      end
+      def pids
+        @pids ||= []
+      end
+      def cleanup
+        until pids.empty?
+          begin
+            Process.kill('INT', pids.pop);
+          rescue Errno::ESRCH
+            #Do nothing
+          end
+        end
+      end
+      def available_port(qty = 1)
+        # use Addrinfo
+        results = []
+        sockets_opened = []
+        while results.length < qty
+          socket = Socket.new(:INET, :STREAM, 0)
+          socket.bind(Addrinfo.tcp("127.0.0.1", 0))
+          port = socket.local_address.ip_port
+          results.push port unless results.include? port
+          sockets_opened.push socket
+        end
+        sockets_opened.each do |socket|
+          socket.close
+        end
+        results
+      end
+
+      def ruby
+        RbConfig.ruby
+      end
+      def start_test_servers
+        ports = available_port(3)
+        puts "Starting test server on #{ports[0]}"
+        pids.push spawn(ruby, "echo_server.rb", '--address', 'localhost', '--port', "#{ports[0]}")
+        puts "Starting test server on #{ports[1]}"
+        pids.push spawn(ruby, "echo_server.rb", '--address', 'localhost', '--port', "#{ports[1]}", '--ssl')
+        puts "Starting test server on #{ports[2]}"
+        pids.push spawn({'STATUS_CODE' => '500'}, ruby, "echo_server.rb", '--address', 'localhost', '--port', "#{ports[2]}")
+        @world.instance_eval do
+          @http_url  = "http://localhost:#{ports.shift}"
+          @https_url = "https://localhost:#{ports.shift}"
+          @error_url = "http://localhost:#{ports.shift}"
+          @http_url_no_proxy = "http://localhost:#{server_port}"
+          @https_url_no_proxy = "https://localhost:#{server_port}"
+        end
+      end
+
+
+    end
+
     def initialize(rspecParams=nil)
-      Thin::Logging.silent = true
+
     end
     def proxy_port
       3101
@@ -29,66 +86,20 @@ module AgileProxy
       3022
     end
 
-    def start_test_servers
-      q = Queue.new
-      Thread.new do
-        EM.run do
-          echo = echo_app_setup
-
-          http_server = start_server(echo)
-          q.push http_server.backend.get_port
 
-          https_server = start_server(echo, true)
-          q.push https_server.backend.get_port
-
-          echo_error = echo_app_setup(500)
-          error_server = start_server(echo_error)
-          q.push error_server.backend.get_port
-        end
-      end
-
-      @http_url  = "http://localhost:#{q.pop}"
-      @https_url = "https://localhost:#{q.pop}"
-      @error_url = "http://localhost:#{q.pop}"
-      @http_url_no_proxy = "http://localhost:#{server_port}"
-      @https_url_no_proxy = "https://localhost:#{server_port}"
+    def start_test_servers
+      @test_servers = Server.new(self)
+      @test_servers.server_port = server_port
+      @test_servers.start_test_servers
     end
 
     def start_proxy_server
       Thread.new do
         cli = Cli.start(['start', proxy_port.to_s, server_port.to_s, api_port.to_s, '--env', 'test'])
       end
-      sleep 1
+      sleep 10
     end
 
-    def echo_app_setup(response_code = 200)
-      counter = 0
-      proc do |env|
-        req_body = env['rack.input'].read
-        request_info = "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}"
-        res_body = request_info
-        res_body += "\n#{req_body}" unless req_body.empty?
-        counter += 1
-        [
-          response_code,
-          { 'HTTP-X-EchoServer' => request_info,
-            'HTTP-X-EchoCount' => "#{counter}" },
-          [res_body]
-        ]
-      end
-    end
 
-    def start_server(echo, ssl = false)
-      http_server = Thin::Server.new '127.0.0.1', 0, echo
-      if ssl
-        http_server.ssl = true
-        http_server.ssl_options = {
-          private_key_file: File.expand_path('../../fixtures/test-server.key', __FILE__),
-          cert_chain_file: File.expand_path('../../fixtures/test-server.crt', __FILE__)
-        }
-      end
-      http_server.start
-      http_server
-    end
   end
 end

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

@@ -1,6 +1,17 @@
 require 'spec_helper'
 
 describe AgileProxy::StubHandler do
+  #Mock the content length middleware as we are not testing if that works
+  let(:rack_content_length_class) do
+    Class.new do
+      def initialize(app)
+        @app = app
+      end
+      def call(env)
+        @app.call(env)
+      end
+    end
+  end
   let(:route_not_found_response) { [404, { 'X-Cascade' => 'pass' }, ['Not Found']] }
   let(:handler) { AgileProxy::StubHandler.new }
   let(:request) do
@@ -23,6 +34,7 @@ describe AgileProxy::StubHandler do
 
   before :each do
     stub_const('AgileProxy::Application', application_class)
+    stub_const('Rack::ContentLength', rack_content_length_class)
     allow(application_class).to receive(:where).and_return application_class
     allow(application_class).to receive(:first).and_return application
     allow(application).to receive(:request_specs).and_return request_spec_class
@@ -71,8 +83,8 @@ describe AgileProxy::StubHandler do
           it 'Should match with a get on the same domain but not with a post or a different domain' do
             expect(handler.call(request_for(url: 'http://example.com').env)).to eql([200, {}, ''])
             expect(handler.call(request_for(url: 'http://example.com/').env)).to eql([200, {}, ''])
-            expect(handler.call(request_for(url: 'http://example.com/', method: 'POST').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://subdomain.example.com/').env)).to eql route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/', method: 'POST').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://subdomain.example.com/').env)).to contain_exactly *route_not_found_response
           end
 
         end
@@ -85,10 +97,10 @@ describe AgileProxy::StubHandler do
           end
           it 'Should match with a get on the same domain but not with a post or a different domain' do
             expect(handler.call(request_for(url: 'http://example.com/index').env)).to eql([200, {}, ''])
-            expect(handler.call(request_for(method: 'POST', url: 'http://example.com/index').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://subdomain.example.com/index').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://example.com/').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://example.com').env)).to eql route_not_found_response
+            expect(handler.call(request_for(method: 'POST', url: 'http://example.com/index').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://subdomain.example.com/index').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com').env)).to contain_exactly *route_not_found_response
           end
 
         end
@@ -103,8 +115,8 @@ describe AgileProxy::StubHandler do
             expect(handler.call(request_for(method: 'POST', url: 'http://example.com').env)).to eql([200, {}, ''])
             expect(handler.call(request_for(method: 'POST', url: 'http://example.com/').env)).to eql([200, {}, ''])
             expect(handler.call(request_for(method: 'POST', url: 'http://example.com/', headers: {'Content-Type' => 'text/plain'}, body: "a=1\nb=2\nc=3").env)).to eql([200, {}, ''])
-            expect(handler.call(request_for(url: 'http://example.com/').env)).to eql route_not_found_response
-            expect(handler.call(request_for(method: 'POST', url: 'http://subdomain.example.com/').env)).to eql route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(method: 'POST', url: 'http://subdomain.example.com/').env)).to contain_exactly *route_not_found_response
           end
 
         end
@@ -116,10 +128,10 @@ describe AgileProxy::StubHandler do
           end
           it 'Should match with a get on the same domain but not with a post or a different domain' do
             expect(handler.call(request_for(url: 'http://example.com/users/1/index').env)).to eql([200, {}, ''])
-            expect(handler.call(request_for(url: 'http://example.com/users/2/index').env)).to eql route_not_found_response
-            expect(handler.call(request_for(method: 'POST', url: 'http://example.com/users/1/index').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://example.com/users/1/').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://example.com/users/1').env)).to eql route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/users/2/index').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(method: 'POST', url: 'http://example.com/users/1/index').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/users/1/').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/users/1').env)).to contain_exactly *route_not_found_response
           end
         end
         describe 'With a more complex route with conditions including query params inside a domain' do
@@ -131,10 +143,10 @@ describe AgileProxy::StubHandler do
           it 'Should match with a get on the same domain but not with a post or a different domain' do
             expect(handler.call(request_for(url: 'http://example.com/users/1/index?extra_1=extra_1&extra_2=extra_2').env)).to eql([200, {}, ''])
             expect(handler.call(request_for(url: 'http://example.com/users/1/index?some_other=2&extra_1=extra_1&extra_2=extra_2').env)).to eql([200, {}, ''])
-            expect(handler.call(request_for(url: 'http://example.com/users/2/index').env)).to eql route_not_found_response
-            expect(handler.call(request_for(method: 'POST', url: 'http://example.com/users/1/index').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://example.com/users/1/').env)).to eql route_not_found_response
-            expect(handler.call(request_for(url: 'http://example.com/users/1').env)).to eql route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/users/2/index').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(method: 'POST', url: 'http://example.com/users/1/index').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/users/1/').env)).to contain_exactly *route_not_found_response
+            expect(handler.call(request_for(url: 'http://example.com/users/1').env)).to contain_exactly *route_not_found_response
           end
         end
 

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' }, ['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' }, ['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' }, ["Hello "]])
       end
     end
   end

data/spec/unit/agile_proxy/servers/api_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 describe AgileProxy::Servers::Api do
   let(:subject) { AgileProxy::Servers::Api }
   let(:rack_builder_class)  { Class.new }
-  let(:rack_server_class) { Class.new }
+  let(:goliath_runner_class) { Class.new }
   let(:rack_static_class) { Class.new }
   let(:api_root_class) { Class.new }
   before :each do
-    stub_const('Rack::Builder', rack_builder_class)
+    stub_const('Goliath::Rack::Builder', rack_builder_class)
     stub_const('Rack::Static', rack_static_class)
-    stub_const('Rack::Server', rack_server_class)
+    stub_const('Goliath::Runner', goliath_runner_class)
     stub_const('AgileProxy::Api::Root', api_root_class)
   end
-  it 'Should start a rack server when the start method is called' do
+  it 'Should start a goliath server when the start method is called' do
     builder_block = nil
     expect(rack_builder_class).to receive(:app) do |&blk|
       builder_block = blk
@@ -24,7 +24,11 @@ describe AgileProxy::Servers::Api do
       rack_builder_class.new.instance_eval(&blk)
 
     end
-    expect(rack_server_class).to receive(:start)
+    expect_any_instance_of(goliath_runner_class).to receive(:run)
+    expect_any_instance_of(goliath_runner_class).to receive(:initialize).with([], nil)
+    expect_any_instance_of(goliath_runner_class).to receive(:address=).with('localhost')
+    expect_any_instance_of(goliath_runner_class).to receive(:port=).with('3020')
+    expect_any_instance_of(goliath_runner_class).to receive(:app=)
     subject.start('localhost', '3020')
 
   end

data/spec/unit/agile_proxy/servers/request_spec_direct_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 describe AgileProxy::Servers::RequestSpecDirect do
   let(:subject) { AgileProxy::Servers::RequestSpecDirect }
   let(:rack_builder_class)  { Class.new }
-  let(:rack_server_class) { Class.new }
+  let(:goliath_runner_class) { Class.new }
   let(:rack_static_class) { Class.new }
   let(:stub_handler_class) { Class.new }
   before :each do
-    stub_const('Rack::Builder', rack_builder_class)
+    stub_const('Goliath::Rack::Builder', rack_builder_class)
     stub_const('Rack::Static', rack_static_class)
-    stub_const('Rack::Server', rack_server_class)
+    stub_const('Goliath::Runner', goliath_runner_class)
     stub_const('AgileProxy::StubHandler', stub_handler_class)
   end
   it 'Should start a rack server with a static handler when the start method is called' do
@@ -24,7 +24,11 @@ describe AgileProxy::Servers::RequestSpecDirect do
       rack_builder_class.new.instance_eval(&blk)
 
     end
-    expect(rack_server_class).to receive(:start)
+    expect_any_instance_of(goliath_runner_class).to receive(:run)
+    expect_any_instance_of(goliath_runner_class).to receive(:initialize).with([], nil)
+    expect_any_instance_of(goliath_runner_class).to receive(:address=).with('localhost')
+    expect_any_instance_of(goliath_runner_class).to receive(:port=).with('3030')
+    expect_any_instance_of(goliath_runner_class).to receive(:app=)
     subject.start('localhost', '3030', ['/ui', '/images'])
 
   end
@@ -40,7 +44,11 @@ describe AgileProxy::Servers::RequestSpecDirect do
       expect_any_instance_of(rack_builder_class).to receive(:run).with(kind_of(stub_handler_class))
       rack_builder_class.new.instance_eval(&blk)
     end
-    expect(rack_server_class).to receive(:start)
+    expect_any_instance_of(goliath_runner_class).to receive(:run)
+    expect_any_instance_of(goliath_runner_class).to receive(:initialize).with([], nil)
+    expect_any_instance_of(goliath_runner_class).to receive(:address=).with('localhost')
+    expect_any_instance_of(goliath_runner_class).to receive(:port=).with('3030')
+    expect_any_instance_of(goliath_runner_class).to receive(:app=)
     subject.start('localhost', '3030')
 
   end

data/spec/unit/agile_proxy/servers/request_spec_spec.rb

@@ -1,30 +1,33 @@
 require 'spec_helper'
 describe AgileProxy::Servers::RequestSpec do
   let(:subject) { AgileProxy::Servers::RequestSpec }
-  let(:event_machine_class) { Class.new }
-  let(:socket_class) { Class.new }
-  let(:proxy_connection_class) { Class.new }
+  let(:rack_builder_class)  { Class.new }
+  let(:goliath_runner_class) { Class.new }
+  let(:rack_static_class) { Class.new }
   let(:request_handler_class) { Class.new }
+  let(:config_class) {Class.new}
   before :each do
-    stub_const('EM', event_machine_class)
-    stub_const('Socket', socket_class)
-    stub_const('AgileProxy::ProxyConnection', proxy_connection_class)
+    stub_const('Goliath::Rack::Builder', rack_builder_class)
+    stub_const('Rack::Static', rack_static_class)
+    stub_const('Goliath::Proxy::Runner', goliath_runner_class)
     stub_const('AgileProxy::RequestHandler', request_handler_class)
+    stub_const('AgileProxy::Config', config_class)
   end
   context 'With started server' do
     before :each do
-      expect(event_machine_class).to receive(:start_server).with('127.0.0.1', AgileProxy.config.proxy_port, proxy_connection_class) do |_host, _port, _connection_class, &blk|
-        connection_instance = proxy_connection_class.new
-        expect(connection_instance).to receive(:handler=).with(kind_of(request_handler_class))
-        blk.call(connection_instance)
-      end.and_return 'signature'
+      expect_any_instance_of(goliath_runner_class).to receive(:run)
+      expect_any_instance_of(goliath_runner_class).to receive(:initialize).with([], nil)
+      expect_any_instance_of(goliath_runner_class).to receive(:address=).with('127.0.0.1')
+      expect_any_instance_of(goliath_runner_class).to receive(:port=).with('3100')
+      expect_any_instance_of(goliath_runner_class).to receive(:app=).with(instance_of(request_handler_class))
+      expect(AgileProxy).to receive(:config).at_least(:once).and_return config_class.new
+      expect_any_instance_of(config_class).to receive(:proxy_port).at_least(:once).and_return '3100'
+      allow_any_instance_of(config_class).to receive(:reset)
     end
     it 'Should start the server and return the instance' do
       expect(subject.start).to be_a_kind_of(subject)
     end
     it 'Should return the port it is running on' do
-      expect(event_machine_class).to receive(:get_sockname).with('signature').and_return 'sockname'
-      expect(socket_class).to receive(:unpack_sockaddr_in).with('sockname').and_return ['3100']
       expect(subject.start.port).to eql '3100'
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agile-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,26 +124,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.43.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -204,26 +184,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.17
-- !ruby/object:Gem::Dependency
-  name: airborne
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -404,86 +364,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: eventmachine_httpserver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-- !ruby/object:Gem::Dependency
-  name: http_parser.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.1
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -619,25 +499,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: rack-parser
+  name: goliath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !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'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: goliath-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.0.1
 description: An agile, programmable, controllable proxy server for use standalone
   or as part of an integration test suite with clients for many languages
 email:
@@ -2304,6 +2204,7 @@ files:
 - db/migrations/20150221152500_add_record_requests_to_request_specs.rb
 - db/schema.rb
 - db/seed.rb
+- echo_server.rb
 - examples/README.md
 - examples/facebook_api.html
 - examples/tumblr_api.html
@@ -2379,7 +2280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: An agile, programmable, controllable flexible proxy server for development