astro-em-http-request 0.2.8 → 0.2.9

data/Rakefile

@@ -92,9 +92,9 @@ begin
     gemspec.email = "ilya@igvita.com"
     gemspec.homepage = "http://github.com/igrigorik/em-http-request"
     gemspec.authors = ["Ilya Grigorik", "Stephan Maka", "Julien Genestoux"]
+    gemspec.required_ruby_version = ">= 1.8.7"
     gemspec.extensions = ["ext/buffer/extconf.rb" , "ext/http11_client/extconf.rb"]
     gemspec.add_dependency('eventmachine', '>= 0.12.9')
-    gemspec.add_dependency('addressable', '>= 2.0.0')
     gemspec.rubyforge_project = "astro-em-http-request"
     gemspec.files = FileList[`git ls-files`.split]
   end

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/astro-em-http-request.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{astro-em-http-request}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Grigorik", "Stephan Maka", "Julien Genestoux"]
-  s.date = %q{2010-02-28}
+  s.date = %q{2010-04-07}
   s.description = %q{EventMachine based, async HTTP Request interface}
   s.email = %q{ilya@igvita.com}
   s.extensions = ["ext/buffer/extconf.rb", "ext/http11_client/extconf.rb"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "ext/http11_client/http11_parser.c",
      "ext/http11_client/http11_parser.h",
      "ext/http11_client/http11_parser.rl",
+     "lib/em-http-request.rb",
      "lib/em-http.rb",
      "lib/em-http/client.rb",
      "lib/em-http/core_ext/hash.rb",
@@ -42,6 +43,8 @@ Gem::Specification.new do |s|
      "lib/em-http/mock.rb",
      "lib/em-http/multi.rb",
      "lib/em-http/request.rb",
+     "lib/em_buffer.so",
+     "lib/http11_client.so",
      "spec/fixtures/google.ca",
      "spec/hash_spec.rb",
      "spec/helper.rb",
@@ -54,20 +57,20 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/igrigorik/em-http-request}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = %q{astro-em-http-request}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{EventMachine based, async HTTP Request interface}
   s.test_files = [
     "spec/hash_spec.rb",
      "spec/helper.rb",
+     "spec/stub_server.rb",
+     "spec/stallion.rb",
      "spec/mock_spec.rb",
      "spec/multi_spec.rb",
      "spec/request_spec.rb",
-     "spec/stallion.rb",
-     "spec/stub_server.rb",
-     "test/another_test.rb",
-     "examples/fetch.rb",
      "examples/fibered-http.rb",
+     "examples/fetch.rb",
      "examples/oauth-tweet.rb"
   ]
 
@@ -77,14 +80,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.9"])
-      s.add_runtime_dependency(%q<addressable>, [">= 2.0.0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
-      s.add_dependency(%q<addressable>, [">= 2.0.0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
-    s.add_dependency(%q<addressable>, [">= 2.0.0"])
   end
 end
-

data/ext/buffer/em_buffer.c

@@ -29,15 +29,15 @@
 #define PURGE_INTERVAL 10
 
 struct buffer {
-	time_t last_purged_at;
+  time_t last_purged_at;
   unsigned size, node_size;
   struct buffer_node *head, *tail;
   struct buffer_node *pool_head, *pool_tail;
-	
+
 };
 
 struct buffer_node {
-	time_t last_used_at;
+  time_t last_used_at;
   unsigned start, end;
   struct buffer_node *next;
   unsigned char data[0];
@@ -72,7 +72,7 @@ static void buffer_copy(struct buffer *buf, char *str, unsigned len);
 static int buffer_read_from(struct buffer *buf, int fd);
 static int buffer_write_to(struct buffer *buf, int fd);
 
-/* 
+/*
  * High speed buffering geared towards non-blocking I/O.
  *
  * Data is stored in a byte queue implemented as a linked list of equal size
@@ -94,8 +94,8 @@ void Init_em_buffer()
   rb_define_method(cEm_Buffer, "append", Em_Buffer_append, 1);
   rb_define_method(cEm_Buffer, "prepend", Em_Buffer_prepend, 1);
   rb_define_method(cEm_Buffer, "read", Em_Buffer_read, -1);
-	rb_define_method(cEm_Buffer, "to_str", Em_Buffer_to_str, 0);
-	rb_define_method(cEm_Buffer, "read_from", Em_Buffer_read_from, 1);
+  rb_define_method(cEm_Buffer, "to_str", Em_Buffer_to_str, 0);
+  rb_define_method(cEm_Buffer, "read_from", Em_Buffer_read_from, 1);
   rb_define_method(cEm_Buffer, "write_to", Em_Buffer_write_to, 1);
 }
 
@@ -118,7 +118,7 @@ static void Em_Buffer_free(struct buffer *buf)
 /**
  *  call-seq:
  *    EventMachine::Buffer.new(size = DEFAULT_NODE_SIZE) -> EventMachine::Buffer
- * 
+ *
  * Create a new EventMachine::Buffer with linked segments of the given size
  */
 static VALUE Em_Buffer_initialize(int argc, VALUE *argv, VALUE self)
@@ -147,7 +147,7 @@ static VALUE Em_Buffer_initialize(int argc, VALUE *argv, VALUE self)
 /**
  *  call-seq:
  *    EventMachine::Buffer#clear -> nil
- * 
+ *
  * Clear all data from the EventMachine::Buffer
  */
 static VALUE Em_Buffer_clear(VALUE self)
@@ -163,10 +163,10 @@ static VALUE Em_Buffer_clear(VALUE self)
 /**
  *  call-seq:
  *    EventMachine::Buffer#size -> Integer
- * 
+ *
  * Return the size of the buffer in bytes
  */
-static VALUE Em_Buffer_size(VALUE self) 
+static VALUE Em_Buffer_size(VALUE self)
 {
   struct buffer *buf;
   Data_Get_Struct(self, struct buffer, buf);
@@ -177,21 +177,21 @@ static VALUE Em_Buffer_size(VALUE self)
 /**
  *  call-seq:
  *    EventMachine::Buffer#empty? -> Boolean
- * 
+ *
  * Is the buffer empty?
  */
-static VALUE Em_Buffer_empty(VALUE self) 
+static VALUE Em_Buffer_empty(VALUE self)
 {
   struct buffer *buf;
   Data_Get_Struct(self, struct buffer, buf);
 
-  return buf->size > 0 ? Qfalse : Qtrue;	
+  return buf->size > 0 ? Qfalse : Qtrue;
 }
 
 /**
  *  call-seq:
  *    EventMachine::Buffer#append(data) -> String
- * 
+ *
  * Append the given data to the end of the buffer
  */
 static VALUE Em_Buffer_append(VALUE self, VALUE data)
@@ -209,7 +209,7 @@ static VALUE Em_Buffer_append(VALUE self, VALUE data)
 /**
  *  call-seq:
  *    EventMachine::Buffer#prepend(data) -> String
- * 
+ *
  * Prepend the given data to the beginning of the buffer
  */
 static VALUE Em_Buffer_prepend(VALUE self, VALUE data)
@@ -226,7 +226,7 @@ static VALUE Em_Buffer_prepend(VALUE self, VALUE data)
 /**
  *  call-seq:
  *    EventMachine::Buffer#read(length = nil) -> String
- * 
+ *
  * Read the specified abount of data from the buffer.  If no value
  * is given the entire contents of the buffer are returned.  Any data
  * read from the buffer is cleared.
@@ -263,31 +263,31 @@ static VALUE Em_Buffer_read(int argc, VALUE *argv, VALUE self)
 /**
  *  call-seq:
  *    EventMachine::Buffer#to_str -> String
- * 
+ *
  * Convert the Buffer to a String.  The original buffer is unmodified.
  */
 static VALUE Em_Buffer_to_str(VALUE self) {
-	VALUE str;
-	struct buffer *buf;
-	
-	Data_Get_Struct(self, struct buffer, buf);
-	
-	str = rb_str_new(0, buf->size);
-	buffer_copy(buf, RSTRING_PTR(str), buf->size);
-  
+  VALUE str;
+  struct buffer *buf;
+
+  Data_Get_Struct(self, struct buffer, buf);
+
+  str = rb_str_new(0, buf->size);
+  buffer_copy(buf, RSTRING_PTR(str), buf->size);
+
   return str;
 }
 
 /**
  *  call-seq:
  *    EventMachine::Buffer#read_from(io) -> Integer
- * 
+ *
  * Perform a nonblocking read of the the given IO object and fill
  * the buffer with any data received.  The call will read as much
  * data as it can until the read would block.
  */
 static VALUE Em_Buffer_read_from(VALUE self, VALUE io) {
-	struct buffer *buf;
+  struct buffer *buf;
 #if HAVE_RB_IO_T
   rb_io_t *fptr;
 #else
@@ -298,20 +298,24 @@ static VALUE Em_Buffer_read_from(VALUE self, VALUE io) {
   GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
   rb_io_set_nonblock(fptr);
 
+#ifdef HAVE_RB_IO_FD
+  return INT2NUM(buffer_read_from(buf, rb_io_fd(io)));
+#else
   return INT2NUM(buffer_read_from(buf, FPTR_TO_FD(fptr)));
+#endif
 }
 
 /**
  *  call-seq:
  *    EventMachine::Buffer#write_to(io) -> Integer
- * 
+ *
  * Perform a nonblocking write of the buffer to the given IO object.
  * As much data as possible is written until the call would block.
  * Any data which is written is removed from the buffer.
  */
 static VALUE Em_Buffer_write_to(VALUE self, VALUE io) {
   struct buffer *buf;
-#if HAVE_RB_IO_T 
+#if HAVE_RB_IO_T
   rb_io_t *fptr;
 #else
   OpenFile *fptr;
@@ -321,11 +325,16 @@ static VALUE Em_Buffer_write_to(VALUE self, VALUE io) {
   GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
   rb_io_set_nonblock(fptr);
 
-  return INT2NUM(buffer_write_to(buf, FPTR_TO_FD(fptr)));
+#ifdef HAVE_RB_IO_FD
+  return INT2NUM(buffer_read_from(buf, rb_io_fd(io)));
+#else
+  return INT2NUM(buffer_read_from(buf, FPTR_TO_FD(fptr)));
+#endif
+
 }
 
 /*
- * Ruby bindings end here.  Below is the actual implementation of 
+ * Ruby bindings end here.  Below is the actual implementation of
  * the underlying data structures.
  */
 
@@ -338,8 +347,8 @@ static struct buffer *buffer_new(void)
   buf->head = buf->tail = buf->pool_head = buf->pool_tail = 0;
   buf->size = 0;
   buf->node_size = DEFAULT_NODE_SIZE;
-	time(&buf->last_purged_at);
-	
+  time(&buf->last_purged_at);
+
   return buf;
 }
 
@@ -359,7 +368,7 @@ static void buffer_clear(struct buffer *buf)
 }
 
 /* Free a buffer */
-static void buffer_free(struct buffer *buf) 
+static void buffer_free(struct buffer *buf)
 {
   struct buffer_node *tmp;
 
@@ -381,11 +390,11 @@ static void buffer_gc(struct buffer *buf)
   time_t now;
   time(&now);
 
-	/* Only purge if we've passed the purge interval */
-	if(now - buf->last_purged_at < PURGE_INTERVAL)
-		return;
-		
-	buf->last_purged_at = now;
+  /* Only purge if we've passed the purge interval */
+  if(now - buf->last_purged_at < PURGE_INTERVAL)
+    return;
+
+  buf->last_purged_at = now;
 
   while(buf->pool_head && now - buf->pool_head->last_used_at >= MAX_AGE) {
     tmp = buf->pool_head;
@@ -394,7 +403,7 @@ static void buffer_gc(struct buffer *buf)
   }
 
   if(!buf->pool_head)
-		buf->pool_tail = 0;
+    buf->pool_tail = 0;
 }
 
 /* Create a new buffer_node (or pull one from the memory pool) */
@@ -494,11 +503,11 @@ static void buffer_append(struct buffer *buf, char *str, unsigned len)
   while(len > 0) {
     nbytes = buf->node_size - buf->tail->end;
     if(len < nbytes) nbytes = len;
-    
+
     memcpy(buf->tail->data + buf->tail->end, str, nbytes);
-    str += nbytes;    
+    str += nbytes;
     len -= nbytes;
-    
+
     buf->tail->end += nbytes;
 
     if(len > 0) {
@@ -541,7 +550,7 @@ static void buffer_copy(struct buffer *buf, char *str, unsigned len)
   unsigned nbytes;
   struct buffer_node *node;
 
-	node = buf->head;
+  node = buf->head;
   while(node && len > 0) {
     nbytes = node->end - node->start;
     if(len < nbytes) nbytes = len;
@@ -551,7 +560,7 @@ static void buffer_copy(struct buffer *buf, char *str, unsigned len)
     len -= nbytes;
 
     if(node->start + nbytes == node->end)
-			node = node->next;
+      node = node->next;
   }
 }
 
@@ -596,7 +605,7 @@ static int buffer_write_to(struct buffer *buf, int fd)
 /* Append data to the front of the buffer */
 static int buffer_read_from(struct buffer *buf, int fd)
 {
-	int bytes_read, total_bytes_read = 0;
+  int bytes_read, total_bytes_read = 0;
   unsigned nbytes;
 
   /* Empty list needs initialized */
@@ -605,26 +614,26 @@ static int buffer_read_from(struct buffer *buf, int fd)
     buf->tail = buf->head;
   }
 
-	do {
-	  nbytes = buf->node_size - buf->tail->end;
-		bytes_read = read(fd, buf->tail->data + buf->tail->end, nbytes);
-	
-		if(bytes_read < 1) {
-			if(errno != EAGAIN)
+  do {
+    nbytes = buf->node_size - buf->tail->end;
+    bytes_read = read(fd, buf->tail->data + buf->tail->end, nbytes);
+
+    if(bytes_read < 1) {
+      if(errno != EAGAIN)
         rb_sys_fail("read");
-			
-			return total_bytes_read;
-		}
-		
-		total_bytes_read += bytes_read; 
-		buf->tail->end += nbytes;
-		buf->size += nbytes;
-		
-		if(buf->tail->end == buf->node_size) {
+
+      return total_bytes_read;
+    }
+
+    total_bytes_read += bytes_read;
+    buf->tail->end += nbytes;
+    buf->size += nbytes;
+
+    if(buf->tail->end == buf->node_size) {
       buf->tail->next = buffer_node_new(buf);
       buf->tail = buf->tail->next;
-		}
-	} while(bytes_read == nbytes);
-	
-	return total_bytes_read;
+    }
+  } while(bytes_read == nbytes);
+
+  return total_bytes_read;
 }

data/lib/em-http-request.rb

@@ -0,0 +1 @@
+require 'em-http'

data/lib/em-http/client.rb

@@ -84,7 +84,7 @@ module EventMachine
     # Escapes a URI.
     def escape(s)
       s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-        '%'+$1.unpack('H2'*$1.size).join('%').upcase
+        '%'+$1.unpack('H2'*$1.bytesize).join('%').upcase
       }.tr(' ', '+')
     end
 
@@ -104,7 +104,11 @@ module EventMachine
     # you include port 80 then further redirects will tack on the :80 which is
     # annoying.
     def encode_host
-      @uri.host + (@uri.port != 80 ? ":#{@uri.port}" : "")
+      if @uri.port == 80 || @uri.port == 443
+        return @uri.host
+      else
+        @uri.host + ":#{@uri.port}"
+      end
     end
 
     def encode_request(method, path, query, uri_query)
@@ -313,7 +317,7 @@ module EventMachine
         
       else
         # Set the Content-Length if body is given
-        head['content-length'] =  body.length if body
+        head['content-length'] =  body.bytesize if body
 
         # Set the cookie header if provided
         if cookie = head.delete('cookie')
@@ -473,9 +477,9 @@ module EventMachine
       # correct location header - some servers will incorrectly give a relative URI
       if @response_header.location
         begin
-          location = Addressable::URI.parse @response_header.location
+          location = URI.parse @response_header.location
           if location.relative?
-            location = (@uri.join location).to_s
+            location = (@uri.merge location).to_s
             @response_header[LOCATION] = location
           end
         rescue

data/lib/em-http/mock.rb

@@ -20,11 +20,15 @@ module EventMachine
     @@registry_count = nil
     
     def self.reset_counts!
-      @@registry_count = Hash.new{|h,k| h[k] = Hash.new(0)}
+      @@registry_count = Hash.new do |registry,query| 
+        registry[query] = Hash.new{|h,k| h[k] = Hash.new(0)}
+      end
     end
     
     def self.reset_registry!
-      @@registry = Hash.new{|h,k| h[k] = {}}
+      @@registry = Hash.new do |registry,query| 
+        registry[query] = Hash.new{|h,k| h[k] = {}}
+      end
     end
     
     reset_counts!
@@ -40,18 +44,32 @@ module EventMachine
       @@pass_through_requests
     end
     
-    def self.register(uri, method, data)
+    def self.register(uri, method, headers, data)
       method = method.to_s.upcase
-      @@registry[uri][method] = data
+      headers = headers.to_s
+      @@registry[uri][method][headers] = data
     end
     
-    def self.register_file(uri, method, file)
-      register(uri, method, File.read(file))
+    def self.register_file(uri, method, headers, file)
+      register(uri, method, headers, File.read(file))
     end
     
-    def self.count(uri, method)
+    def self.count(uri, method, headers)
       method = method.to_s.upcase
-      @@registry_count[uri][method]
+      headers = headers.to_s
+      @@registry_count[uri][method][headers] rescue 0
+    end
+    
+    def self.registered?(query, method, headers)
+      @@registry[query] and @@registry[query][method] and @@registry[query][method][headers]
+    end
+    
+    def self.registered_content(query, method, headers)
+      @@registry[query][method][headers]
+    end
+    
+    def self.increment_access(query, method, headers)
+      @@registry_count[query][method][headers] += 1
     end
     
     alias_method :real_send_request, :send_request
@@ -59,15 +77,16 @@ module EventMachine
     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
+      headers = @options[:head].to_s
+      if self.class.registered?(query, @method, headers)
+        self.class.increment_access(query, @method, headers)
         client = FakeHttpClient.new(nil)
-        client.setup(fake, @uri)
+        client.setup(self.class.registered_content(query, @method, headers), @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"
+        raise "this request #{query} for method #{@method} with the headers #{@options[:head].inspect} isn't registered, and pass_through_requests is current set to false"
       end
     end
   end

data/lib/em-http/multi.rb

@@ -34,10 +34,10 @@ module EventMachine
     end
     
     def add(conn)
+      @requests.push(conn)
+
       conn.callback { @responses[:succeeded].push(conn); check_progress }
       conn.errback  { @responses[:failed].push(conn); check_progress }
-      
-      @requests.push(conn)
     end
     
     protected
@@ -48,4 +48,4 @@ module EventMachine
     end
     
   end
-end
+end

data/lib/em-http/request.rb

@@ -1,5 +1,5 @@
 require 'base64'
-require 'addressable/uri'
+require 'uri'
 
 module EventMachine
 
@@ -28,7 +28,7 @@ module EventMachine
 
     def initialize(host, headers = {})
       @headers = headers
-      @uri = host.kind_of?(Addressable::URI) ? host : Addressable::URI::parse(host)
+      @uri = host.kind_of?(URI) ? host : URI::parse(host)
     end
 
     # Send an HTTP request and consume the response. Supported options:
@@ -70,7 +70,7 @@ module EventMachine
       # default connect & inactivity timeouts        
       @options[:timeout] = 10 if not @options[:timeout]  
 
-      # Make sure the ports are set as Addressable::URI doesn't
+      # Make sure the ports are set as URI doesn't
       # set the port if it isn't there
       if @uri.scheme == "https"
         @uri.port ||= 443
@@ -109,4 +109,4 @@ module EventMachine
       end
     end
   end
-end
+end

data/spec/mock_spec.rb

@@ -8,7 +8,7 @@ describe 'em-http mock' do
   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'))
+    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
@@ -19,7 +19,7 @@ describe 'em-http mock' do
       }
     }
     
-    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get).should == 1
+    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get, {}).should == 1
   end
   
   it "should serve a fake http request from a string" do
@@ -46,7 +46,7 @@ window._gjp && _gjp()</script><style>td{line-height:.8em;}.gac_m td{line-height:
 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::MockHttpRequest.register('http://www.google.ca:80/', :get, {}, data)
     EventMachine.run {
       
       http = EventMachine::MockHttpRequest.new('http://www.google.ca/').get
@@ -57,7 +57,36 @@ function a(){google.timers.load.t.ol=(new Date).getTime();google.report&&google.
       }
     }
     
-    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get).should == 1
+    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get, {}).should == 1
+  end
+  
+  it "should distinguish the cache by the given headers" do
+    EventMachine::MockHttpRequest.register_file('http://www.google.ca:80/', :get,  {:user_agent => 'BERT'}, File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'))
+    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
+    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get, {:user_agent => 'BERT'}).should == 0
+    
+    EM.run {
+      
+      http = EventMachine::MockHttpRequest.new('http://www.google.ca/').get({:head => {:user_agent => 'BERT'}})
+      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, {:user_agent => 'BERT'}).should == 1
   end
 
   it "should raise an exception if pass-thru is disabled" do

data/spec/multi_spec.rb

@@ -14,7 +14,7 @@ describe EventMachine::MultiRequest do
       multi.add(EventMachine::HttpRequest.new('http://0.0.0.0:8083/').get(:timeout => 1))
       
       multi.callback  {
-        # verify successfull request
+        # verify successful request
         multi.responses[:succeeded].size.should == 1
         multi.responses[:succeeded].first.response.should match(/test/)
         
@@ -26,4 +26,26 @@ describe EventMachine::MultiRequest do
       }
     } 
   end
-end
+
+  it "should handle multiple mock requests" do
+    EventMachine::MockHttpRequest.register_file('http://127.0.0.1:8080/', :get, {}, File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'))
+    EventMachine::MockHttpRequest.register_file('http://0.0.0.0:8083/', :get, {}, File.join(File.dirname(__FILE__), 'fixtures', 'google.ca'))
+
+    EventMachine.run {
+      
+      # create an instance of multi-request handler, and the requests themselves
+      multi = EventMachine::MultiRequest.new
+      
+      # add multiple requests to the multi-handler
+      multi.add(EventMachine::MockHttpRequest.new('http://127.0.0.1:8080/').get)
+      multi.add(EventMachine::MockHttpRequest.new('http://0.0.0.0:8083/').get)
+      
+      multi.callback  {
+        # verify successful request
+        multi.responses[:succeeded].size.should == 2
+
+        EventMachine.stop
+      }
+    } 
+  end
+end

data/spec/request_spec.rb

@@ -501,14 +501,14 @@ describe EventMachine::HttpRequest do
         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/')
+        client.normalize_uri.should == 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::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
@@ -522,7 +522,7 @@ describe EventMachine::HttpRequest do
       }
     }
 
-    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get).should == 1
+    EventMachine::MockHttpRequest.count('http://www.google.ca:80/', :get, {}).should == 1
   end
 
   context "connections via proxy" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,16 +24,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.12.9
     version: 
-- !ruby/object:Gem::Dependency 
-  name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
 description: EventMachine based, async HTTP Request interface
 email: ilya@igvita.com
 executables: []
@@ -62,6 +52,7 @@ files:
 - ext/http11_client/http11_parser.c
 - ext/http11_client/http11_parser.h
 - ext/http11_client/http11_parser.rl
+- lib/em-http-request.rb
 - lib/em-http.rb
 - lib/em-http/client.rb
 - lib/em-http/core_ext/hash.rb
@@ -69,6 +60,8 @@ files:
 - lib/em-http/mock.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
+- lib/em_buffer.so
+- lib/http11_client.so
 - spec/fixtures/google.ca
 - spec/hash_spec.rb
 - spec/helper.rb
@@ -90,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.7
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -108,12 +101,11 @@ summary: EventMachine based, async HTTP Request interface
 test_files: 
 - spec/hash_spec.rb
 - spec/helper.rb
+- spec/stub_server.rb
+- spec/stallion.rb
 - spec/mock_spec.rb
 - spec/multi_spec.rb
 - spec/request_spec.rb
-- spec/stallion.rb
-- spec/stub_server.rb
-- test/another_test.rb
-- examples/fetch.rb
 - examples/fibered-http.rb
+- examples/fetch.rb
 - examples/oauth-tweet.rb

data/test/another_test.rb

@@ -1,21 +0,0 @@
-require 'test/helper'
-
-describe EventMachine::HttpRequest do
-
-  def failed
-    EventMachine.stop
-    fail
-  end
-
-  it "should return and error if the response side exceeds the :max_bytes option" do
-     EventMachine.run {
-        http = EventMachine::HttpRequest.new("http://updates.sixapart.com/atom-stream.xml").get(:timeout => 10)
-        http.errback { |http|
-          http.errors.should match /Max Connection Duration Exceeded/
-          EventMachine.stop
-        }
-        http.callback { failed }
-      }
-  end
-  
-end