em-http-request 0.2.2 → 0.2.3

data/Rakefile

@@ -36,6 +36,7 @@ end
 
 task :spec do
 	sh 'spec test/test_*.rb'
+	sh 'spec test/mock/test_*.rb'
 end
 
 def make(makedir)
@@ -96,6 +97,7 @@ begin
     gemspec.add_dependency('eventmachine', '>= 0.12.9')
     gemspec.add_dependency('addressable', '>= 2.0.0')
     gemspec.rubyforge_project = "em-http-request"
+    gemspec.files = FileList["[A-Z]*", "{lib,test,ext}/**/*"]
   end
   
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/ext/http11_client/Makefile

@@ -0,0 +1,157 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /opt/local/lib/ruby/1.8/i686-darwin10
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+exec_prefix = $(prefix)
+prefix = $(DESTDIR)/opt/local
+sharedstatedir = $(prefix)/com
+mandir = $(DESTDIR)/opt/local/share/man
+psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
+localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(exec_prefix)/libexec
+sitedir = $(libdir)/ruby/site_ruby
+htmldir = $(docdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+includedir = $(prefix)/include
+infodir = $(datarootdir)/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(prefix)/etc
+libdir = $(exec_prefix)/lib
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(DESTDIR)/opt/local/lib/ruby/vendor_ruby
+datarootdir = $(prefix)/share
+pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
+sitearchdir = $(sitelibdir)/$(sitearch)
+datadir = $(datarootdir)
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+
+CC = /usr/bin/gcc-4.2
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fno-common -O2 -arch x86_64  -fno-common -pipe -fno-common $(cflags) -arch x86_64
+INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin10 -I.
+DEFS     = 
+CPPFLAGS =  -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE  -I/opt/local/include
+CXXFLAGS = $(CFLAGS) 
+ldflags  = -L. -L/opt/local/lib
+dldflags = 
+archflag = -arch x86_64
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i686-darwin10
+sitearch = i686-darwin10
+ruby_version = 1.8
+ruby = /opt/local/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lc  -lpthread -ldl -lobjc  
+SRCS = http11_client.c http11_parser.c
+OBJS = http11_client.o http11_parser.o
+TARGET = http11_client
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/lib/em-http.rb

@@ -3,10 +3,8 @@
 # You can redistribute this under the terms of the Ruby license
 # See file LICENSE for details
 #++
-
-require 'rubygems'
-require 'eventmachine'
-
+                          
+require 'eventmachine'    
 
 require File.dirname(__FILE__) + '/http11_client'
 require File.dirname(__FILE__) + '/em_buffer'
@@ -15,4 +13,4 @@ require File.dirname(__FILE__) + '/em-http/core_ext/hash'
 require File.dirname(__FILE__) + '/em-http/client'
 require File.dirname(__FILE__) + '/em-http/multi'
 require File.dirname(__FILE__) + '/em-http/request'
-require File.dirname(__FILE__) + '/em-http/decoders'
+require File.dirname(__FILE__) + '/em-http/decoders'

data/lib/em-http/client.rb

@@ -108,18 +108,18 @@ module EventMachine
       @uri.host + (@uri.port != 80 ? ":#{@uri.port}" : "")
     end
 
-    def encode_request(method, path, query)
-      HTTP_REQUEST_HEADER % [method.to_s.upcase, encode_query(path, query)]
+    def encode_request(method, path, query, uri_query)
+      HTTP_REQUEST_HEADER % [method.to_s.upcase, encode_query(path, query, uri_query)]
     end
 
-    def encode_query(path, query)
+    def encode_query(path, query, uri_query)
       encoded_query = if query.kind_of?(Hash)
         query.map { |k, v| encode_param(k, v) }.join('&')
       else
         query.to_s
       end
-      if !@uri.query.to_s.empty?
-        encoded_query = [encoded_query, @uri.query].reject {|part| part.empty?}.join("&")
+      if !uri_query.to_s.empty?
+        encoded_query = [encoded_query, uri_query].reject {|part| part.empty?}.join("&")
       end
       return path if encoded_query.to_s.empty?
       "#{path}?#{encoded_query}"
@@ -262,7 +262,7 @@ module EventMachine
       end
 
       # Build the request
-      request_header = encode_request(@method, @uri.path, query)
+      request_header = encode_request(@method, @uri.path, query, @uri.query)
       request_header << encode_headers(head)
       request_header << CRLF
 
@@ -367,9 +367,9 @@ module EventMachine
       # correct location header - some servers will incorrectly give a relative URI
       if @response_header.location
         begin
-          location = URI.parse @response_header.location
+          location = Addressable::URI.parse @response_header.location
           if location.relative?
-            location = (@uri.merge location).to_s
+            location = (@uri.join location).to_s
             @response_header[LOCATION] = location
           end
         rescue

data/lib/em-http/mock.rb

@@ -0,0 +1,73 @@
+module EventMachine
+  class HttpRequest
+    
+    include HttpEncoding
+    
+    class FakeHttpClient < EventMachine::HttpClient
+
+      def setup(response)
+        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
+      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)
+        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

@@ -24,6 +24,8 @@ module EventMachine
   #
 
   class HttpRequest
+    
+    attr_reader :options, :method
 
     def initialize(host, headers = {})
       @headers = headers
@@ -45,35 +47,42 @@ module EventMachine
     #     Called for each response body chunk (you may assume HTTP 200
     #     OK then)
     #
-
-    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 = {};  setup_request(:get,  options);    end
+    def head   options = {};  setup_request(:head, options);    end
+    def delete options = {};  setup_request(:delete, options);  end
+    def put    options = {};  setup_request(:put, options);     end
+    def post   options = {};  setup_request(:post, options);    end
 
     protected
 
-    def send_request(method, options)
+    def setup_request(method, options)
       raise ArgumentError, "invalid request path" unless /^\// === @uri.path
 
+      @options = options
+
       # default connect & inactivity timeouts
-      options[:timeout] = 5 if not options[:timeout]
+      @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
+      @uri.port ||= 80
+      @method = method.to_s.upcase
+      send_request
+    end
+    
+    def send_request
       begin
        EventMachine.connect(@uri.host, @uri.port, EventMachine::HttpClient) { |c|
           c.uri = @uri
-          c.method = method
-          c.options = options
-          c.comm_inactivity_timeout = options[:timeout]
-          c.pending_connect_timeout = options[:timeout]
+          c.method = @method
+          c.options = @options
+          c.comm_inactivity_timeout = @options[:timeout]
+          c.pending_connect_timeout = @options[:timeout]
         }
-      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/test/mock/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/test/mock/test_mock.rb

@@ -0,0 +1,83 @@
+require 'rubygems'
+require 'spec'
+require 'pp'
+
+require 'lib/em-http'
+require 'lib/em-http/mock'
+
+describe 'em-http mock' do
+
+  before(:each) do
+    EM::HttpRequest.reset_registry!
+    EM::HttpRequest.reset_counts!
+  end
+  
+  it "should serve a fake http request from a file" do
+    EM::HttpRequest.register_file('http://www.google.ca:80/', :get, File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'))
+    EM.run do 
+      http = EM::HttpRequest.new('http://www.google.ca/').get
+      http.callback do
+        http.response.should == File.read(File.join(File.dirname(__FILE__), 'fixtures', 'google.ca')).split("\n\n", 2).last
+        EM.stop
+      end
+      http.errback do
+        fail
+        EM.stop
+      end
+    end
+    
+    EM::HttpRequest.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
+    EM::HttpRequest.register('http://www.google.ca:80/', :get, data)
+    EM.run do 
+      http = EM::HttpRequest.new('http://www.google.ca/').get
+      http.callback do
+        http.response.should == data.split("\n\n", 2).last
+        EM.stop
+      end
+      http.errback do
+        fail
+        EM.stop
+      end
+    end
+    
+    EM::HttpRequest.count('http://www.google.ca:80/', :get).should == 1
+  end
+
+  it "should raise an exception if pass-thru is disabled" do
+    EM::HttpRequest.pass_through_requests = false
+    EM.run do 
+      proc {
+        http = EM::HttpRequest.new('http://www.google.ca/').get
+      }.should raise_error
+      EM.stop
+    end
+    
+  end
+  
+end

data/test/stallion.rb

@@ -85,7 +85,13 @@ Stallion.saddle :spec do |stable|
 
     elsif stable.request.head?
       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.write stable.request.env["CONTENT_TYPE"]
@@ -130,6 +136,10 @@ Stallion.saddle :spec do |stable|
         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

data/test/test_multi.rb

@@ -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:8081/').get(:timeout => 1))
       
       multi.callback  {
         # verify successfull request

data/test/test_request.rb

@@ -17,7 +17,7 @@ describe EventMachine::HttpRequest do
         http.response_header.status.should == 0
         EventMachine.stop
       }
-    }
+    }         
   end
 
   it "should fail GET on invalid host" do
@@ -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
       }
     }
@@ -82,6 +82,21 @@ describe EventMachine::HttpRequest do
       }
     }    
   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
     EventMachine.run {
@@ -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"
@@ -432,4 +461,16 @@ describe EventMachine::HttpRequest do
       }
     end
   end
+
+  it "should complete a Location: with a relative path" 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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -04:00
+date: 2009-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,17 +43,16 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
-- examples/fetch.rb
-- examples/fibered-http.rb
 - ext/buffer/em_buffer.c
 - ext/buffer/extconf.rb
+- ext/http11_client/Makefile
 - ext/http11_client/ext_help.h
 - ext/http11_client/extconf.rb
+- ext/http11_client/http11_client.bundle
 - ext/http11_client/http11_client.c
 - ext/http11_client/http11_parser.c
 - ext/http11_client/http11_parser.h
@@ -62,9 +61,12 @@ files:
 - lib/em-http/client.rb
 - lib/em-http/core_ext/hash.rb
 - lib/em-http/decoders.rb
+- lib/em-http/mock.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
 - test/helper.rb
+- test/mock/fixtures/google.ca
+- test/mock/test_mock.rb
 - test/stallion.rb
 - test/stub_server.rb
 - test/test_hash.rb
@@ -100,6 +102,7 @@ specification_version: 3
 summary: EventMachine based, async HTTP Request interface
 test_files: 
 - test/helper.rb
+- test/mock/test_mock.rb
 - test/stallion.rb
 - test/stub_server.rb
 - test/test_hash.rb

data/.gitignore

@@ -1,4 +0,0 @@
-*.bundle
-*.o
-Makefile
-mkmf.log