agile-proxy 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca50b88e4dff710583bb65d8dfeea362efe0194
-  data.tar.gz: ce452e942ba2a2b186b74d95e34048abb001098c
+  metadata.gz: cdc83345bdd428e0b53171381e809cd739281a32
+  data.tar.gz: 52dc13eeb368e9d19cb2f3cc1f2248d6320a573c
 SHA512:
-  metadata.gz: 42012c6b32b17916cdd7b5b592f434e7db5eb50dd6fd2b9c8f2cf6715631d295f490e4dc73fb72e6b6ba59c238572833c9d9da8167dbe0451ddecbef2ae4d04e
-  data.tar.gz: 3ed48c70d0599bb27c7956ccec8e7fa2c14e89feb9644f2375cf5703c793544c30c1a62252055b66fddf94888ef1827f5ea4500dad8148791f527ca9136000e2
+  metadata.gz: e10828a0c1eaf12ee379f4b4de473c5a64afd514722897561b21e2a4327a27f7d93836043ee26103eb282840bd9c1a92ff1a0532566c5c9423abe9956f4f29ca
+  data.tar.gz: f287eb594c2ba7d69e3b19d640bbde4a1beec400cecb40d5c4ee17b5d12532019e7cf32ba767cba245338aa5c41a1d9ad5bd10ec3ca3a2d8734fa07000e74eaa

data/.gitignore

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

data/README.md

@@ -123,4 +123,5 @@ 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
 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
 

data/agile-proxy.gemspec

@@ -21,9 +21,11 @@ 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'
@@ -33,24 +35,16 @@ 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'
-  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 'sqlite3', '~> 1.3', '>= 1.3.10'
   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 'goliath', '~> 1.0', '>= 1.0.4'
-  gem.add_runtime_dependency 'goliath-proxy', '~> 0.0', '>= 0.0.1'
-
+  gem.add_runtime_dependency 'rack-parser', '~> 0.6', '>= 0.6.1'
 end

data/lib/agile_proxy/handlers/request_handler.rb

@@ -36,9 +36,8 @@ 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.reject {|key, value| exclude_headers.include?(key)},
+        application.recordings.create request_headers: request.headers,
                                       request_body: body,
                                       request_url: request.url,
                                       request_method: request.request_method,

data/lib/agile_proxy/handlers/stub_handler.rb

@@ -2,6 +2,7 @@ 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

data/lib/agile_proxy/model/recording.rb

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

data/lib/agile_proxy/proxy_connection.rb

@@ -1,27 +1,24 @@
 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 < Goliath::Connection
-    def logger
-      ::AgileProxy.config.logger
-    end
+  class ProxyConnection < EventMachine::Connection
+    attr_accessor :handler
     def post_init
-      super
-      #@proxy_parser = Http::Parser.new(self)
-      @proxy_parser = Http::Parser.new
+      @parser = Http::Parser.new(self)
     end
 
     def receive_data(data)
-      #@proxy_parser << data
       @parser << data
     end
 
@@ -39,25 +36,24 @@ module AgileProxy
     end
 
     def on_message_complete
-      if @proxy_parser.http_method == 'CONNECT'
-        restart_with_ssl(@proxy_parser.request_url)
+      if @parser.http_method == 'CONNECT'
+        restart_with_ssl(@parser.request_url)
       else
         if @ssl
-          uri = URI.parse(@proxy_parser.request_url)
+          uri = URI.parse(@parser.request_url)
           @url = "https://#{@ssl}#{[uri.path, uri.query].compact.join('?')}"
         else
-          @url = @proxy_parser.request_url
+          @url = @parser.request_url
         end
         handle_request
       end
     end
 
-
     protected
 
     def restart_with_ssl(url)
       @ssl = url
-      @proxy_parser = Http::Parser.new(self)
+      @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(
@@ -68,9 +64,11 @@ module AgileProxy
 
     def handle_request
       EM.synchrony do
-        request = ::Goliath::Request.new(handler, self, env)
-        request.set_deferred_status :succeeded
-        request.process
+        request = ActionDispatch::Request.new(env)
+        request.params  # This will populate action_dispatch.request.parameters
+        handler.call(env).tap do |response|
+          send_response(response)
+        end
       end
     end
 
@@ -81,11 +79,10 @@ module AgileProxy
       fake_input_buffer = StringIO.new(@body)
       fake_error_buffer = StringIO.new
       url_parsed = URI.parse(@url)
-      @__env = ::Goliath::Env.new
-      @__env.merge!({
+      @__env = {
         'rack.input' => Rack::Lint::InputWrapper.new(fake_input_buffer),
         'rack.errors' => Rack::Lint::ErrorWrapper.new(fake_error_buffer),
-        'REQUEST_METHOD' => @proxy_parser.http_method,
+        'REQUEST_METHOD' => @parser.http_method,
         'REQUEST_PATH' => url_parsed.path,
         'PATH_INFO' => url_parsed.path,
         'QUERY_STRING' => url_parsed.query || '',
@@ -93,11 +90,9 @@ module AgileProxy
         'rack.url_scheme' => url_parsed.scheme,
         'CONTENT_LENGTH' => @body.length,
         'SERVER_NAME' => url_parsed.host,
-        'SERVER_PORT' => url_parsed.port,
-        'rack.logger' => logger
+        'SERVER_PORT' => url_parsed.port
 
-
-                    })
+      }
       @headers.merge(@original_headers || {}).each do |name, value|
         converted_name = "HTTP_#{name.gsub(/-/, '_').upcase}"
         @__env[converted_name] = value
@@ -107,6 +102,12 @@ 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,27 +3,13 @@ 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,7 +1,6 @@
 require 'rack'
+require 'thin'
 require 'grape'
-require 'goliath/api'
-require 'goliath/runner'
 require 'agile_proxy/api/root'
 
 module AgileProxy
@@ -20,19 +19,21 @@ 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 API runner
-          runner = ::Goliath::Runner.new([], nil)
-          runner.address = webserver_host
-          runner.port = webserver_port
-          runner.app = ::Goliath::Rack::Builder.app do
+          # The sinatra web server
+          dispatch = 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
-          runner.run
-
+          # Start the web server.
+          ::Rack::Server.start(
+              app: dispatch,
+              server: 'thin',
+              Host: webserver_host,
+              Port: webserver_port,
+              signals: false
+          )
         end
       end
     end

data/lib/agile_proxy/servers/request_spec.rb

@@ -1,6 +1,4 @@
 require 'eventmachine'
-require 'goliath/api'
-require 'goliath/proxy'
 module AgileProxy
   module Servers
     #
@@ -8,7 +6,6 @@ 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
@@ -18,23 +15,16 @@ module AgileProxy
       end
       # Starts the server
       def start
-        #
-        # 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
+        @signature = EM.start_server('127.0.0.1', AgileProxy.config.proxy_port, ProxyConnection) do |p|
+          p.handler = @request_handler
+        end
         self
-
       end
       # The port the server is running on
       # @return [Integer] The port the server is running on
       def port
-        return AgileProxy.config.proxy_port
+        Socket.unpack_sockaddr_in(EM.get_sockname(@signature)).first
       end
-      private
     end
   end
 end

data/lib/agile_proxy/servers/request_spec_direct.rb

@@ -1,6 +1,6 @@
 require 'rack'
-require 'goliath/api'
-require 'goliath/runner'
+require 'thin'
+
 module AgileProxy
   module Servers
     #
@@ -17,17 +17,21 @@ 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 = [])
-
-          runner = ::Goliath::Runner.new([], nil)
-          runner.address = server_host
-          runner.port = server_port
-          runner.app = ::Goliath::Rack::Builder.app do
+          # The sinatra web server
+          dispatch = 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
-          runner.run
+          # Start the web server.
+          ::Rack::Server.start(
+              app: dispatch,
+              server: 'thin',
+              Host: server_host,
+              Port: server_port,
+              signals: false
+          )
         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.21'
+  VERSION = '0.1.22'
 end

data/spec/integration_spec_helper.rb

@@ -10,7 +10,6 @@ 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,80 +1,23 @@
+require 'eventmachine'
+require 'thin'
 require 'faraday'
 require 'agile_proxy/cli'
-require 'socket'
 
-
-
-
-module AgileProxy
-  module TestServer
-    class DummyApi
-      def response(env)
-        [200, {}, "hello!"]
+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
-    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
+  end
+end
 
+module AgileProxy
+  module TestServer
     def initialize(rspecParams=nil)
-
+      Thin::Logging.silent = true
     end
     def proxy_port
       3101
@@ -86,20 +29,66 @@ module AgileProxy
       3022
     end
 
-
     def start_test_servers
-      @test_servers = Server.new(self)
-      @test_servers.server_port = server_port
-      @test_servers.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}"
     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 10
+      sleep 1
     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/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(:goliath_runner_class) { Class.new }
+  let(:rack_server_class) { Class.new }
   let(:rack_static_class) { Class.new }
   let(:api_root_class) { Class.new }
   before :each do
-    stub_const('Goliath::Rack::Builder', rack_builder_class)
+    stub_const('Rack::Builder', rack_builder_class)
     stub_const('Rack::Static', rack_static_class)
-    stub_const('Goliath::Runner', goliath_runner_class)
+    stub_const('Rack::Server', rack_server_class)
     stub_const('AgileProxy::Api::Root', api_root_class)
   end
-  it 'Should start a goliath server when the start method is called' do
+  it 'Should start a rack server when the start method is called' do
     builder_block = nil
     expect(rack_builder_class).to receive(:app) do |&blk|
       builder_block = blk
@@ -24,11 +24,7 @@ describe AgileProxy::Servers::Api do
       rack_builder_class.new.instance_eval(&blk)
 
     end
-    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=)
+    expect(rack_server_class).to receive(:start)
     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(:goliath_runner_class) { Class.new }
+  let(:rack_server_class) { Class.new }
   let(:rack_static_class) { Class.new }
   let(:stub_handler_class) { Class.new }
   before :each do
-    stub_const('Goliath::Rack::Builder', rack_builder_class)
+    stub_const('Rack::Builder', rack_builder_class)
     stub_const('Rack::Static', rack_static_class)
-    stub_const('Goliath::Runner', goliath_runner_class)
+    stub_const('Rack::Server', rack_server_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,11 +24,7 @@ describe AgileProxy::Servers::RequestSpecDirect do
       rack_builder_class.new.instance_eval(&blk)
 
     end
-    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=)
+    expect(rack_server_class).to receive(:start)
     subject.start('localhost', '3030', ['/ui', '/images'])
 
   end
@@ -44,11 +40,7 @@ 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_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=)
+    expect(rack_server_class).to receive(:start)
     subject.start('localhost', '3030')
 
   end

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

@@ -1,33 +1,30 @@
 require 'spec_helper'
 describe AgileProxy::Servers::RequestSpec do
   let(:subject) { AgileProxy::Servers::RequestSpec }
-  let(:rack_builder_class)  { Class.new }
-  let(:goliath_runner_class) { Class.new }
-  let(:rack_static_class) { Class.new }
+  let(:event_machine_class) { Class.new }
+  let(:socket_class) { Class.new }
+  let(:proxy_connection_class) { Class.new }
   let(:request_handler_class) { Class.new }
-  let(:config_class) {Class.new}
   before :each do
-    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('EM', event_machine_class)
+    stub_const('Socket', socket_class)
+    stub_const('AgileProxy::ProxyConnection', proxy_connection_class)
     stub_const('AgileProxy::RequestHandler', request_handler_class)
-    stub_const('AgileProxy::Config', config_class)
   end
   context 'With started server' do
     before :each do
-      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)
+      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'
     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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agile-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Gary Taylor
@@ -124,6 +124,26 @@ 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
@@ -184,6 +204,26 @@ 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
@@ -364,6 +404,86 @@ 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
@@ -499,45 +619,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  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
+  name: rack-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.6.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:
@@ -2204,7 +2304,6 @@ 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

data/echo_server.rb

@@ -1,19 +0,0 @@
-#!/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