proxy-server 0.0.6 → 0.0.7

data/proxy-server.gemspec

@@ -1,36 +1,36 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name = 'proxy-server'
-  s.version = '0.0.6'
-  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_dependency 'goliath', '0.9.2'
-  s.add_dependency 'em-synchrony'
-  s.add_dependency 'em-http-request'
-
-  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"
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = 'proxy-server'
+  s.version = '0.0.7'
+  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_dependency 'goliath', '0.9.2'
+  s.add_dependency 'em-synchrony'
+  s.add_dependency 'em-http-request'
+
+  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_app_spec.rb

@@ -0,0 +1,99 @@
+require_relative '../spec_helper'
+require_relative '../../lib/proxy/proxy_app'
+require_relative '../../lib/proxy/proxy_manager'
+require 'rack/test'
+require 'webmock/rspec'
+
+describe ProxyApp do
+  include Rack::Test::Methods
+
+  before do
+    @proxy_server = mock('ProxyServer')
+    @proxy_manager = ProxyManager.new
+    @proxy_manager.stub(:start_proxy).with(anything()).and_return(@proxy_server)
+    @proxy_manager.stub(:get_proxy).with(anything()).and_return(@proxy_server)
+  end
+
+  let(:app) { ProxyApp.new(@proxy_manager) }
+
+  it "should create a new proxy" do
+    @proxy_manager.should_receive(:new_proxy).and_return(URI('http://localhost:4000'))
+    response = post '/proxies'
+    proxy = JSON.parse(response.body)
+    proxy['port'].should == 4000
+    proxy['url'].should == "http://localhost:4000"
+  end
+
+  it "should create a new proxy with an upstream proxy when asked to" do
+    @proxy_manager.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
+    @proxy_manager.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_manager_spec.rb

@@ -1,96 +1,20 @@
-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
+require_relative '../spec_helper'
+require_relative '../../lib/proxy/proxy_manager'
+require 'rack/test'
+
+describe ProxyManager do
+  it "creates a new proxy" do
+    pm = ProxyManager.new
+
+    pm.should_receive(:find_proxy_port).and_return(4000)
+    pm.should_receive(:proxy_host_address).and_return('127.0.0.1')
+
+    pm.new_proxy.should == URI.parse("http://127.0.0.1:4000")
+  end
+
+  it "finds the address of this machine" do
+    expected_address = `ifconfig`.scan(/inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})  Bcast:/)[0][0]
+    pm = ProxyManager.new
+    pm.proxy_host_address.should == expected_address
+  end
 end

data/spec/proxy/proxy_server_spec.rb

@@ -1,119 +1,119 @@
-require_relative '../spec_helper'
-require_relative '../../lib/proxy/proxy_server'
-
-describe ProxyServer do
-  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 == URI.parse(proxy_uri)
-  end
-
-  it "should get the proxy settings" do
-    proxy_uri = 'http://test-proxy:80'
-
-    proxy = ProxyServer.new :proxy => proxy_uri
-    options = {}
-    proxy.get_proxy(options)
-    options[:proxy].should == {:type => 'http', :host => 'test-proxy', :port => 80}
-  end
-
-  it "should ignore proxy settings if none specified" do
-    proxy = ProxyServer.new
-    options = {}
-
-    proxy.get_proxy(options)
-
-    options.should_not have_key :proxy
-  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 track a request" do
-    uri = "http://google.com"
-    proxy = ProxyServer.new
-
-    proxy.track uri
-
-    proxy.requests.length.should == 1
-    proxy.requests.should include uri
-  end
-
-  it "should determine whether tracking is enabled for a uri" do
-    uri = "http://google.com"
-    proxy = ProxyServer.new
-
-    proxy.track_request('.*com')
-
-    proxy.tracking_enabled?('http://www.google.com').should be_true
-    proxy.tracking_enabled?('http://www.google.co.uk').should be_false
-  end
-
-  it "should determine whether there is a substitute for a uri" do
-    proxy = ProxyServer.new
-
-    proxy.substitute_request('.*com', :body => 'substitute_response')
-
-    proxy.has_substitute?('http://www.google.com').should be_true
-    proxy.has_substitute?('http://www.google.co.uk').should be_false
-  end
-
-  it "should substitute a request body" do
-    proxy = ProxyServer.new
-    substitute_response = 'substitute this'
-    proxy.substitute_request('.*com', :body => substitute_response)
-
-    proxy.substitute('http://www.google.com').should == [200, {}, [substitute_response]]
-  end
-
-  it "should substitute a request url" do
-    proxy = ProxyServer.new
-    substitute_url = 'http://www.google.co.uk'
-    proxy.substitute_request('.*com', :url => substitute_url)
-    proxy.should_receive(:request_uri).with(substitute_url)
-
-    proxy.substitute('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
-
-  context "using response" do
-    it "tracks requests" do
-      proxy = ProxyServer.new
-      proxy.should_receive(:request_uri).with('http://www.google.com')
-
-      proxy.track_request '.*google\.com'
-      proxy.response('REQUEST_URI' => 'http://www.google.com')
-    end
-
-    it "substitutes a request" do
-      proxy = ProxyServer.new
-      substitute_body = 'substitute'
-
-      proxy.substitute_request '.*google\.com', :body => substitute_body
-      proxy.response('REQUEST_URI' => 'http://www.google.com')[2].should == [substitute_body]
-    end
-  end
-end
+require_relative '../spec_helper'
+require_relative '../../lib/proxy/proxy_server'
+
+describe ProxyServer do
+  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 == URI.parse(proxy_uri)
+  end
+
+  it "should get the proxy settings" do
+    proxy_uri = 'http://test-proxy:80'
+
+    proxy = ProxyServer.new :proxy => proxy_uri
+    options = {}
+    proxy.get_proxy(options)
+    options[:proxy].should == {:type => 'http', :host => 'test-proxy', :port => 80}
+  end
+
+  it "should ignore proxy settings if none specified" do
+    proxy = ProxyServer.new
+    options = {}
+
+    proxy.get_proxy(options)
+
+    options.should_not have_key :proxy
+  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 track a request" do
+    uri = "http://google.com"
+    proxy = ProxyServer.new
+
+    proxy.track uri
+
+    proxy.requests.length.should == 1
+    proxy.requests.should include uri
+  end
+
+  it "should determine whether tracking is enabled for a uri" do
+    uri = "http://google.com"
+    proxy = ProxyServer.new
+
+    proxy.track_request('.*com')
+
+    proxy.tracking_enabled?('http://www.google.com').should be_true
+    proxy.tracking_enabled?('http://www.google.co.uk').should be_false
+  end
+
+  it "should determine whether there is a substitute for a uri" do
+    proxy = ProxyServer.new
+
+    proxy.substitute_request('.*com', :body => 'substitute_response')
+
+    proxy.has_substitute?('http://www.google.com').should be_true
+    proxy.has_substitute?('http://www.google.co.uk').should be_false
+  end
+
+  it "should substitute a request body" do
+    proxy = ProxyServer.new
+    substitute_response = 'substitute this'
+    proxy.substitute_request('.*com', :body => substitute_response)
+
+    proxy.substitute('http://www.google.com').should == [200, {}, [substitute_response]]
+  end
+
+  it "should substitute a request url" do
+    proxy = ProxyServer.new
+    substitute_url = 'http://www.google.co.uk'
+    proxy.substitute_request('.*com', :url => substitute_url)
+    proxy.should_receive(:request_uri).with(substitute_url)
+
+    proxy.substitute('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
+
+  context "using response" do
+    it "tracks requests" do
+      proxy = ProxyServer.new
+      proxy.should_receive(:request_uri).with('http://www.google.com')
+
+      proxy.track_request '.*google\.com'
+      proxy.response('REQUEST_URI' => 'http://www.google.com')
+    end
+
+    it "substitutes a request" do
+      proxy = ProxyServer.new
+      substitute_body = 'substitute'
+
+      proxy.substitute_request '.*google\.com', :body => substitute_body
+      proxy.response('REQUEST_URI' => 'http://www.google.com')[2].should == [substitute_body]
+    end
+  end
+end