proxy-server 0.0.2 → 0.0.3

data/.gitignore

@@ -1,4 +1,4 @@
-.idea
-.bundle
-coverage
-pkg
+.idea
+.bundle
+coverage
+pkg

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source :rubygems
 gemspec

data/Gemfile.lock

@@ -1,54 +1,66 @@
-PATH
-  remote: .
-  specs:
-    proxy-server (0.0.2)
-      httpclient
-      json (>= 1.4.6)
-      sinatra (>= 1.2.6)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.6)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    httpclient (2.2.1)
-    json (1.6.1)
-    multi_json (1.0.3)
-    rack (1.3.4)
-    rack-protection (1.1.4)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sinatra (1.3.1)
-      rack (>= 1.3.4, ~> 1.3)
-      rack-protection (>= 1.1.2, ~> 1.1)
-      tilt (>= 1.3.3, ~> 1.3)
-    tilt (1.3.3)
-    webmock (1.7.6)
-      addressable (~> 2.2, > 2.2.5)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  proxy-server!
-  rack-test (>= 0.5.7)
-  rake (>= 0.9.2)
-  rspec (>= 2.6.0)
-  simplecov (>= 0.4.2)
-  webmock
+PATH
+  remote: .
+  specs:
+    proxy-server (0.0.3)
+      httpclient
+      json (>= 1.4.6)
+      sinatra (>= 1.2.6)
+      thin
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    crack (0.3.1)
+    daemons (1.1.4)
+    diff-lcs (1.1.3)
+    eventmachine (1.0.0.beta.4.1-x86-mingw32)
+    httpclient (2.2.2)
+    json (1.6.1)
+    multi_json (1.0.3)
+    rack (1.3.4)
+    rack-protection (1.1.4)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.0)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    thin (1.2.11)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thin (1.2.11-x86-mingw32)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    tilt (1.3.3)
+    webmock (1.7.6)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+  x86-mingw32
+
+DEPENDENCIES
+  proxy-server!
+  rack-test (>= 0.5.7)
+  rake (>= 0.9.2)
+  rspec (>= 2.7.0)
+  simplecov (>= 0.4.2)
+  webmock

data/Rakefile

@@ -1,19 +1,19 @@
-require 'rubygems'
-require 'bundler'
-require 'rspec/core/rake_task'
-Bundler::GemHelper.install_tasks
-
-task :coverage do
-  require 'simplecov'
-  require 'rspec/core'
-
-  SimpleCov.start do
-    add_group "lib", "lib"
-  end
-  SimpleCov.start
-  RSpec::Core::Runner.run %w[spec]
-end
-
-
-require 'rake/clean'
-CLEAN.include %w(**/*.{log,pyc,rbc,tgz} doc)
+require 'rubygems'
+require 'bundler'
+require 'rspec/core/rake_task'
+Bundler::GemHelper.install_tasks
+
+task :coverage do
+  require 'simplecov'
+  require 'rspec/core'
+
+  SimpleCov.start do
+    add_group "lib", "lib"
+  end
+  SimpleCov.start
+  RSpec::Core::Runner.run %w[spec]
+end
+
+
+require 'rake/clean'
+CLEAN.include %w(**/*.{log,pyc,rbc,tgz} doc)

data/examples/proxy_in_process.rb

@@ -1,28 +1,23 @@
-require 'rubygems'
-require 'proxy-server'
-require 'rest_client' # you will need to install this via gem install rest-client / bundler etc
-require 'json'
-
-ENV.clear
-
-Thread.new do
- ProxyManager.run! :port => 4983
-end
-
-until_proxy_is_running = 2
-sleep until_proxy_is_running # need to implement the ability to wait for the proxy to be running
-
-proxy = JSON.parse(RestClient.post 'http://localhost:4983/proxies')
-
-sleep until_proxy_is_running
-
-RestClient.post "http://localhost:4983/proxies/#{proxy['port']}/requests", {:track => 'google.com'}
-
-client = HTTPClient.new :proxy => "http://localhost:#{proxy['port']}"
-client.get 'http://www.google.com'
-client.get 'http://github.com'
-
-p JSON.parse(HTTPClient.get("http://localhost:4983/proxies/#{proxy['port']}/requests").body)
-
-
-
+require 'rubygems'
+require 'proxy-server'
+require 'rest_client' # you will need to install this via gem install rest-client / bundler etc
+require 'json'
+
+Thread.abort_on_exception=true
+Thread.new do
+  ProxyManager.settings.port = 4983
+  ProxyManager.run!
+end
+
+until_proxy_is_running = 3
+sleep until_proxy_is_running # need to implement the ability to wait for the proxy to be running
+
+proxy = JSON.parse(RestClient.post 'http://localhost:4983/proxies', {})
+
+RestClient.post "http://localhost:4983/proxies/#{proxy['port']}/requests", {:track => 'google.com'}
+
+client = HTTPClient.new :proxy => "http://localhost:#{proxy['port']}"
+client.get 'http://www.google.com'
+client.get 'http://github.com'
+
+p JSON.parse(HTTPClient.get("http://localhost:4983/proxies/#{proxy['port']}/requests").body)

data/lib/proxy/port_prober.rb

@@ -0,0 +1,15 @@
+# lovingly reused from selenium-webdriver
+
+class PortProber
+  def self.above(port)
+    port += 1 until free? port
+    port
+  end
+
+  def self.free?(port)
+    TCPServer.new('localhost', port).close
+    true
+  rescue SocketError, Errno::EADDRINUSE
+    false
+  end
+end

data/lib/proxy/proxy_manager.rb

@@ -1,70 +1,87 @@
-require_relative './proxy_server'
-require 'sinatra/base'
-require 'json'
-
-class ProxyManager < Sinatra::Base
-  START_PORT = 5000
-
-  attr_reader :running_proxy_servers, :assigned_proxy_ports
-  disable :show_exceptions
-
-  def initialize()
-    @running_proxy_servers = {}
-    @assigned_proxy_ports = []
-    super
-  end
-
-  get '/proxies' do
-    assigned_proxy_ports.to_json
-  end
-
-  post '/proxies' do
-    new_proxy_port = assigned_proxy_ports.max
-    new_proxy_port += 1 unless new_proxy_port.nil?
-    new_proxy_port ||= START_PORT
-
-    assigned_proxy_ports << new_proxy_port
-
-    options = {
-        :port => new_proxy_port
-    }
-
-    options[:proxy] = params[:proxy] if params[:proxy]
-    start_proxy(options)
-
-    {:port => new_proxy_port}.to_json
-  end
-
-  delete '/proxies' do
-    assigned_proxy_ports.clear
-  end
-
-  post '/proxies/:port/requests' do |port|
-    proxy_server = get_proxy(port.to_i)
-    proxy_server.track_request(params[:track])
-  end
-
-  get '/proxies/:port/requests' do |port|
-    proxy_server = get_proxy(port.to_i)
-    proxy_server.requests.to_json
-  end
-
-  post '/proxies/:port/requests/substitute' do |port|
-    proxy_server = get_proxy(port.to_i)
-    options = {}
-    options[:body] = params[:body] if params[:body]
-    options[:url] = params[:url] if params[:url]
-    proxy_server.substitute_request(params[:pattern], options)
-  end
-
-  def get_proxy(port)
-    running_proxy_servers[port]
-  end
-
-  def start_proxy(options)
-    proxy_server = ProxyServer.new(options)
-    proxy_server.run
-    running_proxy_servers[options[:port]] = proxy_server
-  end
-end
-
+require_relative './proxy_server'
+require_relative './port_prober'
+require 'sinatra/base'
+require 'json'
+
+class ProxyManager < Sinatra::Base
+  START_PORT = 5000
+
+  attr_reader :running_proxy_servers, :assigned_proxy_ports
+  disable :show_exceptions
+
+  def initialize()
+    @running_proxy_servers = {}
+    @assigned_proxy_ports = []
+    super
+  end
+
+  get '/proxies' do
+    assigned_proxy_ports.to_json
+  end
+
+  post '/proxies' do
+    new_proxy_port = find_proxy_port
+    assigned_proxy_ports << new_proxy_port
+
+    options = {
+        :port => new_proxy_port
+    }
+
+    options[:proxy] = params[:proxy] if params[:proxy]
+    start_proxy(options)
+
+    {:port => new_proxy_port}.to_json
+  end
+
+  delete '/proxies' do
+    assigned_proxy_ports.clear
+  end
+
+  delete '/proxies/:port' do |port|
+    stop_proxy port.to_i
+  end
+
+  post '/proxies/:port/reset' do |port|
+    proxy_server = get_proxy(port.to_i)
+    proxy_server.reset
+  end
+
+  post '/proxies/:port/requests' do |port|
+    proxy_server = get_proxy(port.to_i)
+    proxy_server.track_request(params[:track])
+  end
+
+  get '/proxies/:port/requests' do |port|
+    proxy_server = get_proxy(port.to_i)
+    proxy_server.requests.to_json
+  end
+
+  post '/proxies/:port/requests/substitute' do |port|
+    proxy_server = get_proxy(port.to_i)
+    options = {}
+    options[:body] = params[:body] if params[:body]
+    options[:url] = params[:url] if params[:url]
+    proxy_server.substitute_request(params[:pattern], options)
+  end
+
+  def get_proxy(port)
+    running_proxy_servers[port]
+  end
+
+  def stop_proxy(port)
+    proxy_server = running_proxy_servers[port]
+    proxy_server.stop
+    running_proxy_servers.delete proxy_server
+  end
+
+  def start_proxy(options)
+    proxy_server = ProxyServer.new(options)
+    proxy_server.run
+    running_proxy_servers[options[:port]] = proxy_server
+  end
+
+ def find_proxy_port
+    new_proxy_port = (assigned_proxy_ports.max || ProxyManager::START_PORT) + 1
+    PortProber.above(new_proxy_port)
+  end
+end

data/lib/proxy/proxy_server.rb

@@ -1,104 +1,117 @@
-require 'rack'
-require 'httpclient'
-
-class ProxyServer
-
-  attr_reader :upstream_proxy, :port
-  attr_reader :requests
-
-  DEFAULT_PORT = 8080
-
-  def initialize(options = {})
-    @upstream_proxy = options[:proxy]
-    @client = create_http_client
-
-    @port = options.fetch(:port, DEFAULT_PORT)
-
-    @substitute_requests = {}
-    @requests = []
-    @track_requests = []
-  end
-
-  def create_http_client
-    HTTPClient.new :proxy => @upstream_proxy
-  end
-
-  def run
-    Thread.new do
-      @handler = Rack::Handler::WEBrick
-
-      @handler.run self, :Port => self.port
-    end
-  end
-
-  def call(env)
-    log_request env
-
-    response = get_substitution(env)
-    return response unless response.nil?
-
-    method  = env['REQUEST_METHOD']
-    uri     = "http://#{env['HTTP_HOST']}#{env['PATH_INFO']}"
-    params  = get_params(env['QUERY_STRING'])
-    body    = get_request_body(env)
-    headers = get_request_headers(env)
-    response = @client.request(method, uri, params, body, headers)
-
-    [ response.status, response.headers, [response.body] ]
-  end
-
-  def get_substitution(env)
-    uri = env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'] ? '?'+env['QUERY_STRING'] : ''}"
-    @substitute_requests.each do |pattern, options|
-      if Regexp.new(pattern) =~ uri
-        return get_substituted_response(options)
-      end
-    end
-    nil
-  end
-
-  def get_substituted_response(options)
-    if options[:body]
-      [ 200, {}, [options[:body]] ]
-    elsif options[:url]
-      response = @client.get(options[:url])
-      [ response.status, response.headers, [response.body] ]
-    end
-  end
-
-  def substitute_request(pattern, options)
-    @substitute_requests[pattern] = options
-  end
-
-  def track_request(pattern)
-    @track_requests << pattern
-  end
-
-  def get_params(query_string)
-    query_string.split('&').inject({}) do |hsh, i|
-      kv = i.split('='); hsh[kv[0]] = kv[1]; hsh
-    end unless query_string.nil? or query_string.length == 0
-  end
-
-  def log_request(env)
-
-    url = env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'].length>0 ? '?'+env['QUERY_STRING'] : ''}"
-    @track_requests.each do |pattern|
-      @requests << url if Regexp.new(pattern) =~ url
-    end
-  end
-
-  private
-  def get_request_body(env)
-    body = ''
-    env['rack.input'].each_line {|string| body << string }
-    body
-  end
-
-  def get_request_headers(env)
-    headers = {}
-    env.each {|k,v| if k =~ /HTTP_(\w+)/ then headers[$1] = v end }
-    headers
-  end
-end
-
+require 'rack'
+require 'httpclient'
+
+class ProxyServer
+
+  attr_reader :upstream_proxy, :port
+  attr_reader :requests, :track_requests, :substitute_requests
+
+  DEFAULT_PORT = 8080
+
+  def initialize(options = {})
+    @upstream_proxy = options[:proxy]
+    @client = create_http_client
+
+    @port = options.fetch(:port, DEFAULT_PORT)
+
+    @substitute_requests = {}
+    @requests = []
+    @track_requests = []
+  end
+
+  def create_http_client
+    HTTPClient.new :proxy => @upstream_proxy
+  end
+
+  def run
+    @proxy_thread = Thread.new do
+      Rack::Handler::WEBrick.run self, :Port => self.port, :AccessLog => []
+    end
+  end
+
+  def stop
+    Thread.kill @proxy_thread if @proxy_thread
+  end
+
+  def reset
+    @requests.clear
+    @track_requests.clear
+    @substitute_requests.clear
+  end
+
+  def call(env)
+    log_request env
+
+    response = get_substitution(env)
+    return response unless response.nil?
+
+    method  = env['REQUEST_METHOD']
+    uri     = "http://#{env['HTTP_HOST']}#{env['PATH_INFO']}"
+    params  = get_params(env['QUERY_STRING'])
+    body    = get_request_body(env)
+    headers = get_request_headers(env)
+    #
+    #p "YES" if uri.include? 'unicast.com'
+    #p uri if uri.include? 'unicast.com'
+    #[ 200, {}, ['']] if uri.include? 'unicast.com'
+
+    response = @client.request(method, uri, params, body, headers)
+
+    [ response.status, response.headers, [response.body] ]
+  end
+
+  def get_substitution(env)
+    uri = env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'] ? '?'+env['QUERY_STRING'] : ''}"
+    @substitute_requests.each do |pattern, options|
+      if Regexp.new(pattern) =~ uri
+        return get_substituted_response(options)
+      end
+    end
+    nil
+  end
+
+  def get_substituted_response(options)
+    if options[:body]
+      [ 200, {}, [options[:body]] ]
+    elsif options[:url]
+      response = @client.get(options[:url])
+      [ response.status, response.headers, [response.body] ]
+    end
+  end
+
+  def substitute_request(pattern, options)
+    @substitute_requests[pattern] = options
+  end
+
+  def track_request(pattern)
+    @track_requests << pattern
+  end
+
+  def get_params(query_string)
+    query_string.split('&').inject({}) do |hsh, i|
+      kv = i.split('='); hsh[kv[0]] = kv[1]; hsh
+    end unless query_string.nil? or query_string.length == 0
+  end
+
+  def log_request(env)
+
+    url = env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'].length>0 ? '?'+env['QUERY_STRING'] : ''}"
+    @track_requests.each do |pattern|
+      @requests << url if Regexp.new(pattern) =~ url
+    end
+  end
+
+  private
+  def get_request_body(env)
+    body = ''
+    env['rack.input'].each_line {|string| body << string }
+    body
+  end
+
+  def get_request_headers(env)
+    headers = {}
+    env.each {|k,v| if k =~ /HTTP_(\w+)/ then headers[$1] = v end }
+    headers
+  end
+end
+

data/lib/proxy-server.rb

@@ -1,2 +1,2 @@
-require_relative './proxy/proxy_server'
+require_relative './proxy/proxy_server'
 require_relative './proxy/proxy_manager'

data/proxy-server.gemspec

@@ -1,32 +1,33 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name = 'proxy-server'
-  s.version = '0.0.2'
-  s.authors = ["Derek Ekins"]
-  s.description = 'Proxy server'
-  s.summary = "proxy-server-#{s.version}"
-  s.email = 'derek@spathi.com'
-  s.homepage = "http://github.com/dereke/proxy-server"
-
-  s.platform = Gem::Platform::RUBY
-
-  s.add_dependency 'json', '>= 1.4.6'
-  s.add_dependency 'sinatra', '>= 1.2.6'
-  s.add_dependency 'httpclient'
-
-  s.add_development_dependency 'rake', '>= 0.9.2'
-  s.add_development_dependency 'rspec', '>= 2.6.0'
-  s.add_development_dependency 'simplecov', '>= 0.4.2'
-  s.add_development_dependency 'webmock'
-
-
-  s.add_development_dependency 'rack-test', '>= 0.5.7'
-
-  s.rubygems_version = ">= 1.6.1"
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {spec}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_path = "lib"
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = 'proxy-server'
+  s.version = '0.0.3'
+  s.authors = ["Derek Ekins"]
+  s.description = 'Proxy server'
+  s.summary = "proxy-server-#{s.version}"
+  s.email = 'derek@spathi.com'
+  s.homepage = "http://github.com/dereke/proxy-server"
+
+  s.platform = Gem::Platform::RUBY
+
+  s.add_dependency 'json', '>= 1.4.6'
+  s.add_dependency 'sinatra', '>= 1.2.6'
+  s.add_dependency 'httpclient'
+  s.add_dependency 'thin'
+
+  s.add_development_dependency 'rake', '>= 0.9.2'
+  s.add_development_dependency 'rspec', '>= 2.7.0'
+  s.add_development_dependency 'simplecov', '>= 0.4.2'
+  s.add_development_dependency 'webmock'
+
+
+  s.add_development_dependency 'rack-test', '>= 0.5.7'
+
+  s.rubygems_version = ">= 1.6.1"
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {spec}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_path = "lib"
 end

data/spec/proxy/proxy_manager_spec.rb

@@ -1,77 +1,96 @@
-require_relative '../spec_helper'
-require_relative '../../lib/proxy/proxy_manager'
-require 'rack/test'
-require 'webmock/rspec'
-
-describe ProxyManager do
-  include Rack::Test::Methods
-
-  before do
-    @proxy_server = Object.new
-    ProxyManager.any_instance.stub(:start_proxy).with(anything()).and_return(@proxy_server)
-    ProxyManager.any_instance.stub(:get_proxy).with(anything()).and_return(@proxy_server)
-  end
-
-  let(:app) { ProxyManager.new }
-
-  it "should create a new proxy when I ask for one" do
-    response = post '/proxies'
-    proxy = JSON.parse(response.body)
-    proxy.should == {'port' => ProxyManager::START_PORT}
-  end
-
-  it "should create a new proxy with an upstream proxy when asked to" do
-    ProxyManager.any_instance.should_receive(:start_proxy).with(hash_including(:proxy => 'http://my_proxy:80'))
-    response = post '/proxies', {:proxy => 'http://my_proxy:80'}
-  end
-
-  it "should tell me about all the proxies that have been created" do
-    post '/proxies'
-    response = get '/proxies'
-    JSON.parse(response.body).should == [ProxyManager::START_PORT]
-  end
-
-  it "should remove all proxies when asked" do
-    post '/proxies'
-    delete '/proxies'
-
-    response = get '/proxies'
-    JSON.parse(response.body).should == []
-  end
-
-  it "should assign new proxy ports when more than one is asked for" do
-    first_expected_proxy = ProxyManager::START_PORT
-    second_expected_proxy = ProxyManager::START_PORT + 1
-
-    first_response = post '/proxies'
-    second_response = post '/proxies'
-
-    JSON.parse(first_response.body)['port'].should == first_expected_proxy
-    JSON.parse(second_response.body)['port'].should == second_expected_proxy
-  end
-
-  it "ads a given url to a list of them to track" do
-    track_url = 'public/.*.js'
-
-    @proxy_server.should_receive(:track_request).with(track_url)
-    post "/proxies/1111/requests", {:track => track_url}
-  end
-
-  it "ads a given url to a list of them to track" do
-    @proxy_server.stub!(:requests).and_return(['request 1', 'request 2'])
-    response = get "/proxies/1111/requests"
-    requests = JSON.parse(response.body)
-    requests.should include('request 1')
-    requests.should include('request 2')
-  end
-
-  it "can substitute a request with another body" do
-    @proxy_server.should_receive(:substitute_request).with('*.js', :body => 'alert(1);')
-    post "/proxies/1111/requests/substitute", {:pattern => '*.js', :body => 'alert(1);'}
-  end
-
-  it "can substitute a request with another url" do
-    @proxy_server.should_receive(:substitute_request).with('*.js', :url => 'http://example.com/test.js')
-    post "/proxies/1111/requests/substitute", {:pattern => '*.js', :url => 'http://example.com/test.js'}
-  end
+require_relative '../spec_helper'
+require_relative '../../lib/proxy/proxy_manager'
+require 'rack/test'
+require 'webmock/rspec'
+
+describe ProxyManager do
+  include Rack::Test::Methods
+
+  before do
+    @proxy_server = mock('ProxyServer')
+    ProxyManager.any_instance.stub(:start_proxy).with(anything()).and_return(@proxy_server)
+    ProxyManager.any_instance.stub(:get_proxy).with(anything()).and_return(@proxy_server)
+  end
+
+  let(:app) { ProxyManager.new }
+
+  it "should create a new proxy when I ask for one" do
+    ProxyManager.any_instance.should_receive(:find_proxy_port).and_return(4000)
+    response = post '/proxies'
+    proxy = JSON.parse(response.body)
+    proxy.should == {'port' => 4000}
+  end
+
+  it "should create a new proxy with an upstream proxy when asked to" do
+    ProxyManager.any_instance.should_receive(:start_proxy).with(hash_including(:proxy => 'http://my_proxy:80'))
+    response = post '/proxies', {:proxy => 'http://my_proxy:80'}
+  end
+
+  it "should tell me about all the proxies that have been created" do
+    ProxyManager.any_instance.should_receive(:find_proxy_port).and_return(4000)
+
+    post '/proxies'
+    response = get '/proxies'
+    JSON.parse(response.body).should == [4000]
+  end
+
+  it "should remove all proxies when asked" do
+    post '/proxies'
+    delete '/proxies'
+
+    response = get '/proxies'
+    JSON.parse(response.body).should == []
+  end
+
+  it "should remove a proxy when asked to" do
+    running_proxy_port = JSON.parse(post('/proxies').body)['port']
+    ProxyManager.any_instance.should_receive(:stop_proxy).with(running_proxy_port)
+
+    response = delete "/proxies/#{running_proxy_port}"
+
+    response.status.should == 200
+  end
+
+  it "should assign new proxy ports when more than one is asked for" do
+    first_expected_proxy = 100
+    second_expected_proxy = 101
+    available_proxy_ports = [first_expected_proxy, second_expected_proxy]
+    ProxyManager.any_instance.stub(:find_proxy_port).and_return { available_proxy_ports.shift }
+
+    first_response = post '/proxies'
+    second_response = post '/proxies'
+
+    JSON.parse(first_response.body)['port'].should == first_expected_proxy
+    JSON.parse(second_response.body)['port'].should == second_expected_proxy
+  end
+
+  it "ads a given url to a list of them to track" do
+    track_url = 'public/.*.js'
+
+    @proxy_server.should_receive(:track_request).with(track_url)
+    post "/proxies/1111/requests", {:track => track_url}
+  end
+
+  it "ads a given url to a list of them to track" do
+    @proxy_server.stub!(:requests).and_return(['request 1', 'request 2'])
+    response = get "/proxies/1111/requests"
+    requests = JSON.parse(response.body)
+    requests.should include('request 1')
+    requests.should include('request 2')
+  end
+
+  it "can substitute a request with another body" do
+    @proxy_server.should_receive(:substitute_request).with('*.js', :body => 'alert(1);')
+    post "/proxies/1111/requests/substitute", {:pattern => '*.js', :body => 'alert(1);'}
+  end
+
+  it "can substitute a request with another url" do
+    @proxy_server.should_receive(:substitute_request).with('*.js', :url => 'http://example.com/test.js')
+    post "/proxies/1111/requests/substitute", {:pattern => '*.js', :url => 'http://example.com/test.js'}
+  end
+
+  it "can reset the configuration of a proxy" do
+    @proxy_server.should_receive(:reset)
+    post "/proxies/1111/reset"
+  end
 end

data/spec/proxy/proxy_server_spec.rb

@@ -1,81 +1,94 @@
-require_relative '../spec_helper'
-require_relative '../../lib/proxy/proxy_server'
-require 'rack/test'
-require 'webmock/rspec'
-
-describe ProxyServer do
-  include Rack::Test::Methods
-  before do
-    ENV.clear
-  end
-
-  let(:app) { ProxyServer.new }
-
-  it "can be configured with an upstream proxy" do
-    proxy_uri = 'http://test-proxy:80'
-    proxy = ProxyServer.new :proxy => proxy_uri
-    proxy.upstream_proxy.should == proxy_uri
-  end
-
-  it "can be configured to run on a specific port" do
-    proxy_port = 8080
-    proxy = ProxyServer.new :port => proxy_port
-    proxy.port.should == proxy_port
-  end
-
-  it "default the port when none is specified" do
-    proxy = ProxyServer.new
-    proxy.port.should == ProxyServer::DEFAULT_PORT
-  end
-
-  it "should allow requests" do
-    stub_request(:get, "http://www.example.com")
-
-    response = get 'http://www.example.com'
-    response.status.should == 200
-  end
-
-  it "should allow requests with query strings" do
-    stub_request(:get, "http://www.example.com?para=value")
-
-    response = get "http://www.example.com?para=value"
-    response.status.should == 200
-  end
-
-  it "can substitute the response of a request with a body of text" do
-    proxy = ProxyServer.new
-    expected_response = "this is not what you are looking for"
-    proxy.substitute_request '.*com', :body => expected_response
-
-    browser = Rack::Test::Session.new(Rack::MockSession.new(proxy))
-    response = browser.get 'http://www.google.com'
-    response.body.should == expected_response
-  end
-
-  it "can substitute the response of a request with another url to call" do
-    proxy = ProxyServer.new
-    substitute_url = "http://example.com"
-    expected_response_body = "substitute body"
-    stub_request(:get, substitute_url).to_return(:body => expected_response_body)
-    proxy.substitute_request '.*com', :url => substitute_url
-
-    browser = Rack::Test::Session.new(Rack::MockSession.new(proxy))
-    response = browser.get 'http://www.google.com'
-    response.body.should == expected_response_body
-  end
-
-  it "tracks a url that matches the pattern" do
-    proxy = ProxyServer.new
-    expected_response = "this is not what you are looking for"
-    proxy.track_request '.*com'
-
-    stub_request(:get, 'http://www.google.com/')
-    stub_request(:get, 'http://www.google.co.uk/')
-
-    browser = Rack::Test::Session.new(Rack::MockSession.new(proxy))
-    browser.get 'http://www.google.com/'
-    browser.get 'http://www.google.co.uk/'
-
-    proxy.requests.should include('http://www.google.com/')
-  end
-end
+require_relative '../spec_helper'
+require_relative '../../lib/proxy/proxy_server'
+require 'rack/test'
+require 'webmock/rspec'
+
+describe ProxyServer do
+  include Rack::Test::Methods
+
+  let(:app) { ProxyServer.new }
+
+  it "can be configured with an upstream proxy" do
+    proxy_uri = 'http://test-proxy:80'
+    proxy = ProxyServer.new :proxy => proxy_uri
+    proxy.upstream_proxy.should == proxy_uri
+  end
+
+  it "can be configured to run on a specific port" do
+    proxy_port = 8080
+    proxy = ProxyServer.new :port => proxy_port
+    proxy.port.should == proxy_port
+  end
+
+  it "default the port when none is specified" do
+    proxy = ProxyServer.new
+    proxy.port.should == ProxyServer::DEFAULT_PORT
+  end
+
+  it "should allow requests" do
+    stub_request(:get, "http://www.example.com")
+
+    response = get 'http://www.example.com'
+    response.status.should == 200
+  end
+
+  it "should allow requests with query strings" do
+    stub_request(:get, "http://www.example.com?para=value")
+
+    response = get "http://www.example.com?para=value"
+    response.status.should == 200
+  end
+
+  it "can substitute the response of a request with a body of text" do
+    proxy = ProxyServer.new
+    expected_response = "this is not what you are looking for"
+    proxy.substitute_request '.*com', :body => expected_response
+
+    browser = Rack::Test::Session.new(Rack::MockSession.new(proxy))
+    response = browser.get 'http://www.google.com'
+    response.body.should == expected_response
+  end
+
+  it "can substitute the response of a request with another url to call" do
+    proxy = ProxyServer.new
+    substitute_url = "http://example.com"
+    expected_response_body = "substitute body"
+    stub_request(:get, substitute_url).to_return(:body => expected_response_body)
+    proxy.substitute_request '.*com', :url => substitute_url
+
+    browser = Rack::Test::Session.new(Rack::MockSession.new(proxy))
+    response = browser.get 'http://www.google.com'
+    response.body.should == expected_response_body
+  end
+
+  it "tracks a url that matches the pattern" do
+    proxy = ProxyServer.new
+    expected_response = "this is not what you are looking for"
+    proxy.track_request '.*com'
+
+    stub_request(:get, 'http://www.google.com/')
+    stub_request(:get, 'http://www.google.co.uk/')
+
+    browser = Rack::Test::Session.new(Rack::MockSession.new(proxy))
+    browser.get 'http://www.google.com/'
+    browser.get 'http://www.google.co.uk/'
+
+    proxy.requests.should include('http://www.google.com/')
+  end
+
+  it "reset causes request tracking to be removed" do
+    proxy = ProxyServer.new
+    proxy.requests << 'request 1' << 'request 2'
+    proxy.track_requests << 'request 1' << 'request 2'
+    proxy.reset
+    proxy.requests.length.should == 0
+    proxy.track_requests.length.should == 0
+  end
+
+  it "reset causes request substituting to be removed" do
+      proxy = ProxyServer.new
+      proxy.substitute_requests['test']  = 'item'
+      proxy.reset
+      proxy.substitute_requests.length.should == 0
+    end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-require 'rspec'
-ENV['RACK_ENV'] = 'test'
-
-class String
-  alias each each_line
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+require 'rspec'
+ENV['RACK_ENV'] = 'test'
+
+class String
+  alias each each_line
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy-server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &22574760 !ruby/object:Gem::Requirement
+  requirement: &11366952 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *22574760
+  version_requirements: *11366952
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &22574160 !ruby/object:Gem::Requirement
+  requirement: &11366664 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *22574160
+  version_requirements: *11366664
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &22573640 !ruby/object:Gem::Requirement
+  requirement: &11366436 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22573640
+  version_requirements: *11366436
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &11366160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *11366160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22572960 !ruby/object:Gem::Requirement
+  requirement: &11365860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +65,21 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *22572960
+  version_requirements: *11365860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22572340 !ruby/object:Gem::Requirement
+  requirement: &11365560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *22572340
+  version_requirements: *11365560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &22571760 !ruby/object:Gem::Requirement
+  requirement: &11365284 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *22571760
+  version_requirements: *11365284
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &22571260 !ruby/object:Gem::Requirement
+  requirement: &11365056 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22571260
+  version_requirements: *11365056
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &22521520 !ruby/object:Gem::Requirement
+  requirement: &11364732 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *22521520
+  version_requirements: *11364732
 description: Proxy server
 email: derek@spathi.com
 executables: []
@@ -111,6 +122,7 @@ files:
 - Rakefile
 - examples/proxy_in_process.rb
 - lib/proxy-server.rb
+- lib/proxy/port_prober.rb
 - lib/proxy/proxy_manager.rb
 - lib/proxy/proxy_server.rb
 - proxy-server.gemspec
@@ -130,16 +142,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -732842897
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -732842897
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: proxy-server-0.0.2
+summary: proxy-server-0.0.3
 test_files: []