em-http-request 0.2.6 → 0.2.7

data/Rakefile

@@ -35,7 +35,7 @@ task :ragel do
 end
 
 task :spec do
-	sh 'spec test/test_*.rb'
+	sh 'spec spec/*_spec.rb'
 end
 
 def make(makedir)

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/ext/http11_client/http11_client.c

@@ -21,6 +21,20 @@ static VALUE eHttpClientParserError;
 #define  id_chunk_size rb_intern("@http_chunk_size")
 #define  id_last_chunk rb_intern("@last_chunk")
 
+#ifndef RHASH_TBL
+/* rb_hash_lookup() is only in Ruby 1.8.7 */
+static VALUE rb_hash_lookup(VALUE hash, VALUE key)
+{
+  VALUE val;
+
+  if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
+    return Qnil; /* without Hash#default */
+  }
+
+  return val;
+}
+#endif
+
 void client_http_field(void *data, const char *field, size_t flen, const char *value, size_t vlen)
 {
   char *ch, *end;

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
 
@@ -304,7 +304,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')

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

@@ -26,8 +26,7 @@ module EventMachine
     
     attr_reader :options, :method
 
-    def initialize(host, headers = {})
-      @headers = headers
+    def initialize(host)
       @uri = host.kind_of?(Addressable::URI) ? host : Addressable::URI::parse(host)
     end
 
@@ -72,8 +71,13 @@ module EventMachine
 
       # Make sure the ports are set as Addressable::URI doesn't
       # set the port if it isn't there
-      @uri.port ||= 80
-      @port_to_connect ||= 80
+      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)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 -05:00
+date: 2010-02-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency