em-http-request 1.0.0 → 1.0.1

data/spec/encoding_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'helper'
 
 describe EventMachine::HttpEncoding do
@@ -13,7 +15,8 @@ describe EventMachine::HttpEncoding do
 
   it "should transform a very complex hash into HTTP POST Params" do
     params = form_encode_body({:a => "a", :b => [{:c => "c", :d => "d"}, {:e => "e", :f => "f"}]})
-    params.should == "a=a&b[0][c]=c&b[0][d]=d&b[1][e]=e&b[1][f]=f"
+    # 1.8.7 does not have ordered hashes.
+    params.split(/&/).sort.join('&').should == "a=a&b[0][c]=c&b[0][d]=d&b[1][e]=e&b[1][f]=f"
   end
 
   it "should escape values" do
@@ -31,10 +34,16 @@ describe EventMachine::HttpEncoding do
     params.should == "bad%26str[key%26key][0]=bad%2B%26stuff&bad%26str[key%26key][1]=%5Btest%5D"
   end
 
+  it "should not issue warnings on non-ASCII encodings" do
+    # I don't know how to check for ruby warnings.
+    params = escape('valö')
+    params = escape('valö'.encode('ISO-8859-15'))
+  end
+
   # xit "should be fast on long string escapes" do
   #   s = Time.now
   #   5000.times { |n| form_encode_body({:a => "{a:'b', d:'f', g:['a','b']}"*50}) }
   #   (Time.now - s).should satisfy { |t| t < 1.5 }
   # end
 
-end
+end

data/spec/external_spec.rb

@@ -1,127 +1,128 @@
-require 'helper'
-
-requires_connection do
-
-  describe EventMachine::HttpRequest do
-
-    it "should follow redirects on HEAD method (external)" do
-      EventMachine.run {
-        http = EventMachine::HttpRequest.new('http://www.google.com/').head :redirects => 1
-        http.errback { failed(http) }
-        http.callback {
-          http.response_header.status.should == 200
-          EM.stop
-        }
-      }
-    end
-
-    it "should follow redirect to https and initiate the handshake" do
-      EventMachine.run {
-        http = EventMachine::HttpRequest.new('http://analytics.postrank.com/').get :redirects => 5
-
-        http.errback { failed(http) }
-        http.callback {
-          http.response_header.status.should == 200
-          EventMachine.stop
-        }
-      }
-    end
-
-    it "should perform a streaming GET" do
-      EventMachine.run {
-
-        # digg.com uses chunked encoding
-        http = EventMachine::HttpRequest.new('http://digg.com/news').get
-
-        http.errback { failed(http) }
-        http.callback {
-          http.response_header.status.should == 200
-          EventMachine.stop
-        }
-      }
-    end
-
-    it "should handle a 100 continue" do
-      EventMachine.run {
-        # 8.2.3 Use of the 100 (Continue) Status - http://www.ietf.org/rfc/rfc2616.txt
-        #
-        # An origin server SHOULD NOT send a 100 (Continue) response if
-        # the request message does not include an Expect request-header
-        # field with the "100-continue" expectation, and MUST NOT send a
-        # 100 (Continue) response if such a request comes from an HTTP/1.0
-        # (or earlier) client. There is an exception to this rule: for
-        # compatibility with RFC 2068, a server MAY send a 100 (Continue)
-        # status in response to an HTTP/1.1 PUT or POST request that does
-        # not include an Expect request-header field with the "100-
-        # continue" expectation. This exception, the purpose of which is
-        # to minimize any client processing delays associated with an
-        # undeclared wait for 100 (Continue) status, applies only to
-        # HTTP/1.1 requests, and not to requests with any other HTTP-
-        # version value.
-        #
-        # 10.1.1: 100 Continue - http://www.ietf.org/rfc/rfc2068.txt
-        # The client may continue with its request. This interim response is
-        # used to inform the client that the initial part of the request has
-        # been received and has not yet been rejected by the server. The client
-        # SHOULD continue by sending the remainder of the request or, if the
-        # request has already been completed, ignore this response. The server
-        # MUST send a final response after the request has been completed.
-
-        url = 'http://ws.serviceobjects.com/lv/LeadValidation.asmx/ValidateLead_V2'
-        http = EventMachine::HttpRequest.new(url).post :body => {:name => :test}
-
-        http.errback { failed(http) }
-        http.callback {
-          http.response_header.status.should == 500
-          http.response.should match('Missing')
-          EventMachine.stop
-        }
-      }
-    end
-
-    it "should detect deflate encoding" do
-      EventMachine.run {
-
-        options = {:head => {"accept-encoding" => "deflate"}, :redirects => 5}
-        http = EventMachine::HttpRequest.new('http://www.msn.com').get options
-
-        http.errback { failed(http) }
-        http.callback {
-          http.response_header.status.should == 200
-          http.response_header["CONTENT_ENCODING"].should == "deflate"
-
-          EventMachine.stop
-        }
-      }
-    end
-
-    context "keepalive" do
-      it "should default to non-keepalive" do
-        EventMachine.run {
-          headers = {'If-Modified-Since' => 'Thu, 05 Aug 2010 22:54:44 GMT'}
-          http = EventMachine::HttpRequest.new('http://www.google.com/images/logos/ps_logo2.png').get :head => headers
-
-          http.errback { fail }
-          start = Time.now.to_i
-          http.callback {
-            (Time.now.to_i - start).should be_within(2).of(0)
-            EventMachine.stop
-          }
-        }
-      end
-
-      it "should work with keep-alive servers" do
-        EventMachine.run {
-          http = EventMachine::HttpRequest.new('http://mexicodiario.com/touch.public.json.php').get :keepalive => true
-
-          http.errback { failed(http) }
-          http.callback {
-            http.response_header.status.should == 200
-            EventMachine.stop
-          }
-        }
-      end
-    end
-
-  end
-end
+require 'helper'
+
+requires_connection do
+
+  describe EventMachine::HttpRequest do
+
+    it "should follow redirects on HEAD method (external)" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://www.google.com/').head :redirects => 1
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+          EM.stop
+        }
+      }
+    end
+
+    it "should follow redirect to https and initiate the handshake" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://analytics.postrank.com/').get :redirects => 5
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+          EventMachine.stop
+        }
+      }
+    end
+
+    it "should perform a streaming GET" do
+      EventMachine.run {
+
+        # digg.com uses chunked encoding
+        http = EventMachine::HttpRequest.new('http://digg.com/news').get
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+          EventMachine.stop
+        }
+      }
+    end
+
+    it "should handle a 100 continue" do
+      EventMachine.run {
+        # 8.2.3 Use of the 100 (Continue) Status - http://www.ietf.org/rfc/rfc2616.txt
+        #
+        # An origin server SHOULD NOT send a 100 (Continue) response if
+        # the request message does not include an Expect request-header
+        # field with the "100-continue" expectation, and MUST NOT send a
+        # 100 (Continue) response if such a request comes from an HTTP/1.0
+        # (or earlier) client. There is an exception to this rule: for
+        # compatibility with RFC 2068, a server MAY send a 100 (Continue)
+        # status in response to an HTTP/1.1 PUT or POST request that does
+        # not include an Expect request-header field with the "100-
+        # continue" expectation. This exception, the purpose of which is
+        # to minimize any client processing delays associated with an
+        # undeclared wait for 100 (Continue) status, applies only to
+        # HTTP/1.1 requests, and not to requests with any other HTTP-
+        # version value.
+        #
+        # 10.1.1: 100 Continue - http://www.ietf.org/rfc/rfc2068.txt
+        # The client may continue with its request. This interim response is
+        # used to inform the client that the initial part of the request has
+        # been received and has not yet been rejected by the server. The client
+        # SHOULD continue by sending the remainder of the request or, if the
+        # request has already been completed, ignore this response. The server
+        # MUST send a final response after the request has been completed.
+
+        url = 'http://ws.serviceobjects.com/lv/LeadValidation.asmx/ValidateLead_V2'
+        http = EventMachine::HttpRequest.new(url).post :body => {:name => :test}
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 500
+          http.response.should match('Missing')
+          EventMachine.stop
+        }
+      }
+    end
+
+    it "should detect deflate encoding" do
+      pending "need an endpoint which supports deflate.. MSN is no longer"
+      EventMachine.run {
+
+        options = {:head => {"accept-encoding" => "deflate"}, :redirects => 5}
+        http = EventMachine::HttpRequest.new('http://www.msn.com').get options
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response_header["CONTENT_ENCODING"].should == "deflate"
+
+          EventMachine.stop
+        }
+      }
+    end
+
+    context "keepalive" do
+      it "should default to non-keepalive" do
+        EventMachine.run {
+          headers = {'If-Modified-Since' => 'Thu, 05 Aug 2010 22:54:44 GMT'}
+          http = EventMachine::HttpRequest.new('http://www.google.com/images/logos/ps_logo2.png').get :head => headers
+
+          http.errback { fail }
+          start = Time.now.to_i
+          http.callback {
+            (Time.now.to_i - start).should be_within(2).of(0)
+            EventMachine.stop
+          }
+        }
+      end
+
+      it "should work with keep-alive servers" do
+        EventMachine.run {
+          http = EventMachine::HttpRequest.new('http://mexicodiario.com/touch.public.json.php').get :keepalive => true
+
+          http.errback { failed(http) }
+          http.callback {
+            http.response_header.status.should == 200
+            EventMachine.stop
+          }
+        }
+      end
+    end
+
+  end
+end

data/spec/helper.rb

@@ -13,7 +13,7 @@ def failed(http = nil)
 end
 
 def requires_connection(&blk)
-  blk.call if system('ping -t1 -c1 google.com &> /dev/null')
+  blk.call if system('ping -t1 -c1 google.com 2>&1 > /dev/null')
 end
 
 def requires_port(port, &blk)
@@ -26,4 +26,4 @@ def requires_port(port, &blk)
   end
 
   blk.call if port_open
-end
+end

data/spec/multi_spec.rb

@@ -27,6 +27,14 @@ describe EventMachine::MultiRequest do
     }
   end
 
+  it "should require unique keys for each deferrable" do
+    lambda do
+      multi.add :df1, EM::DefaultDeferrable.new
+      multi.add :df1, EM::DefaultDeferrable.new
+    end.should raise_error("Duplicate Multi key")
+  end
+
+
   describe "#requests" do
     it "should return the added requests" do
       request1 = stub('request1', :callback => nil, :errback => nil)
@@ -35,7 +43,7 @@ describe EventMachine::MultiRequest do
       multi.add :a, request1
       multi.add :b, request2
 
-      multi.requests.should == [ request1, request2 ]
+      multi.requests.should == {:a => request1, :b => request2}
     end
   end
 

data/spec/pipelining_spec.rb

@@ -1,38 +1,66 @@
-require 'helper'
-
-requires_connection do
-
-  describe EventMachine::HttpRequest do
-
-    it "should perform successful pipelined GETs" do
-      EventMachine.run do
-
-        # Mongrel doesn't support pipelined requests - bah!
-        conn = EventMachine::HttpRequest.new('http://www.igvita.com/')
-
-        pipe1 = conn.get :keepalive => true
-        pipe2 = conn.get :path => '/about/', :keepalive => true
-
-        processed = 0
-        stop = proc { EM.stop if processed == 2}
-
-        pipe1.errback { failed(conn) }
-        pipe1.callback {
-          processed += 1
-          pipe1.response_header.status.should == 200
-          stop.call
-        }
-
-        pipe2.errback { p pipe2; failed(conn) }
-        pipe2.callback {
-          processed += 1
-          pipe2.response_header.status.should == 200
-          pipe2.response.should match(/ilya/i)
-          stop.call
-        }
-
-      end
-    end
-  end
-
-end
+require 'helper'
+
+requires_connection do
+
+  describe EventMachine::HttpRequest do
+
+    it "should perform successful pipelined GETs" do
+      EventMachine.run do
+
+        # Mongrel doesn't support pipelined requests - bah!
+        conn = EventMachine::HttpRequest.new('http://www.igvita.com/')
+
+        pipe1 = conn.get :keepalive => true
+        pipe2 = conn.get :path => '/archives/', :keepalive => true
+
+        processed = 0
+        stop = proc { EM.stop if processed == 2}
+
+        pipe1.errback { failed(conn) }
+        pipe1.callback {
+          processed += 1
+          pipe1.response_header.status.should == 200
+          stop.call
+        }
+
+        pipe2.errback { failed(conn) }
+        pipe2.callback {
+          processed += 1
+          pipe2.response_header.status.should == 200
+          pipe2.response.should match(/2011/i)
+          stop.call
+        }
+
+      end
+    end
+
+    it "should perform successful pipelined HEAD requests" do
+      EventMachine.run do
+        conn = EventMachine::HttpRequest.new('http://www.igvita.com/')
+
+        pipe1 = conn.head :keepalive => true
+        pipe2 = conn.head :path => '/archives/', :keepalive => true
+
+        processed = 0
+        stop = proc { EM.stop if processed == 2}
+
+        pipe1.errback { failed(conn) }
+        pipe1.callback {
+          processed += 1
+          pipe1.response_header.status.should == 200
+          stop.call
+        }
+
+        pipe2.errback { failed(conn) }
+        pipe2.callback {
+          processed += 1
+          pipe2.response_header.status.should == 200
+          stop.call
+        }
+
+      end
+
+    end
+  end
+
+end

data/spec/redirect_spec.rb

@@ -15,7 +15,7 @@ end
 
 class PickyRedirectMiddleware < RedirectMiddleware
   def response(r)
-    if r.redirect? && r.response_header['LOCATION'][-1] == '3'
+    if r.redirect? && r.response_header['LOCATION'][-1].chr == '3'
       # set redirects to 0 to avoid further processing
       r.req.redirects = 0
     end
@@ -40,6 +40,58 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should not forward cookies across domains with http redirect" do
+
+    expires  = (Date.today + 1).strftime('%a, %d %b %Y %T GMT')
+    response =<<-HTTP.gsub(/^ +/, '')
+      HTTP/1.1 301 MOVED PERMANENTLY
+      Location: http://localhost:8081/
+      Set-Cookie: foo=bar; expires=#{expires}; path=/; HttpOnly
+
+    HTTP
+
+    EventMachine.run do
+      @stub = StubServer.new(:host => '127.0.0.1', :port => 8080, :response => response)
+      @echo = StubServer.new(:host => 'localhost', :port => 8081, :echo     => true)
+
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :redirects => 1
+
+      http.errback  { failed(http) }
+      http.callback do
+        http.response.should_not match(/Cookie/)
+        @stub.stop
+        @echo.stop
+        EM.stop
+      end
+    end
+  end
+
+  it "should forward valid cookies across domains with http redirect" do
+
+    expires  = (Date.today + 1).strftime('%a, %d %b %Y %T GMT')
+    response =<<-HTTP.gsub(/^ +/, '')
+      HTTP/1.1 301 MOVED PERMANENTLY
+      Location: http://127.0.0.1:8081/
+      Set-Cookie: foo=bar; expires=#{expires}; path=/; HttpOnly
+
+    HTTP
+
+    EventMachine.run do
+      @stub = StubServer.new(:port => 8080, :response => response)
+      @echo = StubServer.new(:port => 8081, :echo     => true)
+
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :redirects => 1
+
+      http.errback  { failed(http) }
+      http.callback do
+        http.response.should match(/Cookie/)
+        @stub.stop
+        @echo.stop
+        EM.stop
+      end
+    end
+  end
+
   it "should redirect with missing content-length" do
     EventMachine.run {
       @s = StubServer.new("HTTP/1.0 301 MOVED PERMANENTLY\r\nlocation: http://127.0.0.1:8090/redirect\r\n\r\n")
@@ -144,7 +196,7 @@ describe EventMachine::HttpRequest do
         http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/gzip'
         http.redirects.should == 2
         http.cookies.should include("id=2;")
-        http.cookies.should include("another_id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;")
+        http.cookies.should include("another_id=1")
 
         EM.stop
       }
@@ -162,7 +214,7 @@ describe EventMachine::HttpRequest do
         http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/gzip'
         http.redirects.should == 2
         http.cookies.should include("id=2;")
-        http.cookies.should_not include("another_id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;")
+        http.cookies.should_not include("another_id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;")
 
         EM.stop
       }