agile-proxy 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74ae4ece459f7aec91a77ac5daefe1b1978de480
-  data.tar.gz: 1b1e68ecff0556340c41281a1f24faa3a6b75202
+  metadata.gz: 02e133024599ce6fd5e4fddbb5e033a946a2dc0b
+  data.tar.gz: 4e2ee23220437dbaaf7c0b5e77037ae5795cb7f6
 SHA512:
-  metadata.gz: e604574ae397091d8909ad20981f4d4a03dac2fbc28c7885fb588a071234f6b6ab5be27aef4750158f0857d522742cac69add078f09dc4c783b7e647460152bc
-  data.tar.gz: af0e99b04466f2c5120f552f8fa78e4753eae7273552fc4ca2d0a41cd8e5fd49e6c1f1686db4370c4b9989acb974d20d052228eeda12177c2089883292cab911
+  metadata.gz: e69dfa8694ca9c1263cb2c74aeb55bac639c14ddd378026e2b9ec159e8aba5f7a2f6d74e7c396b7f7b7c805b2a8524500ad8014237906bafe462e357325e5567
+  data.tar.gz: 596085914e190623edbb8613ee094c6b7001f753b325dd7aa103c93a649b91fd68c7a984d522ac66f35c8aaec69b88ceef34f430178aaf31c22a7eefa70e954a

data/.travis.yml

@@ -6,3 +6,4 @@ rvm:
 script:
   - bundle exec rake db:migrate ENV=test
   - bundle exec rspec spec/unit
+  - bundle exec rspec spec/integration

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    agile-proxy (0.1.11)
+    agile-proxy (0.1.12)
       activerecord (~> 4.1.6)
       em-http-request (~> 1.1.2)
       em-synchrony (~> 1.0.3)
@@ -94,6 +94,7 @@ GEM
     equalizer (0.0.9)
     erubis (2.7.0)
     eventmachine (1.0.3)
+    eventmachine (1.0.3-x86-mingw32)
     eventmachine_httpserver (0.2.1)
     faker (1.2.0)
       i18n (~> 0.5)
@@ -219,6 +220,7 @@ GEM
     simplecov-html (0.8.0)
     slop (3.6.0)
     sqlite3 (1.3.10)
+    sqlite3 (1.3.10-x86-mingw32)
     thin (1.6.3)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0)

data/README.md

@@ -103,4 +103,9 @@ http://public-app-1:password@localhost:3100
 ## History
 v0.1.8 Added support for plain text params parser - As DWR uses this (and maybe others)
 v0.1.9 Plain text params parser bug fixed - now handles params with a key and no value
-v0.1.10 Now using dependent: :destroy to tidy up better when all specs for an application are deleted (common occurence)
+v0.1.10 Now using dependent: :destroy to tidy up better when all specs for an application are deleted (common occurence)
+v0.1.11 Further improved database tidy up.
+        AGILE_PROXY_ENV can now set the environment at server startup
+        conditions handling improved in routing
+v0.1.12 Added a 'Direct' server which is a simple HTTP server that response to the stubs - also allows
+        for static dirs to be hosted.

data/bin/agile_proxy

@@ -1,118 +1,4 @@
 #!/usr/bin/env ruby
-require 'agile_proxy'
-require 'thor'
-require 'rake'
-require 'active_record'
-require_relative '../db/seed'
-module AgileProxy
-  include ActiveRecord::Tasks
-  class Cli < Thor
-    class << self
-      def data_dir_base
-        if RUBY_PLATFORM =~ /win32/
-          ENV['APPDATA']
-        elsif RUBY_PLATFORM =~ /linux/
-          ENV['HOME']
-        elsif RUBY_PLATFORM =~ /darwin/
-          ENV['HOME']
-        elsif RUBY_PLATFORM =~ /freebsd/
-          ENV['HOME']
-        else
-          ENV['HOME']
-        end
-      end
-
-      def data_dir
-        if Dir.pwd == File.expand_path('..', File.dirname(__FILE__))
-          Dir.pwd
-        else
-          File.join data_dir_base, '.agile_proxy'
-        end
-      end
-
-      def environment
-        ENV['AGILE_PROXY_ENV'] || (Dir.pwd == File.expand_path('..', File.dirname(__FILE__)) ? 'development' : 'production')
-      end
-    end
-    package_name 'Http Flexible Proxy'
-    desc 'start PROXY_PORT WEBSERVER_PORT', 'Runs the agile proxy'
-    method_options data_dir: data_dir, database_config_file: 'db.yml', env: environment
-    def start(proxy_port = nil, webserver_port = nil)
-      ensure_database_config_file_exists database_config_file(options)
-      puts "Data dir is #{options.data_dir}, environment is #{options.env}"
-      setup_for_migrations(options)
-      ::AgileProxy.configure do |config|
-        config.proxy_port = proxy_port unless proxy_port.nil?
-        config.webserver_port = webserver_port unless webserver_port.nil?
-        config.environment = options.env
-        config.database_config_file = database_config_file(options)
-      end
-      server = AgileProxy::Server.new
-      update_db
-      server.start
-    end
-
-    private
-
-    def setup_for_migrations(options)
-      ActiveRecord::Tasks::DatabaseTasks.db_dir = options.data_dir
-      ActiveRecord::Tasks::DatabaseTasks.migrations_paths = [File.expand_path('../db/migrations', File.dirname(__FILE__))]
-      ActiveRecord::Tasks::DatabaseTasks.env = options.env
-      ActiveRecord::Tasks::DatabaseTasks.root = File.expand_path('..', __FILE__)
-      ActiveRecord::Migrator.migrations_paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
-    end
-    def run_migrations
-      ActiveRecord::Migration.verbose = true
-      ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, nil) do |migration|
-        ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
-      end
-    end
-
-    def seed_database
-      Seed.load_seed
-    end
-
-    def server
-      AgileProxy::Server.new
-    end
-
-    def update_db
-      ActiveRecord::Tasks::DatabaseTasks.create_current
-      run_migrations
-      seed_database
-      # Rake::Task['db:create'].invoke
-      # Rake::Task['db:migrate'].invoke
-
-
-    end
-
-    def ensure_database_config_file_exists(fn)
-      return if File.exist? fn
-      FileUtils.mkdir_p File.dirname fn
-      db = {
-          :development => {
-              adapter: 'sqlite3',
-              database: File.join(File.dirname(fn), 'db', 'development.db')
-          },
-          :test => {
-              adapter: 'sqlite3',
-              database: File.join(File.dirname(fn), 'db', 'test.db')
-          },
-          :production => {
-              adapter: 'sqlite3',
-              database: File.join(File.dirname(fn), 'db', 'production.db')
-          }
-      }
-      File.open(fn, 'w') {|f| f.write(db.to_yaml) }
-    end
-    def database_config_file(options)
-      if File.exist? options.database_config_file
-        options.database_config_file
-      else
-        File.join(options.data_dir, options.database_config_file)
-      end
-    end
-  end
-end
+require 'agile_proxy/cli'
 AgileProxy::Cli.start(ARGV)
 # AgileProxy::Server.new.start(false)

data/config.yml

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

data/lib/agile_proxy/cli.rb

@@ -0,0 +1,116 @@
+require 'agile_proxy'
+require 'thor'
+require 'active_record'
+require_relative '../../db/seed'
+
+module AgileProxy
+  include ActiveRecord::Tasks
+  class Cli < Thor
+    class << self
+      def data_dir_base
+        if RUBY_PLATFORM =~ /win32/
+          ENV['APPDATA']
+        elsif RUBY_PLATFORM =~ /linux/
+          ENV['HOME']
+        elsif RUBY_PLATFORM =~ /darwin/
+          ENV['HOME']
+        elsif RUBY_PLATFORM =~ /freebsd/
+          ENV['HOME']
+        else
+          ENV['HOME']
+        end
+      end
+
+      def data_dir
+        if Dir.pwd == File.expand_path('../..', File.dirname(__FILE__))
+          Dir.pwd
+        else
+          File.join data_dir_base, '.agile_proxy'
+        end
+      end
+
+      def environment
+        ENV['AGILE_PROXY_ENV'] || (Dir.pwd == File.expand_path('../..', File.dirname(__FILE__)) ? 'development' : 'production')
+      end
+    end
+    package_name 'Http Flexible Proxy'
+    desc 'start PROXY_PORT WEBSERVER_PORT', 'Runs the agile proxy'
+    method_options data_dir: data_dir, database_config_file: 'db.yml', env: environment
+    def start(proxy_port = nil, server_port = nil, webserver_port = nil)
+      ensure_database_config_file_exists database_config_file(options)
+      puts "Data dir is #{options.data_dir}, environment is #{options.env}"
+      setup_for_migrations(options)
+      ::AgileProxy.configure do |config|
+        config.proxy_port = proxy_port unless proxy_port.nil?
+        config.server_port = server_port unless server_port.nil?
+        config.webserver_port = webserver_port unless webserver_port.nil?
+        config.environment = options.env
+        config.database_config_file = database_config_file(options)
+      end
+      server = AgileProxy::Server.new
+      update_db
+      server.start
+    end
+
+    private
+
+    def setup_for_migrations(options)
+      ActiveRecord::Tasks::DatabaseTasks.db_dir = options.data_dir
+      ActiveRecord::Tasks::DatabaseTasks.migrations_paths = [File.expand_path('../../db/migrations', File.dirname(__FILE__))]
+      ActiveRecord::Tasks::DatabaseTasks.env = options.env
+      ActiveRecord::Tasks::DatabaseTasks.root = File.expand_path('../..', __FILE__)
+      ActiveRecord::Migrator.migrations_paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
+    end
+    def run_migrations
+      ActiveRecord::Migration.verbose = true
+      ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, nil) do |migration|
+        ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
+      end
+    end
+
+    def seed_database
+      Seed.load_seed
+    end
+
+    def server
+      AgileProxy::Server.new
+    end
+
+    def update_db
+      ActiveRecord::Tasks::DatabaseTasks.create_current
+      run_migrations
+      seed_database
+      # Rake::Task['db:create'].invoke
+      # Rake::Task['db:migrate'].invoke
+
+
+    end
+
+    def ensure_database_config_file_exists(fn)
+      return if File.exist? fn
+      FileUtils.mkdir_p File.dirname fn
+      db = {
+          :development => {
+              adapter: 'sqlite3',
+              database: File.join(File.dirname(fn), 'db', 'development.db')
+          },
+          :test => {
+              adapter: 'sqlite3',
+              database: File.join(File.dirname(fn), 'db', 'test.db')
+          },
+          :production => {
+              adapter: 'sqlite3',
+              database: File.join(File.dirname(fn), 'db', 'production.db')
+          }
+      }
+      File.open(fn, 'w') {|f| f.write(db.to_yaml) }
+    end
+    def database_config_file(options)
+      if File.exist? options.database_config_file
+        options.database_config_file
+      else
+        File.join(options.data_dir, options.database_config_file)
+      end
+    end
+  end
+end

data/lib/agile_proxy/config.rb

@@ -12,7 +12,7 @@ module AgileProxy
                   :persist_cache, :ignore_cache_port, :non_successful_cache_disabled, :non_successful_error_level,
                   :non_whitelisted_requests_disabled, :cache_path, :proxy_port, :proxied_request_inactivity_timeout,
                   :proxied_request_connect_timeout, :dynamic_jsonp, :dynamic_jsonp_keys,
-                  :webserver_host, :webserver_port, :database_config_file, :environment
+                  :webserver_host, :webserver_port, :server_host, :server_port, :database_config_file, :environment
 
     def initialize
       @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
@@ -39,6 +39,8 @@ module AgileProxy
       @proxied_request_connect_timeout = 5
       @webserver_port = 3020
       @webserver_host = 'localhost'
+      @server_port = 3030
+      @server_host = 'localhost'
       @database_config_file = File.join(File.dirname(__FILE__), '..', '..', 'config.yml')
       @environment = ENV['AGILE_PROXY_ENV']
     end

data/lib/agile_proxy/handlers/stub_handler.rb

@@ -77,7 +77,12 @@ module AgileProxy
     end
 
     def collection(username, password)
-      Application.where(username: username, password: password).first.request_specs
+      #An empty string and NULL are the same thing here.  The UI has no way of sending NULL when creating an application
+      if (username.nil? && password.nil?)
+        Application.where('(username = ? OR username IS NULL) AND (password = ? OR password IS NULL)', '', '').first.request_specs
+      else
+        Application.where(username: username, password: password).first.request_specs
+      end
     end
 
     def short_list(username, password, _method, url)
@@ -122,6 +127,8 @@ module AgileProxy
 
     def call(env)
       request = ActionDispatch::Request.new(env)
+      request.params  #Might seem odd, but action dispatch request is a bit naughty and adds the appropriate
+                      # bits to ENV during access to this getter when used for the first time
       env['action_dispatch.request.parameters'].merge!(
           env['action_dispatch.request.request_parameters']
       ) unless request.content_length.zero?

data/lib/agile_proxy/server.rb

@@ -8,6 +8,7 @@ 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'
 module AgileProxy
   #
@@ -44,6 +45,12 @@ module AgileProxy
       "http://#{webserver_host}:#{webserver_port}"
     end
 
+    # The url that the direct web server can be accessed from
+    # @return [String] The URL
+    def server_url
+      "http://#{server_host}:#{server_port}"
+    end
+
     # The host that the proxy server is running on
     # @return [String] The host
     def host
@@ -68,6 +75,18 @@ module AgileProxy
       AgileProxy.config.webserver_port
     end
 
+    # The host that the direct server is running on
+    # @return [String] The host
+    def server_host
+      AgileProxy.config.server_host
+    end
+
+    # The port that the direct server is running on
+    # @return [String] The port
+    def server_port
+      AgileProxy.config.server_port
+    end
+
     protected
 
     def main_loop
@@ -77,8 +96,9 @@ module AgileProxy
           puts e.backtrace.join("\n")
         end
         AgileProxy::Servers::Api.start(webserver_host, webserver_port)
+        AgileProxy::Servers::RequestSpecDirect.start(server_host, server_port)
         @request_spec_server = AgileProxy::Servers::RequestSpec.start
-        AgileProxy.log(:info, "agile-proxy: Proxy listening on #{url} and webserver listening on #{webserver_url}")
+        AgileProxy.log(:info, "agile-proxy: Proxy listening on #{url}, API webserver listening on #{webserver_url} and Direct webserver listening on #{server_url}")
       end
     end
   end

data/lib/agile_proxy/servers/request_spec_direct.rb

@@ -0,0 +1,39 @@
+require 'rack'
+require 'thin'
+
+module AgileProxy
+  module Servers
+    #
+    # The API Server
+    #
+    # This server is a RACK server responsible for providing access to the system
+    # using REST requests.
+    # This allows remote programming of the proxy using either a client adapter or the built in user interface
+    module RequestSpecDirect
+      ROOT = File.expand_path '../../../', File.dirname(__FILE__)
+      class << self
+        #
+        # Starts the server on the given host and port
+        # @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
+            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
+          )
+        end
+      end
+    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.11'
+  VERSION = '0.1.12'
 end

data/spec/integration/helpers/request_spec_helper.rb

@@ -1,39 +1,46 @@
+require 'rest_client'
 module AgileProxy
   module Test
     module Integration
       # A helper for 'request spec' integration tests
       module RequestSpecHelper
         def load_small_set_of_request_specs(options = {})
-          let(:recordings_resource) { RestClient::Resource.new "http://localhost:3020/api/v1/users/1/applications/#{@recording_application_id}/recordings", headers: { content_type: 'application/json' } }
+          let(:recordings_resource) { RestClient::Resource.new "http://localhost:#{api_port}/api/v1/users/1/applications/#{@recording_application_id}/recordings", headers: { content_type: 'application/json' } }
           before :context do
 
             def configure_applications
               application_resource.delete  # Delete all applications
               @non_recording_application_id = JSON.parse(application_resource.post user_id: 1, name: 'Non recording app', username: 'anonymous', password: 'password')['id']
               @recording_application_id = JSON.parse(application_resource.post user_id: 1, name: 'Recording app', username: 'recording', password: 'password', record_requests: true)['id']
+              @direct_application_id = JSON.parse(application_resource.post user_id: 1, name: 'Direct app', username: nil, password: nil, record_requests: false)['id']
             end
 
             def application_resource
-              @__application_resource ||= RestClient::Resource.new 'http://localhost:3020/api/v1/users/1/applications', headers: { content_type: 'application/json' }
+              @__application_resource ||= RestClient::Resource.new "http://localhost:#{api_port}/api/v1/users/1/applications", headers: { content_type: 'application/json' }
             end
 
             def create_request_spec(attrs)
               non_recording_resource.post ActiveSupport::JSON.encode attrs
               recording_resource.post ActiveSupport::JSON.encode attrs
+              direct_resource.post ActiveSupport::JSON.encode attrs
             end
 
             def non_recording_resource
-              @__non_recording_resource ||= RestClient::Resource.new "http://localhost:3020/api/v1/users/1/applications/#{@non_recording_application_id}/request_specs", headers: { content_type: 'application/json' }
+              @__non_recording_resource ||= RestClient::Resource.new "http://localhost:#{api_port}/api/v1/users/1/applications/#{@non_recording_application_id}/request_specs", headers: { content_type: 'application/json' }
             end
 
             def recording_resource
-              @__recording_resource ||= RestClient::Resource.new "http://localhost:3020/api/v1/users/1/applications/#{@recording_application_id}/request_specs", headers: { content_type: 'application/json' }
+              @__recording_resource ||= RestClient::Resource.new "http://localhost:#{api_port}/api/v1/users/1/applications/#{@recording_application_id}/request_specs", headers: { content_type: 'application/json' }
+            end
+
+            def direct_resource
+              @__direct_resource ||= RestClient::Resource.new "http://localhost:#{api_port}/api/v1/users/1/applications/#{@direct_application_id}/request_specs", headers: { content_type: 'application/json' }
             end
 
             # Delete all first
             configure_applications
             # Now, add some stubs via the REST interface
-            [@http_url, @https_url].each do |url|
+            [@http_url, @https_url, @http_url_no_proxy, @https_url_no_proxy].each do |url|
               create_request_spec url: "#{url}/index.html", response: { content_type: 'text/html', content: '<html><body>This Is An Older Mock</body></html>' } #This is intentional - the system should always use the latest
               create_request_spec url: "#{url}/index.html", response: { content_type: 'text/html', content: '<html><body>Mocked Content</body></html>' }
               create_request_spec url: "#{url}/api/forums", response: { content_type: 'application/json', content: JSON.pretty_generate(forums: [], total: 0) }

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

@@ -339,7 +339,7 @@ shared_examples_for 'a cache' do
     end.to_not change { r.body }
   end
 end
-describe AgileProxy::Server do
+describe AgileProxy::Server, :type => :integration do
   extend AgileProxy::Test::Integration::RequestSpecHelper
   describe 'Without recording' do
     load_small_set_of_request_specs
@@ -347,12 +347,17 @@ describe AgileProxy::Server do
       # Adding non-valid Faraday options throw an error: https://github.com/arsduo/koala/pull/311
       # Valid options: :request, :proxy, :ssl, :builder, :url, :parallel_manager, :params, :headers, :builder_class
       faraday_options = {
-        proxy: { uri: 'http://anonymous:password@localhost:3100' },
-        request: { timeout: 10.0 }
+          request: {timeout: 10.0}
       }
-      @http       = Faraday.new @http_url,  faraday_options
-      @https      = Faraday.new @https_url, faraday_options.merge(ssl: { verify: false })
-      @http_error = Faraday.new @error_url, faraday_options
+      faraday_options_with_proxy = faraday_options.merge({
+        proxy: { uri: "http://anonymous:password@localhost:#{proxy_port}" }
+      })
+      @http       = Faraday.new @http_url,  faraday_options_with_proxy
+      @https      = Faraday.new @https_url, faraday_options_with_proxy.merge(ssl: { verify: false })
+      @http_no_proxy       = Faraday.new @http_url_no_proxy,  faraday_options
+      @https_no_proxy      = Faraday.new @https_url_no_proxy, faraday_options.merge(ssl: { verify: false })
+      @http_error = Faraday.new @error_url, faraday_options_with_proxy
+      @http_error_no_proxy = Faraday.new @error_url, faraday_options_with_proxy
     end
     context 'proxying' do
       context 'HTTP' do
@@ -365,18 +370,27 @@ describe AgileProxy::Server do
       end
     end
     context 'stubbing' do
-      context 'HTTP' do
-        let!(:url)  { @http_url }
-        let!(:http) { @http }
-        it_should_behave_like 'a request stub'
-      end
+      context 'In Proxy Mode' do
+        context 'HTTP' do
+          let!(:url)  { @http_url }
+          let!(:http) { @http }
+          it_should_behave_like 'a request stub'
+        end
 
-      context 'HTTPS' do
-        let!(:url)  { @https_url }
-        let!(:http) { @https }
-        it_should_behave_like 'a request stub'
+        context 'HTTPS' do
+          let!(:url)  { @https_url }
+          let!(:http) { @https }
+          it_should_behave_like 'a request stub'
+        end
+      end
+      #Server mode only supports http - no real point for https at the moment
+      context 'In Server Mode' do
+        context 'HTTP' do
+          let!(:url)  { @http_url_no_proxy }
+          let!(:http) { @http_no_proxy }
+          it_should_behave_like 'a request stub'
+        end
       end
-
     end
   end
   describe 'With recording' do
@@ -385,7 +399,7 @@ describe AgileProxy::Server do
       # Adding non-valid Faraday options throw an error: https://github.com/arsduo/koala/pull/311
       # Valid options: :request, :proxy, :ssl, :builder, :url, :parallel_manager, :params, :headers, :builder_class
       faraday_options = {
-        proxy: { uri: 'http://recording:password@localhost:3100' },
+        proxy: { uri: 'http://recording:password@localhost:3101' },
         request: { timeout: 10.0 }
       }
 

data/spec/integration_spec_helper.rb

@@ -1,5 +1,4 @@
 require 'require_all'
-require 'airborne'
 
 require 'agile_proxy'
 require_all 'spec/support/**/*.rb'
@@ -7,12 +6,10 @@ require_all 'lib/agile_proxy/model'
 require_all 'spec/integration/helpers'
 require 'faker'
 RSpec.configure do |config|
-  include AgileProxy::TestServer
-  config.before :all do
+  config.include AgileProxy::TestServer, :type => :integration
+  config.before :all, :type => :integration do
     start_test_servers
+    start_proxy_server
   end
 
 end
-Airborne.configure do |config|
-  config.base_url = 'http://localhost:3020'
-end

data/spec/support/test_server.rb

@@ -1,6 +1,7 @@
 require 'eventmachine'
 require 'thin'
 require 'faraday'
+require 'agile_proxy/cli'
 
 module Thin
   module Backends
@@ -18,6 +19,15 @@ module AgileProxy
     def initialize
       Thin::Logging.silent = true
     end
+    def proxy_port
+      3101
+    end
+    def api_port
+      3021
+    end
+    def server_port
+      3022
+    end
 
     def start_test_servers
       q = Queue.new
@@ -40,6 +50,15 @@ module AgileProxy
       @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 1
     end
 
     def echo_app_setup(response_code = 200)

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

@@ -92,6 +92,7 @@ describe AgileProxy::StubHandler do
           it 'Should match with a post on the same domain but not with a get or a post on a different domain' 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
           end

data/spec/unit/agile_proxy/server_spec.rb

@@ -12,6 +12,7 @@ describe AgileProxy::Server do
     end
   end
   let(:request_spec_server_class) { Class.new }
+  let(:request_spec_direct_server_class) { Class.new }
   let(:api_server_class) { Class.new }
   let(:em_class) { Class.new }
   let(:socket_class) { Class.new }
@@ -20,6 +21,7 @@ describe AgileProxy::Server do
     stub_const('::EM', em_class)
     stub_const('AgileProxy::Servers::Api', api_server_class)
     stub_const('AgileProxy::Servers::RequestSpec', request_spec_server_class)
+    stub_const('AgileProxy::Servers::RequestSpecDirect', request_spec_direct_server_class)
   end
   context 'Initialization' do
     context 'In test environment' do
@@ -64,6 +66,7 @@ describe AgileProxy::Server do
         inner_loop = blk
       end
       expect(request_spec_server_class).to receive(:start).and_return request_spec_server_class.new
+      expect(request_spec_direct_server_class).to receive(:start).and_return request_spec_direct_server_class.new
       subject.start
       inner_loop.call
     end

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

@@ -0,0 +1,47 @@
+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(:rack_static_class) { Class.new }
+  let(:stub_handler_class) { Class.new }
+  before :each do
+    stub_const('Rack::Builder', rack_builder_class)
+    stub_const('Rack::Static', rack_static_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
+    builder_block = nil
+    expect(rack_builder_class).to receive(:app) do |&blk|
+      builder_block = blk
+      rack_builder_class.new.instance_eval(&blk)
+    end
+    expect_any_instance_of(rack_builder_class).to receive(:use).with(rack_static_class, root: instance_of(String), urls: ['/ui', '/images'], index: 'index.html')
+    expect_any_instance_of(rack_builder_class).to receive(:map) do |_instance, path, &blk|
+      expect(path).to eql '/'
+      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)
+    subject.start('localhost', '3030', ['/ui', '/images'])
+
+  end
+  it 'Should start a rack server with no static handler if the start method is called with 2 params' do
+    builder_block = nil
+    expect(rack_builder_class).to receive(:app) do |&blk|
+      builder_block = blk
+      rack_builder_class.new.instance_eval(&blk)
+    end
+    expect_any_instance_of(rack_builder_class).not_to receive(:use)
+    expect_any_instance_of(rack_builder_class).to receive(:map) do |_instance, path, &blk|
+      expect(path).to eql '/'
+      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)
+    subject.start('localhost', '3030')
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agile-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -2132,6 +2132,7 @@ files:
 - lib/agile_proxy/api/recordings.rb
 - lib/agile_proxy/api/request_specs.rb
 - lib/agile_proxy/api/root.rb
+- lib/agile_proxy/cli.rb
 - lib/agile_proxy/config.rb
 - lib/agile_proxy/handlers/handler.rb
 - lib/agile_proxy/handlers/proxy_handler.rb
@@ -2150,6 +2151,7 @@ files:
 - lib/agile_proxy/server.rb
 - lib/agile_proxy/servers/api.rb
 - lib/agile_proxy/servers/request_spec.rb
+- lib/agile_proxy/servers/request_spec_direct.rb
 - lib/agile_proxy/version.rb
 - load_proxy.js
 - log/.gitkeep
@@ -2174,6 +2176,7 @@ files:
 - spec/unit/agile_proxy/model/response_spec.rb
 - spec/unit/agile_proxy/server_spec.rb
 - spec/unit/agile_proxy/servers/api_spec.rb
+- spec/unit/agile_proxy/servers/request_spec_direct_spec.rb
 - spec/unit/agile_proxy/servers/request_spec_spec.rb
 homepage: https://github.com/garytaylor/agileproxy
 licenses: []
@@ -2221,5 +2224,6 @@ test_files:
 - spec/unit/agile_proxy/model/response_spec.rb
 - spec/unit/agile_proxy/server_spec.rb
 - spec/unit/agile_proxy/servers/api_spec.rb
+- spec/unit/agile_proxy/servers/request_spec_direct_spec.rb
 - spec/unit/agile_proxy/servers/request_spec_spec.rb
 has_rdoc: