em-http-request 1.0.1 → 1.0.2

data/spec/http_proxy_spec.rb

@@ -48,6 +48,27 @@ describe EventMachine::HttpRequest do
         }
       }
     end
+
+    it "should use HTTP proxy while redirecting" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect', proxy).get :redirects => 1
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+
+          http.response_header['X_THE_REQUESTED_URI'].should == 'http://127.0.0.1:8090/gzip'
+          http.response_header['X_THE_REQUESTED_URI'].should_not == '/redirect'
+
+          http.response_header["CONTENT_ENCODING"].should == "gzip"
+          http.response.should == "compressed"
+          http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/gzip'
+          http.redirects.should == 1
+
+          EventMachine.stop
+        }
+      }
+    end
   end
 
-end
+end

data/spec/redirect_spec.rb

@@ -42,7 +42,7 @@ describe EventMachine::HttpRequest do
 
   it "should not forward cookies across domains with http redirect" do
 
-    expires  = (Date.today + 1).strftime('%a, %d %b %Y %T GMT')
+    expires  = (Date.today + 2).strftime('%a, %d %b %Y %T GMT')
     response =<<-HTTP.gsub(/^ +/, '')
       HTTP/1.1 301 MOVED PERMANENTLY
       Location: http://localhost:8081/
@@ -68,7 +68,7 @@ describe EventMachine::HttpRequest do
 
   it "should forward valid cookies across domains with http redirect" do
 
-    expires  = (Date.today + 1).strftime('%a, %d %b %Y %T GMT')
+    expires  = (Date.today + 2).strftime('%a, %d %b %Y %T GMT')
     response =<<-HTTP.gsub(/^ +/, '')
       HTTP/1.1 301 MOVED PERMANENTLY
       Location: http://127.0.0.1:8081/
@@ -77,8 +77,8 @@ describe EventMachine::HttpRequest do
     HTTP
 
     EventMachine.run do
-      @stub = StubServer.new(:port => 8080, :response => response)
-      @echo = StubServer.new(:port => 8081, :echo     => true)
+      @stub = StubServer.new(:host => '127.0.0.1', :port => 8080, :response => response)
+      @echo = StubServer.new(:host => '127.0.0.1', :port => 8081, :echo     => true)
 
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :redirects => 1
 

data/spec/stallion.rb

@@ -1,273 +1,270 @@
-# #--
-# Includes portion originally Copyright (C)2008 Michael Fellinger
-# license See file LICENSE for details
-# #--
-
-require 'rack'
-
-module Stallion
-  class Mount
-    def initialize(name, *methods, &block)
-      @name, @methods, @block = name, methods, block
-    end
-
-    def ride
-      @block.call
-    end
-
-    def match?(request)
-      method = request['REQUEST_METHOD']
-      right_method = @methods.empty? or @methods.include?(method)
-    end
-  end
-
-  class Stable
-    attr_reader :request, :response
-
-    def initialize
-      @boxes = {}
-    end
-
-    def in(path, *methods, &block)
-      mount = Mount.new(path, *methods, &block)
-      @boxes[[path, methods]] = mount
-      mount
-    end
-
-    def call(request, response)
-      @request, @response = request, response
-      @boxes.each do |(path, methods), mount|
-        if mount.match?(request)
-          mount.ride
-        end
-      end
-    end
-  end
-
-  STABLES = {}
-
-  def self.saddle(name = nil)
-    STABLES[name] = stable = Stable.new
-    yield stable
-  end
-
-  def self.run(options = {})
-    options = {:Host => "127.0.0.1", :Port => 8090}.merge(options)
-    Rack::Handler::Mongrel.run(Rack::Lint.new(self), options)
-  end
-
-  def self.call(env)
-    request = Rack::Request.new(env)
-    response = Rack::Response.new
-
-    STABLES.each do |name, stable|
-      stable.call(request, response)
-    end
-
-    response.finish
-  end
-end
-
-Stallion.saddle :spec do |stable|
-  stable.in '/' do
-
-    if stable.request.path_info == '/fail'
-      stable.response.status = 404
-
-    elsif stable.request.path_info == '/fail_with_nonstandard_response'
-      stable.response.status = 420
-
-    elsif stable.request.query_string == 'q=test'
-      stable.response.write 'test'
-
-    elsif stable.request.path_info == '/echo_query'
-      stable.response["ETag"] = "abcdefg"
-      stable.response["Last-Modified"] = "Fri, 13 Aug 2010 17:31:21 GMT"
-      stable.response.write stable.request.query_string
-
-    elsif stable.request.path_info == '/echo_content_length'
-      stable.response.write stable.request.content_length
-
-    elsif stable.request.path_info == '/echo_content_length_from_header'
-      stable.response.write "content-length:#{stable.request.env["CONTENT_LENGTH"]}"
-    
-    elsif stable.request.head? && stable.request.path_info == '/'
-      stable.response.status = 200
-
-    elsif stable.request.delete?
-      stable.response.status = 200
-
-    elsif stable.request.put?
-      stable.response.write stable.request.body.read
-
-    elsif stable.request.post?
-      if stable.request.path_info == '/echo_content_type'
-        stable.response["Content-Type"] = stable.request.env["CONTENT_TYPE"] || 'text/html'
-        stable.response.write stable.request.env["CONTENT_TYPE"]
-      else
-        stable.response.write stable.request.body.read
-      end
-
-    elsif stable.request.path_info == '/set_cookie'
-      stable.response["Set-Cookie"] = "id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;"
-      stable.response.write "cookie set"
-
-    elsif stable.request.path_info == '/set_multiple_cookies'
-      stable.response["Set-Cookie"] = [
-        "id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;",
-        "id=2;"
-      ]
-      stable.response.write "cookies set"
-
-    elsif stable.request.path_info == '/echo_cookie'
-      stable.response.write stable.request.env["HTTP_COOKIE"]
-
-    elsif stable.request.path_info == '/timeout'
-      sleep(10)
-      stable.response.write 'timeout'
-
-    elsif stable.request.path_info == '/cookie_parrot'
-      stable.response.status = 200
-      stable.response["Set-Cookie"] = stable.request.env['HTTP_COOKIE']
-
-    elsif stable.request.path_info == '/redirect'
-      stable.response.status = 301
-      stable.response["Location"] = "/gzip"
-      stable.response.write 'redirect'
-
-    elsif stable.request.path_info == '/redirect/multiple-with-cookie'
-      stable.response.status = 301
-      stable.response["Set-Cookie"] = "another_id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;"
-      stable.response["Location"] = "/redirect"
-      stable.response.write 'redirect'
-
-    elsif stable.request.path_info == '/redirect/bad'
-      stable.response.status = 301
-      stable.response["Location"] = "http://127.0.0.1:8090"
-
-    elsif stable.request.path_info == '/redirect/head'
-      stable.response.status = 301
-      stable.response["Location"] = "/"
-
-    elsif stable.request.path_info == '/redirect/middleware_redirects_1'
-      stable.response.status = 301
-      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
-      stable.response["Location"] = "/redirect/middleware_redirects_2"
-
-    elsif stable.request.path_info == '/redirect/middleware_redirects_2'
-      stable.response.status = 301
-      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
-      stable.response["Location"] = "/redirect/middleware_redirects_3"
-
-    elsif stable.request.path_info == '/redirect/middleware_redirects_3'
-      stable.response.status = 200
-      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
-
-    elsif stable.request.path_info == '/redirect/nohost'
-      stable.response.status = 301
-      stable.response["Location"] = "http:/"
-
-    elsif stable.request.path_info == '/redirect/badhost'
-      stable.response.status = 301
-      stable.response["Location"] = "http://$$$@$!%&^"
-
-    elsif stable.request.path_info == '/gzip'
-      io = StringIO.new
-      gzip = Zlib::GzipWriter.new(io)
-      gzip << "compressed"
-      gzip.close
-
-      stable.response.write io.string
-      stable.response["Content-Encoding"] = "gzip"
-
-    elsif stable.request.path_info == '/deflate'
-      deflater = Zlib::Deflate.new(
-        Zlib::DEFAULT_COMPRESSION,
-        -Zlib::MAX_WBITS, # drop the zlib header which causes both Safari and IE to choke
-        Zlib::DEF_MEM_LEVEL,
-        Zlib::DEFAULT_STRATEGY
-      )
-      deflater.deflate("compressed")
-      stable.response.write deflater.finish
-      stable.response["Content-Encoding"] = "deflate"
-
-    elsif stable.request.env["HTTP_IF_NONE_MATCH"]
-      stable.response.status = 304
-
-    elsif stable.request.env["HTTP_AUTHORIZATION"]
-      if stable.request.path_info == '/auth'
-        stable.response.status = 200
-        stable.response.write stable.request.env["HTTP_AUTHORIZATION"]
-      else
-        auth = "Basic %s" % Base64.encode64(['user', 'pass'].join(':')).split.join
-
-        if auth == stable.request.env["HTTP_AUTHORIZATION"]
-          stable.response.status = 200
-          stable.response.write 'success'
-        else
-          stable.response.status = 401
-        end
-      end
-    elsif stable.request.path_info == '/relative-location'
-      stable.response.status = 301
-      stable.response["Location"] = '/forwarded'
-
-    elsif
-      stable.response.write  'Hello, World!'
-    end
-
-  end
-end
-
-Thread.new do
-  begin
-    Stallion.run :Host => '127.0.0.1', :Port => 8090
-  rescue Exception => e
-    print e
-  end
-end
-
-#
-# Simple HTTP Proxy server
-#
-Thread.new do
-  server = TCPServer.new('127.0.0.1', 8083)
-  loop do
-    session = server.accept
-    request = ""
-    while (data = session.gets) != "\r\n"
-      request << data
-    end
-    parts = request.split("\r\n")
-    method, destination, http_version = parts.first.split(' ')
-    if destination =~ /^http:/
-      uri = Addressable::URI.parse(destination)
-      absolute_path = uri.path + (uri.query ? "?#{uri.query}" : "")
-      client = TCPSocket.open(uri.host, uri.port || 80)
-
-      client.write "#{method} #{absolute_path} #{http_version}\r\n"
-      parts[1..-1].each do |part|
-        client.write "#{part}\r\n"
-      end
-
-      client.write "\r\n"
-      client.flush
-      client.close_write
-
-      # Take the initial line from the upstream response
-      session.write client.gets
-
-      # What (absolute) uri was requested?  Send it back in a header
-      session.write "X-The-Requested-URI: #{destination}\r\n"
-
-      while data = client.gets
-        session.write data
-      end
-      session.flush
-      client.close
-    end
-    session.close
-  end
-end
-
-sleep(1)
+# #--
+# Includes portion originally Copyright (C)2008 Michael Fellinger
+# license See file LICENSE for details
+# #--
+
+require 'rack'
+
+module Stallion
+  class Mount
+    def initialize(name, *methods, &block)
+      @name, @methods, @block = name, methods, block
+    end
+
+    def ride
+      @block.call
+    end
+
+    def match?(request)
+      method = request['REQUEST_METHOD']
+      right_method = @methods.empty? or @methods.include?(method)
+    end
+  end
+
+  class Stable
+    attr_reader :request, :response
+
+    def initialize
+      @boxes = {}
+    end
+
+    def in(path, *methods, &block)
+      mount = Mount.new(path, *methods, &block)
+      @boxes[[path, methods]] = mount
+      mount
+    end
+
+    def call(request, response)
+      @request, @response = request, response
+      @boxes.each do |(path, methods), mount|
+        if mount.match?(request)
+          mount.ride
+        end
+      end
+    end
+  end
+
+  STABLES = {}
+
+  def self.saddle(name = nil)
+    STABLES[name] = stable = Stable.new
+    yield stable
+  end
+
+  def self.run(options = {})
+    options = {:Host => "127.0.0.1", :Port => 8090}.merge(options)
+    Rack::Handler::Mongrel.run(Rack::Lint.new(self), options)
+  end
+
+  def self.call(env)
+    request = Rack::Request.new(env)
+    response = Rack::Response.new
+
+    STABLES.each do |name, stable|
+      stable.call(request, response)
+    end
+
+    response.finish
+  end
+end
+
+Stallion.saddle :spec do |stable|
+  stable.in '/' do
+
+    if stable.request.path_info == '/fail'
+      stable.response.status = 404
+
+    elsif stable.request.path_info == '/fail_with_nonstandard_response'
+      stable.response.status = 420
+
+    elsif stable.request.query_string == 'q=test'
+      stable.response.write 'test'
+
+    elsif stable.request.path_info == '/echo_query'
+      stable.response["ETag"] = "abcdefg"
+      stable.response["Last-Modified"] = "Fri, 13 Aug 2010 17:31:21 GMT"
+      stable.response.write stable.request.query_string
+
+    elsif stable.request.path_info == '/echo_content_length'
+      stable.response.write stable.request.content_length
+
+    elsif stable.request.path_info == '/echo_content_length_from_header'
+      stable.response.write "content-length:#{stable.request.env["CONTENT_LENGTH"]}"
+    
+    elsif stable.request.head? && stable.request.path_info == '/'
+      stable.response.status = 200
+
+    elsif stable.request.delete?
+      stable.response.status = 200
+
+    elsif stable.request.put?
+      stable.response.write stable.request.body.read
+
+    elsif stable.request.post?
+      if stable.request.path_info == '/echo_content_type'
+        stable.response["Content-Type"] = stable.request.env["CONTENT_TYPE"] || 'text/html'
+        stable.response.write stable.request.env["CONTENT_TYPE"]
+      else
+        stable.response.write stable.request.body.read
+      end
+
+    elsif stable.request.path_info == '/set_cookie'
+      stable.response["Set-Cookie"] = "id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;"
+      stable.response.write "cookie set"
+
+    elsif stable.request.path_info == '/set_multiple_cookies'
+      stable.response["Set-Cookie"] = [
+        "id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;",
+        "id=2;"
+      ]
+      stable.response.write "cookies set"
+
+    elsif stable.request.path_info == '/echo_cookie'
+      stable.response.write stable.request.env["HTTP_COOKIE"]
+
+    elsif stable.request.path_info == '/timeout'
+      sleep(10)
+      stable.response.write 'timeout'
+
+    elsif stable.request.path_info == '/cookie_parrot'
+      stable.response.status = 200
+      stable.response["Set-Cookie"] = stable.request.env['HTTP_COOKIE']
+
+    elsif stable.request.path_info == '/redirect'
+      stable.response.status = 301
+      stable.response["Location"] = "/gzip"
+      stable.response.write 'redirect'
+
+    elsif stable.request.path_info == '/redirect/multiple-with-cookie'
+      stable.response.status = 301
+      stable.response["Set-Cookie"] = "another_id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;"
+      stable.response["Location"] = "/redirect"
+      stable.response.write 'redirect'
+
+    elsif stable.request.path_info == '/redirect/bad'
+      stable.response.status = 301
+      stable.response["Location"] = "http://127.0.0.1:8090"
+
+    elsif stable.request.path_info == '/redirect/head'
+      stable.response.status = 301
+      stable.response["Location"] = "/"
+
+    elsif stable.request.path_info == '/redirect/middleware_redirects_1'
+      stable.response.status = 301
+      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
+      stable.response["Location"] = "/redirect/middleware_redirects_2"
+
+    elsif stable.request.path_info == '/redirect/middleware_redirects_2'
+      stable.response.status = 301
+      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
+      stable.response["Location"] = "/redirect/middleware_redirects_3"
+
+    elsif stable.request.path_info == '/redirect/middleware_redirects_3'
+      stable.response.status = 200
+      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
+
+    elsif stable.request.path_info == '/redirect/nohost'
+      stable.response.status = 301
+      stable.response["Location"] = "http:/"
+
+    elsif stable.request.path_info == '/redirect/badhost'
+      stable.response.status = 301
+      stable.response["Location"] = "http://$$$@$!%&^"
+
+    elsif stable.request.path_info == '/gzip'
+      io = StringIO.new
+      gzip = Zlib::GzipWriter.new(io)
+      gzip << "compressed"
+      gzip.close
+
+      stable.response.write io.string
+      stable.response["Content-Encoding"] = "gzip"
+
+    elsif stable.request.path_info == '/deflate'
+      deflater = Zlib::Deflate.new(
+        Zlib::DEFAULT_COMPRESSION,
+        -Zlib::MAX_WBITS, # drop the zlib header which causes both Safari and IE to choke
+        Zlib::DEF_MEM_LEVEL,
+        Zlib::DEFAULT_STRATEGY
+      )
+      deflater.deflate("compressed")
+      stable.response.write deflater.finish
+      stable.response["Content-Encoding"] = "deflate"
+
+    elsif stable.request.env["HTTP_IF_NONE_MATCH"]
+      stable.response.status = 304
+
+    elsif stable.request.path_info == '/auth' && stable.request.env["HTTP_AUTHORIZATION"]
+      stable.response.status = 200
+      stable.response.write stable.request.env["HTTP_AUTHORIZATION"]
+    elsif stable.request.path_info == '/authtest'
+      auth = "Basic %s" % Base64.encode64(['user', 'pass'].join(':')).split.join
+      if auth == stable.request.env["HTTP_AUTHORIZATION"]
+        stable.response.status = 200
+        stable.response.write 'success'
+      else
+        stable.response.status = 401
+      end
+    elsif stable.request.path_info == '/relative-location'
+      stable.response.status = 301
+      stable.response["Location"] = '/forwarded'
+
+    elsif
+      stable.response.write  'Hello, World!'
+    end
+
+  end
+end
+
+Thread.new do
+  begin
+    Stallion.run :Host => '127.0.0.1', :Port => 8090
+  rescue Exception => e
+    print e
+  end
+end
+
+#
+# Simple HTTP Proxy server
+#
+Thread.new do
+  server = TCPServer.new('127.0.0.1', 8083)
+  loop do
+    session = server.accept
+    request = ""
+    while (data = session.gets) != "\r\n"
+      request << data
+    end
+    parts = request.split("\r\n")
+    method, destination, http_version = parts.first.split(' ')
+    if destination =~ /^http:/
+      uri = Addressable::URI.parse(destination)
+      absolute_path = uri.path + (uri.query ? "?#{uri.query}" : "")
+      client = TCPSocket.open(uri.host, uri.port || 80)
+
+      client.write "#{method} #{absolute_path} #{http_version}\r\n"
+      parts[1..-1].each do |part|
+        client.write "#{part}\r\n"
+      end
+
+      client.write "\r\n"
+      client.flush
+      client.close_write
+
+      # Take the initial line from the upstream response
+      session.write client.gets
+
+      # What (absolute) uri was requested?  Send it back in a header
+      session.write "X-The-Requested-URI: #{destination}\r\n"
+
+      while data = client.gets
+        session.write data
+      end
+      session.flush
+      client.close
+    end
+    session.close
+  end
+end
+
+sleep(1)