goliath-reverse-proxy 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,63 +1,61 @@
 PATH
   remote: .
   specs:
-    goliath-reverse-proxy (0.1.0)
-      em-http-request
+    goliath-reverse-proxy (0.2.0)
+      em-http-request (~> 1.0.3)
       em-synchrony
       goliath
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.8)
+    addressable (2.3.2)
     async-rack (0.5.1)
       rack (~> 1.1)
     cookiejar (0.3.0)
     diff-lcs (1.1.3)
-    em-http-request (1.0.2)
+    em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
       em-socksify
       eventmachine (>= 1.0.0.beta.4)
       http_parser.rb (>= 0.5.3)
-    em-socksify (0.2.0)
+    em-socksify (0.2.1)
       eventmachine (>= 1.0.0.beta.4)
-    em-synchrony (1.0.1)
+    em-synchrony (1.0.2)
       eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.0.beta.4)
-    goliath (0.9.4)
+    em-websocket (0.3.8)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
+    eventmachine (1.0.0.rc.4)
+    goliath (1.0.0)
       async-rack
       em-synchrony (>= 1.0.0)
-      eventmachine (>= 1.0.0.beta.3)
-      http_parser.rb
-      http_router (~> 0.9.0)
+      em-websocket
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (= 0.5.3)
       log4r
       multi_json
       rack (>= 1.2.2)
       rack-contrib
       rack-respond_to
     http_parser.rb (0.5.3)
-    http_router (0.9.7)
-      rack (>= 1.0.0)
-      url_mount (~> 0.2.1)
     log4r (1.1.10)
-    multi_json (1.3.5)
+    multi_json (1.3.6)
     rack (1.4.1)
     rack-accept-media-types (0.9)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
     rack-respond_to (0.9.8)
       rack-accept-media-types (>= 0.6)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    url_mount (0.2.1)
-      rack
+    rspec-mocks (2.11.2)
 
 PLATFORMS
   ruby

data/goliath-reverse-proxy.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |gem|
   gem.name      = 'goliath-reverse-proxy'
-  gem.version   = '0.1.2'
+  gem.version   = '0.2.0'
   gem.authors   = ["Daniel Farrell"]
   gem.email     = 'danielfarrell76@gmail.com'
   gem.homepage  = 'https://github.com/danielfarrell/goliath-reverse-proxy'
@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "goliath"
   gem.add_dependency "em-synchrony"
-  gem.add_dependency "em-http-request"
+  gem.add_dependency "em-http-request", "~> 1.0.3"
 
   gem.add_development_dependency "rspec", "~> 2.10"
 

data/lib/goliath/rack/reverse_proxy.rb

@@ -7,26 +7,32 @@ module Goliath
 
       def initialize(app, options)
         @app = app
-        @options = options
+        @connection = EM::HttpRequest.new(options[:base_url])
       end
 
-      def post_process(env, status, headers, body)
+      def call(env)
+        connection = @connection.dup
+        super(env, connection)
+      end
+
+      def post_process(env, status, headers, body, connection)
         method = env['REQUEST_METHOD'].downcase.to_sym
 
-        url = "#{@options[:base_url]}#{env['REQUEST_URI']}"
+        options = {:head => request_headers(env, headers), :path => env['REQUEST_URI']}
+        options[:body] = env['params'] if [:put, :post, :patch].include? method
 
+        http = connection.send(method, options)
+
+        [http.response_header.status, http.response_header.raw, [http.response]]
+      end
+
+      def request_headers(env, headers)
         env.each do |key, value|
           headers[$1] = value if key =~ /HTTP_(.*)/
         end
         headers['X-Forwarded-Host'] = env['HTTP_HOST']
         headers['X-Forwarded-User'] = env['REMOTE_USER'] if env['REMOTE_USER']
-
-        params = {:head => headers}
-        params[:body] = env['params'] if [:put, :post, :patch].include? method
-  
-        http = EM::HttpRequest.new(url).send(method, params)
-
-        [http.response_header.status, http.response_header, [http.response]]
+        headers
       end
 
     end

data/spec/goliath/reverse_proxy_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 require 'goliath/rack/reverse_proxy'
 
 describe Goliath::Rack::ReverseProxy do
+
+  def failed
+    EM.stop
+  end
+
   it 'should load without errors' do
     lambda { Goliath::Rack::ReverseProxy.new('app', {:base_url => 'http://localhost'}) }.should_not raise_error
   end
@@ -11,58 +16,66 @@ describe Goliath::Rack::ReverseProxy do
       @app = double('app').as_null_object
       @app.should_receive(:call).and_return(initial_response)
       @env = Goliath::Env.new
+      @stub_connection = EventMachine::HttpConnection.new
+      @stub_connection.stub(:dup => @stub_connection)
+      EM::HttpRequest.should_receive(:new).with('http://localhost').and_return(@stub_connection)
       @proxy = Goliath::Rack::ReverseProxy.new(@app, {:base_url => 'http://localhost'})
     end
 
     it 'should create url to proxy to' do
-      @env['REQUEST_METHOD'] = 'GET'
-      @env['REQUEST_URI'] = '/a/test/file.html'
-      action = double('http action').as_null_object
-      action.should_receive(:get).and_return(response_object)
-      EM::HttpRequest.should_receive(:new).with('http://localhost/a/test/file.html').and_return(action)
-      @proxy.call(@env)
+      EM.synchrony do
+        @env['REQUEST_METHOD'] = 'GET'
+        @env['REQUEST_URI'] = '/a/test/file.html'
+        @stub_connection.should_receive(:get).and_return(response_object)
+        @proxy.call(@env)
+        EM.stop
+      end
     end
 
     it 'should build the needed headers' do
-      @env['REQUEST_METHOD'] = 'GET'
-      @env['REQUEST_URI'] = '/'
-      @env['SERVER_NAME'] = 'test.com'
-      @env['HTTP_HOST'] = 'testing.com'
-      @env['REMOTE_USER'] = 'bob'
-      action = double('http action').as_null_object
-      headers = {"HOST"=>"testing.com", "CONTENT_TYPE"=>nil, "HTTP_HOST"=>"test.com", "X-Forwarded-Host"=>"testing.com", "REMOTE_USER"=>"bob"}
-      action.should_receive(:get).with(:head => headers).and_return(response_object)
-      EM::HttpRequest.should_receive(:new).with('http://localhost/').and_return(action)
-      @proxy.call(@env)
+      EM.synchrony do
+        @env['REQUEST_METHOD'] = 'GET'
+        @env['REQUEST_URI'] = '/'
+        @env['SERVER_NAME'] = 'test.com'
+        @env['HTTP_HOST'] = 'testing.com'
+        @env['REMOTE_USER'] = 'bob'
+        headers = {"HOST"=>"testing.com", "X-Forwarded-Host"=>"testing.com", "X-Forwarded-User"=>"bob"}
+        @stub_connection.should_receive(:get).with(:head => headers, :path => @env['REQUEST_URI']).and_return(response_object)
+        @proxy.call(@env)
+        EM.stop
+      end
     end
 
     it 'should do a delete if a get was sent' do
-      @env['REQUEST_METHOD'] = 'DELETE'
-      @env['REQUEST_URI'] = '/some/item/23'
-      action = double('http action').as_null_object
-      action.should_receive(:delete).and_return(response_object)
-      EM::HttpRequest.should_receive(:new).with('http://localhost/some/item/23').and_return(action)
-      @proxy.call(@env)
+      EM.synchrony do
+        @env['REQUEST_METHOD'] = 'DELETE'
+        @env['REQUEST_URI'] = '/some/item/23'
+        @stub_connection.should_receive(:delete).and_return(response_object)
+        @proxy.call(@env)
+        EM.stop
+      end
     end
 
     it 'should do a post with body if a post was sent' do
-      @env['REQUEST_METHOD'] = 'POST'
-      @env['REQUEST_URI'] = '/some/item'
-      action = double('http action').as_null_object
-      action.should_receive(:post).and_return(response_object)
-      EM::HttpRequest.should_receive(:new).with('http://localhost/some/item').and_return(action)
-      @proxy.call(@env)
+      EM.synchrony do
+        @env['REQUEST_METHOD'] = 'POST'
+        @env['REQUEST_URI'] = '/some/item'
+        @stub_connection.should_receive(:post).and_return(response_object)
+        @proxy.call(@env)
+        EM.stop
+      end
     end
 
     it 'should return the response from the proxied request' do
-      @env['REQUEST_METHOD'] = 'GET'
-      @env['REQUEST_URI'] = '/a/test/file.html'
-      results  = response_object(401, {}, ['testing'])
-      action = double('http action').as_null_object
-      action.should_receive(:get).and_return(results)
-      EM::HttpRequest.should_receive(:new).with('http://localhost/a/test/file.html').and_return(action)
-      response = @proxy.call(@env)
-      response.should == [401, {}, [["testing"]]]
+      EM.synchrony do
+        @env['REQUEST_METHOD'] = 'GET'
+        @env['REQUEST_URI'] = '/a/test/file.html'
+        results  = response_object(401, {}, ['testing'])
+        @stub_connection.should_receive(:get).and_return(results)
+        response = @proxy.call(@env)
+        response.should == [401, {}, [["testing"]]]
+        EM.stop
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -13,6 +13,10 @@ class ResponseHeader < Hash
   def status=(status)
     @status = status
   end
+
+  def raw
+    self
+  end
 end
 
 class Response

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goliath-reverse-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement