proxy-server 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,10 @@
 PATH
   remote: .
   specs:
-    proxy-server (0.0.5)
+    proxy-server (0.0.6)
+      em-http-request
+      em-synchrony
+      goliath (= 0.9.2)
       httpclient
       json (>= 1.4.6)
       sinatra (>= 1.2.6)
@@ -11,16 +14,48 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
+    async-rack (0.5.1)
+      rack (~> 1.1)
     crack (0.3.1)
     daemons (1.1.4)
     diff-lcs (1.1.3)
+    em-http-request (1.0.0)
+      addressable (>= 2.2.3)
+      em-socksify
+      eventmachine (>= 1.0.0.beta.3)
+      http_parser.rb (>= 0.5.2)
+    em-socksify (0.1.0)
+      eventmachine
+    em-synchrony (1.0.0)
+      eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0.beta.4.1-x86-mingw32)
+    goliath (0.9.2)
+      async-rack
+      em-synchrony (>= 0.3.0.beta.1)
+      eventmachine (>= 1.0.0.beta.3)
+      http_parser.rb
+      http_router (~> 0.8.9)
+      log4r
+      multi_json
+      rack (>= 1.2.2)
+      rack-contrib
+      rack-respond_to
+    http_parser.rb (0.5.3-x86-mingw32)
+    http_router (0.8.11)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
     httpclient (2.2.3)
     json (1.6.1)
+    log4r (1.1.9)
     multi_json (1.0.3)
     rack (1.3.5)
+    rack-accept-media-types (0.9)
+    rack-contrib (1.1.0)
+      rack (>= 0.9.1)
     rack-protection (1.1.4)
       rack
+    rack-respond_to (0.9.8)
+      rack-accept-media-types (>= 0.6)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
@@ -45,6 +80,8 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
+    url_mount (0.2.1)
+      rack
     webmock (1.7.6)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)

data/examples/proxy_in_process.rb

@@ -1,12 +1,11 @@
-require 'rubygems'
-require 'proxy-server'
+require '../lib/proxy-server'
 require 'rest_client' # you will need to install this via gem install rest-client / bundler etc
+require 'httpclient'
 require 'json'
 
 Thread.abort_on_exception=true
 Thread.new do
-  ProxyManager.settings.port = 4983
-  ProxyManager.run!
+  ProxyManager.start :port => 4983
 end
 
 until_proxy_is_running = 3

data/lib/proxy/proxy_manager.rb

@@ -76,12 +76,25 @@ class ProxyManager < Sinatra::Base
 
   def start_proxy(options)
     proxy_server = ProxyServer.new(options)
-    proxy_server.run
+    proxy_server.start
     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
+
+  class << self
+    def start(options = {})
+    require 'thin'
+    server = ::Thin::Server.new(
+      '0.0.0.0',
+      options.fetch(:port, 4985),
+      ProxyManager.new
+    )
+
+    server.start
+    end
   end
 end

data/lib/proxy/proxy_server.rb

@@ -1,16 +1,13 @@
-require 'httpclient'
-require "thin"
-require "rack/content_length"
-require "rack/chunked"
-
-class ProxyServer
+require 'goliath/api'
+require 'goliath/server'
+require 'em-synchrony/em-http'
+class ProxyServer < Goliath::API
   attr_reader :upstream_proxy, :port
   attr_reader :requests, :track_requests, :substitute_requests
-
   DEFAULT_PORT = 8080
 
   def initialize(options = {})
-    @upstream_proxy = options[:proxy]
+    @upstream_proxy = URI.parse(options[:proxy]) if options[:proxy]
 
     @port = options.fetch(:port, DEFAULT_PORT)
 
@@ -19,17 +16,24 @@ class ProxyServer
     @track_requests = []
   end
 
-  def http_client
-    HTTPClient.new :proxy => @upstream_proxy
-  end
-
-  def run
+  def start
+    Thread.abort_on_exception = true
+    require 'log4r'
     @proxy_thread = Thread.new do
-      server = ::Thin::Server.new('0.0.0.0',
-                                  self.port,
-                                  self)
-
-      server.start
+      Goliath.env = :development
+      server = Goliath::Server.new('0.0.0.0', self.port)
+      server.app = Goliath::Rack::Builder.build(self.class, self)
+      server.logger = Log4r::Logger.new 'proxy-server'
+
+      server.options = {
+          :daemonize => false,
+          :verbose => true,
+          :log_stdout => true,
+          :env => :development
+      }
+      server.start do
+        p "Proxy started"
+      end
     end
   end
 
@@ -43,46 +47,55 @@ class ProxyServer
     @substitute_requests.clear
   end
 
-  def call(env)
-    log_request env
-
-    response = get_substitution(env)
-    return response unless response.nil?
-
+  def response(env)
+    uri = get_uri env
+    track uri if tracking_enabled? uri
+    return substitute uri if has_substitute? uri
+    request_uri uri
+  end
 
-    method  = env['REQUEST_METHOD']
-    uri     = get_url(env)
-    body    = get_request_body(env)
-    headers = get_request_headers(env)
+  def get_uri(env)
+    env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'].length > 0 ? '?'+env['QUERY_STRING'] : ''}"
+  end
 
-    query_string_match = uri.match(/\?(.*)$/)
-    query_string = query_string_match ? query_string_match[1] : ""
-    params  = get_params(query_string)
+  def request_uri(uri)
+    options = {
+        :redirects => 1
+    }
+    get_proxy(options)
+    client= EM::HttpRequest.new(uri, options)
+    request = client.get
+    [request.response_header.status, request.response_header, request.response]
+  end
 
-    response = http_client.request(method, uri, params, body, headers)
-    [ response.status, response.headers, [response.body] ]
+  def get_proxy(options)
+    options[:proxy] = {:type => 'http', :host => @upstream_proxy.host, :port => @upstream_proxy.port} if @upstream_proxy
   end
 
-  def get_url(env)
-    env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'].length > 0 ? '?'+env['QUERY_STRING'] : ''}"
+  def get_substituted_response(options)
+    if options[:body]
+      [200, {}, [options[:body]]]
+    elsif options[:url]
+      request_uri options[:url]
+    end
   end
 
-  def get_substitution(env)
+  def substitute(uri)
     @substitute_requests.each do |pattern, options|
-      if Regexp.new(pattern) =~ get_url(env)
+      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] ]
+  def has_substitute?(uri)
+    @substitute_requests.each do |pattern, options|
+      if Regexp.new(pattern) =~ uri
+        return true
+      end
     end
+    false
   end
 
   def substitute_request(pattern, options)
@@ -93,29 +106,17 @@ class ProxyServer
     @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 = get_url(env)
+  def track(uri)
+    @requests << uri
     @track_requests.each do |pattern|
-      @requests << url if Regexp.new(pattern) =~ url
+      @requests << uri if Regexp.new(pattern) =~ uri
     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
+  def tracking_enabled?(uri)
+    @track_requests.each do |pattern|
+      return true if Regexp.new(pattern) =~ uri
+    end
+    false
   end
-end
+end

data/proxy-server.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'proxy-server'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.authors = ["Derek Ekins"]
   s.description = 'Proxy server'
   s.summary = "proxy-server-#{s.version}"
@@ -15,6 +15,9 @@ Gem::Specification.new do |s|
   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'

data/spec/proxy/proxy_server_spec.rb

@@ -1,17 +1,29 @@
 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
+    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
@@ -25,55 +37,50 @@ describe ProxyServer do
     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 track a request" do
+    uri = "http://google.com"
+    proxy = ProxyServer.new
 
-  it "should allow requests with query strings" do
-    stub_request(:get, "http://www.example.com?para=value")
+    proxy.track uri
 
-    response = get "http://www.example.com?para=value"
-    response.status.should == 200
+    proxy.requests.length.should == 1
+    proxy.requests.should include uri
   end
 
-  it "can substitute the response of a request with a body of text" do
+  it "should determine whether tracking is enabled for a uri" do
+    uri = "http://google.com"
     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
+    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 "can substitute the response of a request with another url to call" do
+  it "should determine whether there is a substitute for a uri" 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
+
+    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 "tracks a url that matches the pattern" do
+  it "should substitute a request body" do
     proxy = ProxyServer.new
-    expected_response = "this is not what you are looking for"
-    proxy.track_request '.*com'
+    substitute_response = 'substitute this'
+    proxy.substitute_request('.*com', :body => substitute_response)
 
-    stub_request(:get, 'http://www.google.com/')
-    stub_request(:get, 'http://www.google.co.uk/')
+    proxy.substitute('http://www.google.com').should == [200, {}, [substitute_response]]
+  end
 
-    browser = Rack::Test::Session.new(Rack::MockSession.new(proxy))
-    browser.get 'http://www.google.com/'
-    browser.get 'http://www.google.co.uk/'
+  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.requests.should include('http://www.google.com/')
+    proxy.substitute('http://www.google.com')
   end
 
   it "reset causes request tracking to be removed" do
@@ -86,9 +93,27 @@ describe ProxyServer do
   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.substitute_requests['test']  = 'item'
-      proxy.reset
-      proxy.substitute_requests.length.should == 0
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000 Z
+date: 2011-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8193912 !ruby/object:Gem::Requirement
+  requirement: &8864280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *8193912
+  version_requirements: *8864280
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &8192604 !ruby/object:Gem::Requirement
+  requirement: &8863992 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *8192604
+  version_requirements: *8863992
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &8190792 !ruby/object:Gem::Requirement
+  requirement: &8863764 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8190792
+  version_requirements: *8863764
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &8249220 !ruby/object:Gem::Requirement
+  requirement: &8863464 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8249220
+  version_requirements: *8863464
+- !ruby/object:Gem::Dependency
+  name: goliath
+  requirement: &8863128 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *8863128
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: &8862828 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *8862828
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &8862456 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *8862456
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8244744 !ruby/object:Gem::Requirement
+  requirement: &8861868 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +98,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *8244744
+  version_requirements: *8861868
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8243004 !ruby/object:Gem::Requirement
+  requirement: &8877948 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +109,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *8243004
+  version_requirements: *8877948
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &8355060 !ruby/object:Gem::Requirement
+  requirement: &8877660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +120,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *8355060
+  version_requirements: *8877660
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &8353788 !ruby/object:Gem::Requirement
+  requirement: &8877312 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8353788
+  version_requirements: *8877312
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &8350776 !ruby/object:Gem::Requirement
+  requirement: &8876820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +142,7 @@ dependencies:
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *8350776
+  version_requirements: *8876820
 description: Proxy server
 email: derek@spathi.com
 executables: []
@@ -153,5 +186,5 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: proxy-server-0.0.5
+summary: proxy-server-0.0.6
 test_files: []