astro-em-http-request 0.2.3 → 0.2.6

data/lib/em-http/mock.rb

@@ -0,0 +1,74 @@
+module EventMachine
+  class MockHttpRequest < EventMachine::HttpRequest
+    
+    include HttpEncoding
+    
+    class FakeHttpClient < EventMachine::HttpClient
+
+      def setup(response, uri)
+        @uri = uri
+        receive_data(response)
+        succeed(self) 
+      end
+      
+      def unbind
+      end
+      
+    end
+    
+    @@registry = nil
+    @@registry_count = nil
+    
+    def self.reset_counts!
+      @@registry_count = Hash.new{|h,k| h[k] = Hash.new(0)}
+    end
+    
+    def self.reset_registry!
+      @@registry = Hash.new{|h,k| h[k] = {}}
+    end
+    
+    reset_counts!
+    reset_registry!
+    
+    @@pass_through_requests = true
+
+    def self.pass_through_requests=(pass_through_requests)
+      @@pass_through_requests = pass_through_requests
+    end
+    
+    def self.pass_through_requests
+      @@pass_through_requests
+    end
+    
+    def self.register(uri, method, data)
+      method = method.to_s.upcase
+      @@registry[uri][method] = data
+    end
+    
+    def self.register_file(uri, method, file)
+      register(uri, method, File.read(file))
+    end
+    
+    def self.count(uri, method)
+      method = method.to_s.upcase
+      @@registry_count[uri][method]
+    end
+    
+    alias_method :real_send_request, :send_request
+    
+    protected
+    def send_request(&blk)
+      query = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}#{encode_query(@uri.path, @options[:query], @uri.query)}"
+      if s = @@registry[query] and fake = s[@method]
+        @@registry_count[query][@method] += 1
+        client = FakeHttpClient.new(nil)
+        client.setup(fake, @uri)
+        client
+      elsif @@pass_through_requests
+        real_send_request
+      else
+        raise "this request #{query} for method #{@method} isn't registered, and pass_through_requests is current set to false"
+      end
+    end
+  end
+end

data/lib/em-http/request.rb

@@ -9,7 +9,6 @@ module EventMachine
   #
   # == Example
   #
-  #
   #  EventMachine.run {
   #    http = EventMachine::HttpRequest.new('http://127.0.0.1/').get :query => {'keyname' => 'value'}
   #
@@ -24,6 +23,8 @@ module EventMachine
   #
 
   class HttpRequest
+    
+    attr_reader :options, :method
 
     def initialize(host, headers = {})
       @headers = headers
@@ -45,44 +46,53 @@ module EventMachine
     #     Called for each response body chunk (you may assume HTTP 200
     #     OK then)
     #
-    #   host: String
-    #     Manually specify TCP connect host address, independent of
-    #     Host: header
-    #
-    #   max_bytes: Integer
-    #     Explictly specify a maximum number of bytes that this connection may receive before shutting down.
-    #     Default : none.
-    #
-    #   max_connection_duration: Integer
-    #     Explictly specify a maximum number of second for the connection. This is useful to avoid dealing with never ending connections (AtomStream-like)
-    #     Default : none.
-    #
-    
-
-    def get  options = {};    send_request(:get,  options);    end
-    def head options = {};    send_request(:head, options);    end
-    def post options = {};    send_request(:post, options);    end
+                                   
+    def get    options = {}, &blk;  setup_request(:get,  options, &blk);    end
+    def head   options = {}, &blk;  setup_request(:head, options, &blk);    end
+    def delete options = {}, &blk;  setup_request(:delete, options, &blk);  end
+    def put    options = {}, &blk;  setup_request(:put, options, &blk);     end
+    def post   options = {}, &blk;  setup_request(:post, options, &blk);    end
 
     protected
 
-    def send_request(method, options)
+    def setup_request(method, options, &blk)
       raise ArgumentError, "invalid request path" unless /^\// === @uri.path
+      @options = options
+      
+      if proxy = options[:proxy]
+        @host_to_connect = proxy[:host]
+        @port_to_connect = proxy[:port]
+      else
+        @host_to_connect = options[:host] || @uri.host
+        @port_to_connect = options[:port] || @uri.port
+      end                                      
+      
+      # default connect & inactivity timeouts        
+      @options[:timeout] = 10 if not @options[:timeout]  
 
-      # default connect & inactivity timeouts
-      options[:timeout] = 5 if not options[:timeout]
-
-      # Make sure the port is set as Addressable::URI doesn't set the
-      # port if it isn't there.
-      @uri.port = @uri.port ? @uri.port : 80
-      method = method.to_s.upcase
+      # Make sure the ports are set as Addressable::URI doesn't
+      # set the port if it isn't there
+      if @uri.scheme == "https"
+        @uri.port ||= 443
+        @port_to_connect ||= 443
+      else
+        @uri.port ||= 80
+        @port_to_connect ||= 80
+      end
+      
+      @method = method.to_s.upcase
+      send_request(&blk)
+    end
+    
+    def send_request(&blk)
       begin
-       host = options[:host] || @uri.host
-       raise ArgumentError, "invalid host" unless host
-       raise ArgumentError, "invalid port" unless @uri.port
-       EventMachine.connect(host, @uri.port, EventMachine::HttpClient) { |c|
+      raise ArgumentError, "invalid host" unless @host_to_connect
+      raise ArgumentError, "invalid port" unless @port_to_connect
+               
+       EventMachine.connect(@host_to_connect, @port_to_connect, EventMachine::HttpClient) { |c|
           c.uri = @uri
-          c.method = method
-          c.options = options
+          c.method = @method
+          c.options = @options || {}
           if options.has_key?(:timeout) && options[:timeout]
             c.comm_inactivity_timeout = options[:timeout]
             c.pending_connect_timeout = options[:timeout] if c.respond_to?(:pending_connect_timeout)
@@ -90,11 +100,11 @@ module EventMachine
             c.comm_inactivity_timeout = 5
             c.pending_connect_timeout = 5 if c.respond_to?(:pending_connect_timeout)
           end
+          blk.call(c) unless blk.nil?
         }
-      rescue RuntimeError => e 
-        raise e unless e.message == "no connection"
+      rescue EventMachine::ConnectionError => e
         conn = EventMachine::HttpClient.new("")
-        conn.on_error("no connection", true)
+        conn.on_error(e.message, true)
         conn
       end
     end

data/spec/fixtures/google.ca

@@ -0,0 +1,21 @@
+HTTP/1.0 200 OK
+Date: Mon, 16 Nov 2009 20:39:15 GMT
+Expires: -1
+Cache-Control: private, max-age=0
+Content-Type: text/html; charset=ISO-8859-1
+Set-Cookie: PREF=ID=9454187d21c4a6a6:TM=1258403955:LM=1258403955:S=2-mf1n5oV5yAeT9-; expires=Wed, 16-Nov-2011 20:39:15 GMT; path=/; domain=.google.ca
+Set-Cookie: NID=28=lvxxVdiBQkCetu_WFaUxLyB7qPlHXS5OdAGYTqge_laVlCKVN8VYYeVBh4bNZiK_Oan2gm8oP9GA-FrZfMPC3ZMHeNq37MG2JH8AIW9LYucU8brOeuggMEbLNNXuiWg4; expires=Tue, 18-May-2010 20:39:15 GMT; path=/; domain=.google.ca; HttpOnly
+Server: gws
+X-XSS-Protection: 0
+X-Cache: MISS from .
+Via: 1.0 .:80 (squid)
+Connection: close
+
+<!doctype html><html><head><meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><title>Google</title><script>window.google={kEI:"eLgBS4LROqCQedKVvfUL",kEXPI:"17259,21329,21516,22107",kCSI:{e:"17259,21329,21516,22107",ei:"eLgBS4LROqCQedKVvfUL"},kHL:"en",time:function(){return(new Date).getTime()},log:function(b,d,c){var a=new Image,e=google,g=e.lc,f=e.li;a.onerror=(a.onload=(a.onabort=function(){delete g[f]}));g[f]=a;c=c||"/gen_204?atyp=i&ct="+b+"&cad="+d+"&zx="+google.time();a.src=c;e.li=f+1},lc:[],li:0};
+window.google.sn="webhp";window.google.timers={load:{t:{start:(new Date).getTime()}}};try{}catch(b){}window.google.jsrt_kill=1;
+var _gjwl=location;function _gjuc(){var e=_gjwl.href.indexOf("#");if(e>=0){var a=_gjwl.href.substring(e);if(a.indexOf("&q=")>0||a.indexOf("#q=")>=0){a=a.substring(1);if(a.indexOf("#")==-1){for(var c=0;c<a.length;){var d=c;if(a.charAt(d)=="&")++d;var b=a.indexOf("&",d);if(b==-1)b=a.length;var f=a.substring(d,b);if(f.indexOf("fp=")==0){a=a.substring(0,c)+a.substring(b,a.length);b=c}else if(f=="cad=h")return 0;c=b}_gjwl.href="/search?"+a+"&cad=h";return 1}}}return 0}function _gjp(){!(window._gjwl.hash&&
+window._gjuc())&&setTimeout(_gjp,500)};
+window._gjp && _gjp()</script><style>td{line-height:.8em;}.gac_m td{line-height:17px;}form{margin-bottom:20px;}body,td,a,p,.h{font-family:arial,sans-serif}.h{color:#36c;font-size:20px}.q{color:#00c}.ts td{padding:0}.ts{border-collapse:collapse}em{font-weight:bold;font-style:normal}.lst{font:17px arial,sans-serif;margin-bottom:.2em;vertical-align:bottom;}input{font-family:inherit}.lsb,.gac_sb{font-size:15px;height:1.85em!important;margin:.2em;}#gbar{height:22px}.gbh,.gbd{border-top:1px solid #c9d7f1;font-size:1px}.gbh{height:0;position:absolute;top:24px;width:100%}#guser{padding-bottom:7px !important;text-align:right}#gbar,#guser{font-size:13px;padding-top:1px !important}@media all{.gb1,.gb3{height:22px;margin-right:.5em;vertical-align:top}#gbar{float:left}}a.gb1,a.gb3,a.gb4{color:#00c !important}.gb3{text-decoration:none}</style><script>google.y={};google.x=function(e,g){google.y[e.id]=[e,g];return false};</script></head><body bgcolor=#ffffff text=#000000 link=#0000cc vlink=#551a8b alink=#ff0000 onload="document.f.q.focus();if(document.images)new Image().src='/images/nav_logo7.png'" topmargin=3 marginheight=3><textarea id=csi style=display:none></textarea><div id=gbar><nobr><b class=gb1>Web</b> <a href="http://images.google.ca/imghp?hl=en&tab=wi" class=gb1>Images</a> <a href="http://video.google.ca/?hl=en&tab=wv" class=gb1>Videos</a> <a href="http://maps.google.ca/maps?hl=en&tab=wl" class=gb1>Maps</a> <a href="http://news.google.ca/nwshp?hl=en&tab=wn" class=gb1>News</a> <a href="http://groups.google.ca/grphp?hl=en&tab=wg" class=gb1>Groups</a> <a href="http://mail.google.com/mail/?hl=en&tab=wm" class=gb1>Gmail</a> <a href="http://www.google.ca/intl/en/options/" class=gb3><u>more</u> &raquo;</a></nobr></div><div id=guser width=100%><nobr><a href="/url?sa=p&pref=ig&pval=3&q=http://www.google.ca/ig%3Fhl%3Den%26source%3Diglk&usg=AFQjCNG2Kt7TgMZuV7Fl3FeeTOmTWMvggA" class=gb4>iGoogle</a> | <a href="/preferences?hl=en" class=gb4>Search settings</a> | <a href="https://www.google.com/accounts/Login?hl=en&continue=http://www.google.ca/" class=gb4>Sign in</a></nobr></div><div class=gbh style=left:0></div><div class=gbh style=right:0></div><center><br clear=all id=lgpd><img alt="Google" height=110 src="/intl/en_ca/images/logo.gif" width=276 id=logo onload="window.lol&&lol()"><br><br><form action="/search" name=f><table cellpadding=0 cellspacing=0><tr valign=top><td width=25%>&nbsp;</td><td align=center nowrap><input name=hl type=hidden value=en><input name=source type=hidden value=hp><input type=hidden name=ie value="ISO-8859-1"><input autocomplete="off" maxlength=2048 name=q size=55 class=lst title="Google Search" value=""><br><input name=btnG type=submit value="Google Search" class=lsb><input name=btnI type=submit value="I'm Feeling Lucky" class=lsb></td><td nowrap width=25% align=left><font size=-2>&nbsp;&nbsp;<a href=/advanced_search?hl=en>Advanced Search</a><br>&nbsp;&nbsp;<a href=/language_tools?hl=en>Language Tools</a></font></td></tr><tr><td align=center colspan=3><font size=-1><span style="text-align:left">Search: <input id=all type=radio name=meta value="" checked><label for=all> the web </label> <input id=cty type=radio name=meta value="cr=countryCA"><label for=cty> pages from Canada </label> </span></font></td></tr></table></form><br><font size=-1>Google.ca offered in: <a href="http://www.google.ca/setprefs?sig=0_XtMil90_yvnNEW8dIglASaHCVhU=&hl=fr">fran?ais</a> </font><br><br><br><font size=-1><a href="/intl/en/ads/">Advertising&nbsp;Programs</a> - <a href="/services/">Business Solutions</a> - <a href="/intl/en/about.html">About Google</a> - <a href="http://www.google.com/ncr">Go to Google.com</a></font><p><font size=-2>&copy;2009 - <a href="/intl/en/privacy.html">Privacy</a></font></p></center><div id=xjsd></div><div id=xjsi><script>if(google.y)google.y.first=[];if(google.y)google.y.first=[];google.dstr=[];google.rein=[];window.setTimeout(function(){var a=document.createElement("script");a.src="/extern_js/f/CgJlbhICY2EgACswCjhBQB0sKzAOOAksKzAYOAQsKzAlOMmIASwrMCY4BywrMCc4Aiw/n_sssePDGvc.js";(document.getElementById("xjsd")||document.body).appendChild(a)},0);
+;google.y.first.push(function(){google.ac.b=true;google.ac.i(document.f,document.f.q,'','')});google.xjs&&google.j&&google.j.xi&&google.j.xi()</script></div><script>(function(){
+function a(){google.timers.load.t.ol=(new Date).getTime();google.report&&google.timers.load.t.xjs&&google.report(google.timers.load,google.kCSI)}if(window.addEventListener)window.addEventListener("load",a,false);else if(window.attachEvent)window.attachEvent("onload",a);google.timers.load.t.prt=(new Date).getTime();
+})();

data/spec/hash_spec.rb

@@ -0,0 +1,24 @@
+require 'spec/helper'
+
+describe Hash do
+  
+  describe ".to_params" do
+    it "should transform a basic hash into HTTP POST Params" do
+      {:a => "alpha", :b => "beta"}.to_params.split("&").should include "a=alpha"
+      {:a => "alpha", :b => "beta"}.to_params.split("&").should include "b=beta"
+    end
+    
+    it "should transform a more complex hash into HTTP POST Params" do
+      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "a=a"
+      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "b[0]=c"
+      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "b[1]=d"
+      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "b[2]=e"
+    end
+
+    it "should transform a very complex hash into HTTP POST Params" do
+      params = {:a => "a", :b => [{:c => "c", :d => "d"}, {:e => "e", :f => "f"}]}.to_params.split("&")
+      params.should include "a=a"
+      params.should include "b[0][d]=d"
+    end
+  end
+end

data/spec/helper.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'spec'
+require 'pp'
+
+require 'lib/em-http'
+require 'lib/em-http/mock'
+require 'em-websocket'

data/spec/mock_spec.rb

@@ -0,0 +1,72 @@
+require 'spec/helper'
+
+describe 'em-http mock' do
+
+  before(:each) do
+    EventMachine::MockHttpRequest.reset_registry!
+    EventMachine::MockHttpRequest.reset_counts!
+  end
+  
+  it "should serve a fake http request from a file" do
+    EventMachine::MockHttpRequest.register_file('http://www.google.ca:80/', :get, File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'))
+    EM.run {
+      
+      http = EventMachine::MockHttpRequest.new('http://www.google.ca/').get
+      http.errback { fail }
+      http.callback {
+        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca')).split("\n\n", 2).last
+        EventMachine.stop
+      }
+    }
+    
+    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get).should == 1
+  end
+  
+  it "should serve a fake http request from a string" do
+    data = <<-HEREDOC
+HTTP/1.0 200 OK
+Date: Mon, 16 Nov 2009 20:39:15 GMT
+Expires: -1
+Cache-Control: private, max-age=0
+Content-Type: text/html; charset=ISO-8859-1
+Set-Cookie: PREF=ID=9454187d21c4a6a6:TM=1258403955:LM=1258403955:S=2-mf1n5oV5yAeT9-; expires=Wed, 16-Nov-2011 20:39:15 GMT; path=/; domain=.google.ca
+Set-Cookie: NID=28=lvxxVdiBQkCetu_WFaUxLyB7qPlHXS5OdAGYTqge_laVlCKVN8VYYeVBh4bNZiK_Oan2gm8oP9GA-FrZfMPC3ZMHeNq37MG2JH8AIW9LYucU8brOeuggMEbLNNXuiWg4; expires=Tue, 18-May-2010 20:39:15 GMT; path=/; domain=.google.ca; HttpOnly
+Server: gws
+X-XSS-Protection: 0
+X-Cache: MISS from .
+Via: 1.0 .:80 (squid)
+Connection: close
+
+<!doctype html><html><head><meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><title>Google</title><script>window.google={kEI:"eLgBS4LROqCQedKVvfUL",kEXPI:"17259,21329,21516,22107",kCSI:{e:"17259,21329,21516,22107",ei:"eLgBS4LROqCQedKVvfUL"},kHL:"en",time:function(){return(new Date).getTime()},log:function(b,d,c){var a=new Image,e=google,g=e.lc,f=e.li;a.onerror=(a.onload=(a.onabort=function(){delete g[f]}));g[f]=a;c=c||"/gen_204?atyp=i&ct="+b+"&cad="+d+"&zx="+google.time();a.src=c;e.li=f+1},lc:[],li:0};
+window.google.sn="webhp";window.google.timers={load:{t:{start:(new Date).getTime()}}};try{}catch(b){}window.google.jsrt_kill=1;
+var _gjwl=location;function _gjuc(){var e=_gjwl.href.indexOf("#");if(e>=0){var a=_gjwl.href.substring(e);if(a.indexOf("&q=")>0||a.indexOf("#q=")>=0){a=a.substring(1);if(a.indexOf("#")==-1){for(var c=0;c<a.length;){var d=c;if(a.charAt(d)=="&")++d;var b=a.indexOf("&",d);if(b==-1)b=a.length;var f=a.substring(d,b);if(f.indexOf("fp=")==0){a=a.substring(0,c)+a.substring(b,a.length);b=c}else if(f=="cad=h")return 0;c=b}_gjwl.href="/search?"+a+"&cad=h";return 1}}}return 0}function _gjp(){!(window._gjwl.hash&&
+window._gjuc())&&setTimeout(_gjp,500)};
+window._gjp && _gjp()</script><style>td{line-height:.8em;}.gac_m td{line-height:17px;}form{margin-bottom:20px;}body,td,a,p,.h{font-family:arial,sans-serif}.h{color:#36c;font-size:20px}.q{color:#00c}.ts td{padding:0}.ts{border-collapse:collapse}em{font-weight:bold;font-style:normal}.lst{font:17px arial,sans-serif;margin-bottom:.2em;vertical-align:bottom;}input{font-family:inherit}.lsb,.gac_sb{font-size:15px;height:1.85em!important;margin:.2em;}#gbar{height:22px}.gbh,.gbd{border-top:1px solid #c9d7f1;font-size:1px}.gbh{height:0;position:absolute;top:24px;width:100%}#guser{padding-bottom:7px !important;text-align:right}#gbar,#guser{font-size:13px;padding-top:1px !important}@media all{.gb1,.gb3{height:22px;margin-right:.5em;vertical-align:top}#gbar{float:left}}a.gb1,a.gb3,a.gb4{color:#00c !important}.gb3{text-decoration:none}</style><script>google.y={};google.x=function(e,g){google.y[e.id]=[e,g];return false};</script></head><body bgcolor=#ffffff text=#000000 link=#0000cc vlink=#551a8b alink=#ff0000 onload="document.f.q.focus();if(document.images)new Image().src='/images/nav_logo7.png'" topmargin=3 marginheight=3><textarea id=csi style=display:none></textarea><div id=gbar><nobr><b class=gb1>Web</b> <a href="http://images.google.ca/imghp?hl=en&tab=wi" class=gb1>Images</a> <a href="http://video.google.ca/?hl=en&tab=wv" class=gb1>Videos</a> <a href="http://maps.google.ca/maps?hl=en&tab=wl" class=gb1>Maps</a> <a href="http://news.google.ca/nwshp?hl=en&tab=wn" class=gb1>News</a> <a href="http://groups.google.ca/grphp?hl=en&tab=wg" class=gb1>Groups</a> <a href="http://mail.google.com/mail/?hl=en&tab=wm" class=gb1>Gmail</a> <a href="http://www.google.ca/intl/en/options/" class=gb3><u>more</u> &raquo;</a></nobr></div><div id=guser width=100%><nobr><a href="/url?sa=p&pref=ig&pval=3&q=http://www.google.ca/ig%3Fhl%3Den%26source%3Diglk&usg=AFQjCNG2Kt7TgMZuV7Fl3FeeTOmTWMvggA" class=gb4>iGoogle</a> | <a href="/preferences?hl=en" class=gb4>Search settings</a> | <a href="https://www.google.com/accounts/Login?hl=en&continue=http://www.google.ca/" class=gb4>Sign in</a></nobr></div><div class=gbh style=left:0></div><div class=gbh style=right:0></div><center><br clear=all id=lgpd><img alt="Google" height=110 src="/intl/en_ca/images/logo.gif" width=276 id=logo onload="window.lol&&lol()"><br><br><form action="/search" name=f><table cellpadding=0 cellspacing=0><tr valign=top><td width=25%>&nbsp;</td><td align=center nowrap><input name=hl type=hidden value=en><input name=source type=hidden value=hp><input type=hidden name=ie value="ISO-8859-1"><input autocomplete="off" maxlength=2048 name=q size=55 class=lst title="Google Search" value=""><br><input name=btnG type=submit value="Google Search" class=lsb><input name=btnI type=submit value="I'm Feeling Lucky" class=lsb></td><td nowrap width=25% align=left><font size=-2>&nbsp;&nbsp;<a href=/advanced_search?hl=en>Advanced Search</a><br>&nbsp;&nbsp;<a href=/language_tools?hl=en>Language Tools</a></font></td></tr><tr><td align=center colspan=3><font size=-1><span style="text-align:left">Search: <input id=all type=radio name=meta value="" checked><label for=all> the web </label> <input id=cty type=radio name=meta value="cr=countryCA"><label for=cty> pages from Canada </label> </span></font></td></tr></table></form><br><font size=-1>Google.ca offered in: <a href="http://www.google.ca/setprefs?sig=0_XtMil90_yvnNEW8dIglASaHCVhU=&hl=fr">fran?ais</a> </font><br><br><br><font size=-1><a href="/intl/en/ads/">Advertising&nbsp;Programs</a> - <a href="/services/">Business Solutions</a> - <a href="/intl/en/about.html">About Google</a> - <a href="http://www.google.com/ncr">Go to Google.com</a></font><p><font size=-2>&copy;2009 - <a href="/intl/en/privacy.html">Privacy</a></font></p></center><div id=xjsd></div><div id=xjsi><script>if(google.y)google.y.first=[];if(google.y)google.y.first=[];google.dstr=[];google.rein=[];window.setTimeout(function(){var a=document.createElement("script");a.src="/extern_js/f/CgJlbhICY2EgACswCjhBQB0sKzAOOAksKzAYOAQsKzAlOMmIASwrMCY4BywrMCc4Aiw/n_sssePDGvc.js";(document.getElementById("xjsd")||document.body).appendChild(a)},0);
+;google.y.first.push(function(){google.ac.b=true;google.ac.i(document.f,document.f.q,'','')});google.xjs&&google.j&&google.j.xi&&google.j.xi()</script></div><script>(function(){
+function a(){google.timers.load.t.ol=(new Date).getTime();google.report&&google.timers.load.t.xjs&&google.report(google.timers.load,google.kCSI)}if(window.addEventListener)window.addEventListener("load",a,false);else if(window.attachEvent)window.attachEvent("onload",a);google.timers.load.t.prt=(new Date).getTime();
+})();
+    HEREDOC
+    EventMachine::MockHttpRequest.register('http://www.google.ca:80/', :get, data)
+    EventMachine.run {
+      
+      http = EventMachine::MockHttpRequest.new('http://www.google.ca/').get
+      http.errback { fail }
+      http.callback {
+        http.response.should == data.split("\n\n", 2).last
+        EventMachine.stop
+      }
+    }
+    
+    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get).should == 1
+  end
+
+  it "should raise an exception if pass-thru is disabled" do
+    EventMachine::MockHttpRequest.pass_through_requests = false
+    EventMachine.run {
+      proc {
+        http = EventMachine::MockHttpRequest.new('http://www.google.ca/').get
+      }.should raise_error
+      EventMachine.stop
+    }
+  end
+end

data/{test/test_multi.rb → spec/multi_spec.rb}

@@ -1,5 +1,5 @@
-require 'test/helper'
-require 'test/stallion'
+require 'spec/helper'
+require 'spec/stallion'
 
 describe EventMachine::MultiRequest do
 
@@ -11,7 +11,7 @@ describe EventMachine::MultiRequest do
       
       # add multiple requests to the multi-handler
       multi.add(EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get(:query => {:q => 'test'}))
-      multi.add(EventMachine::HttpRequest.new('http://0.0.0.0/').get(:timeout => 1))
+      multi.add(EventMachine::HttpRequest.new('http://0.0.0.0:8083/').get(:timeout => 1))
       
       multi.callback  {
         # verify successfull request

data/{test/test_request.rb → spec/request_spec.rb}

@@ -1,14 +1,14 @@
-require 'test/helper'
-require 'test/stallion'
-require 'test/stub_server'
- 
+require 'spec/helper'
+require 'spec/stallion'
+require 'spec/stub_server'
+
 describe EventMachine::HttpRequest do
 
   def failed
     EventMachine.stop
     fail
   end
-  
+
   it "should fail GET on DNS timeout" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.1.1.1/').get :timeout => 1
@@ -26,7 +26,7 @@ describe EventMachine::HttpRequest do
       http.callback { failed }
       http.errback {
         http.response_header.status.should == 0
-        http.errors.should match(/no connection/)
+        http.errors.should match(/unable to resolve server address/)
         EventMachine.stop
       }
     }
@@ -54,7 +54,7 @@ describe EventMachine::HttpRequest do
       }
     }
   end
-  
+
   it "should perform successfull GET with a URI passed as argument" do
     EventMachine.run {
       uri = URI.parse('http://127.0.0.1:8080/')
@@ -66,7 +66,7 @@ describe EventMachine::HttpRequest do
         http.response.should match(/Hello/)
         EventMachine.stop
       }
-    }    
+    }
   end
 
   it "should perform successfull HEAD with a URI passed as argument" do
@@ -80,7 +80,22 @@ describe EventMachine::HttpRequest do
         http.response.should == ""
         EventMachine.stop
       }
-    }    
+    }
+  end
+
+  # should be no different than a GET
+  it "should perform successfull DELETE with a URI passed as argument" do
+    EventMachine.run {
+      uri = URI.parse('http://127.0.0.1:8080/')
+      http = EventMachine::HttpRequest.new(uri).delete
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response.should == ""
+        EventMachine.stop
+      }
+    }
   end
 
   it "should return 404 on invalid path" do
@@ -88,7 +103,7 @@ describe EventMachine::HttpRequest do
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/fail').get
 
       http.errback { failed }
-      http.callback { 
+      http.callback {
         http.response_header.status.should == 404
         EventMachine.stop
       }
@@ -134,6 +149,20 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  # should be no different than a POST
+  it "should perform successfull PUT" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').put :body => "data"
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response.should match(/data/)
+        EventMachine.stop
+      }
+    }
+  end
+
   it "should perform successfull POST" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').post :body => "data"
@@ -154,13 +183,13 @@ describe EventMachine::HttpRequest do
       http.errback { failed }
       http.callback {
         http.response_header.status.should == 200
-        
+
         http.response.should match(/key1=1&key2\[0\]=2&key2\[1\]=3/)
         EventMachine.stop
       }
     }
   end
-  
+
   it "should perform successfull POST with Ruby Hash/Array as params and with the correct content length" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_length').post :body => {"key1" => "data1"}
@@ -168,7 +197,7 @@ describe EventMachine::HttpRequest do
       http.errback { failed }
       http.callback {
         http.response_header.status.should == 200
-        
+
         http.response.to_i.should == 10
         EventMachine.stop
       }
@@ -214,6 +243,20 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should send proper OAuth auth header" do
+    EventMachine.run {
+      oauth_header = 'OAuth oauth_nonce="oqwgSYFUD87MHmJJDv7bQqOF2EPnVus7Wkqj5duNByU", b=c, d=e'
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/oauth_auth').get :head => {'authorization' => oauth_header}
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response.should == oauth_header
+        EventMachine.stop
+      }
+    }
+  end
+
   it "should work with keep-alive servers" do
     EventMachine.run {
 
@@ -275,7 +318,7 @@ describe EventMachine::HttpRequest do
   it "should optionally pass the response body progressively" do
     EventMachine.run {
       body = ''
-      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get 
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get
 
       http.errback { failed }
       http.stream { |chunk| body += chunk }
@@ -418,7 +461,7 @@ describe EventMachine::HttpRequest do
       }
     end
 
-     it "should not override content-type when passing in ruby hash/array for body" do
+    it "should not override content-type when passing in ruby hash/array for body" do
       EventMachine.run {
         http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_type').post({
             :body => {:a => :b}, :head => {'content-type' => 'text'}})
@@ -437,34 +480,153 @@ describe EventMachine::HttpRequest do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/relative-location').get
 
+      http.errback { failed }
+      http.callback {
+        http.response_header['LOCATION'].should == 'http://127.0.0.1:8080/forwarded'
+        EventMachine.stop
+      }
+    }
+  end   
+  
+  it 'should let you pass a block to be called once the client is created' do
+    client = nil
+    EventMachine.run {
+      request = EventMachine::HttpRequest.new('http://127.0.0.1:8080/')
+      http = request.post { |c|
+        c.options[:body] = {:callback_run => 'yes'}
+        client = c
+      }
+      http.errback { failed }
+      http.callback {
+        client.should be_kind_of(EventMachine::HttpClient)
+        http.response_header.status.should == 200
+        http.response.should match(/callback_run=yes/)
+        client.normalize_uri.should == Addressable::URI.parse('http://127.0.0.1:8080/')
+        EventMachine.stop
+      }
+    }
+  end
+
+  it "should retrieve multiple cookies" do
+    EventMachine::MockHttpRequest.register_file('http://www.google.ca:80/', :get, File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'))
+    EventMachine.run {
+
+      http = EventMachine::MockHttpRequest.new('http://www.google.ca/').get
+      http.errback { fail }
+      http.callback {
+        c1 = "PREF=ID=9454187d21c4a6a6:TM=1258403955:LM=1258403955:S=2-mf1n5oV5yAeT9-; expires=Wed, 16-Nov-2011 20:39:15 GMT; path=/; domain=.google.ca"
+        c2 = "NID=28=lvxxVdiBQkCetu_WFaUxLyB7qPlHXS5OdAGYTqge_laVlCKVN8VYYeVBh4bNZiK_Oan2gm8oP9GA-FrZfMPC3ZMHeNq37MG2JH8AIW9LYucU8brOeuggMEbLNNXuiWg4; expires=Tue, 18-May-2010 20:39:15 GMT; path=/; domain=.google.ca; HttpOnly"
+        http.response_header.cookie.should == [c1, c2]
+
+        EventMachine.stop
+      }
+    }
+
+    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get).should == 1
+  end
+
+  context "connections via proxy" do
+
+    it "should work with proxy servers" do
+      EventMachine.run {
+
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :proxy => {:host => '127.0.0.1', :port => 8082}
+
+        http.errback { p http.inspect; failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should == 'Hello, World!'
+          EventMachine.stop
+        }
+      }
+    end
+
+    it "should proxy POST data" do
+      EventMachine.run {
+
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').post({
+            :body => "data", :proxy => {:host => '127.0.0.1', :port => 8082}})
+
         http.errback { failed }
         http.callback {
-          http.response_header['LOCATION'].should == 'http://127.0.0.1:8080/forwarded'
+          http.response_header.status.should == 200
+          http.response.should match(/data/)
           EventMachine.stop
         }
       }
+    end
   end
 
-  it "should return an error if the response size exceeds the :max_bytes option" do
-     EventMachine.run {
-        http = EventMachine::HttpRequest.new("http://127.0.0.1:8080/").get(:max_bytes => 3)
-        http.errback { |http|
-          http.errors.should match /Bytes received exceeds limit/
+  context "websocket connection" do
+    # Spec: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-55
+    #
+    # ws.onopen     = http.callback
+    # ws.onmessage  = http.stream { |msg| }
+    # ws.errback    = no connection
+    #
+
+    it "should invoke errback on failed upgrade" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('ws://127.0.0.1:8080/').get :timeout => 0
+
+        http.callback { failed }
+        http.errback {
+          http.response_header.status.should == 200
           EventMachine.stop
         }
-        http.callback { failed }
       }
-  end
+    end
 
-  it "should return an error if the connection duration exceeds the :max_connection_duration option" do
-     EventMachine.run {
-        http = EventMachine::HttpRequest.new("http://updates.sixapart.com/atom-stream.xml").get(:max_connection_duration => 3)
-        http.errback { |http|
-          http.errors.should match /Max Connection Duration Exceeded/
+    it "should complete websocket handshake and transfer data from client to server and back" do
+      EventMachine.run {
+        MSG = "hello bi-directional data exchange"
+
+        EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8085) do |ws|
+          ws.onmessage {|msg| ws.send msg}
+        end
+
+        http = EventMachine::HttpRequest.new('ws://127.0.0.1:8085/').get :timeout => 1
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 101
+          http.response_header['CONNECTION'].should match(/Upgrade/)
+          http.response_header['UPGRADE'].should match(/WebSocket/)
+
+          # push should only be invoked after handshake is complete
+          http.send(MSG)
+        }
+        
+        http.stream { |chunk|
+          chunk.should == MSG
           EventMachine.stop
         }
-        http.callback { failed }
       }
-  end
+    end
 
+    it "should split multiple messages from websocket server into separate stream callbacks" do
+      EM.run do
+        messages = %w[1 2]
+        recieved = []
+
+        EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8085) do |ws|
+          ws.onopen {
+            ws.send messages[0]
+            ws.send messages[1]
+          }
+        end
+
+        EventMachine.add_timer(0.1) do
+          http = EventMachine::HttpRequest.new('ws://127.0.0.1:8085/').get :timeout => 0
+          http.errback { failed }
+          http.callback { http.response_header.status.should == 101 }
+          http.stream {|msg|
+            msg.should == messages[recieved.size]
+            recieved.push msg
+
+            EventMachine.stop if recieved.size == messages.size
+          }
+        end
+      end
+    end
+  end
 end