astro-em-http-request 0.1.6 → 0.1.12

data/README.rdoc

@@ -6,6 +6,9 @@ EventMachine based HTTP Request interface. Supports streaming response processin
 - Basic-Auth support
 - Custom timeouts 
 
+Screencast / Demo of using EM-HTTP-Request: 
+ - http://everburning.com/news/eventmachine-screencast-em-http-request/
+
 == Simple client example
 
   EventMachine.run {
@@ -61,9 +64,8 @@ EventMachine based HTTP Request interface. Supports streaming response processin
 
 == Streaming body processing
   EventMachine.run {
-    body = ''
-    on_body = lambda { |chunk| body += chunk }
-    http = EventMachine::HttpRequest.new('http://www.website.com/').get :on_response => on_body
+    http = EventMachine::HttpRequest.new('http://www.website.com/').get
+    http.stream { |chunk| print chunk }
 
     # ...
   }

data/Rakefile

@@ -34,6 +34,10 @@ task :ragel do
   end
 end
 
+task :spec do
+  sh 'spec -c test/test_*.rb'
+end
+
 def make(makedir)
   Dir.chdir(makedir) { sh MAKE }
 end

data/em-http-request.gemspec

@@ -1,17 +1,18 @@
 spec = Gem::Specification.new do |s|
   s.name = 'em-http-request'
-  s.version = '0.1.6'
-  s.date = '2009-03-20'
+  s.version = '0.1.9'
+  s.date = '2009-10-17'
   s.summary = 'EventMachine based HTTP Request interface'
   s.description = s.summary
   s.email = 'ilya@igvita.com'
   s.homepage = "http://github.com/igrigorik/em-http-request"
   s.has_rdoc = true
   s.authors = ["Ilya Grigorik"]
-  s.add_dependency('eventmachine', '>= 0.12.2')
+  s.add_dependency('eventmachine', '>= 0.12.9')
+  s.add_dependency('addressable', '>= 2.0.0')
   s.extensions = ["ext/buffer/extconf.rb" , "ext/http11_client/extconf.rb"]
   s.rubyforge_project = "em-http-request" 
-
+  
   # ruby -rpp -e' pp `git ls-files`.split("\n") '
   s.files = [
  ".autotest",
@@ -34,9 +35,10 @@ spec = Gem::Specification.new do |s|
  "lib/em-http/decoders.rb",
  "lib/em-http/multi.rb",
  "lib/em-http/request.rb",
- "test/hash.rb",
+ "test/test_hash.rb",
  "test/helper.rb",
  "test/stallion.rb",
+ "test/stub_server.rb",
  "test/test_multi.rb",
  "test/test_request.rb"]
 end

data/ext/http11_client/http11_parser.c

@@ -1,3 +1,4 @@
+
 #line 1 "http11_parser.rl"
 /**
  * Copyright (c) 2005 Zed A. Shaw
@@ -18,166 +19,183 @@
 
 
 /** machine **/
+
 #line 95 "http11_parser.rl"
 
 
 /** Data **/
 
-#line 27 "http11_parser.c"
+#line 29 "http11_parser.c"
 static const char _httpclient_parser_actions[] = {
 	0, 1, 0, 1, 1, 1, 2, 1, 
 	3, 1, 4, 1, 5, 1, 7, 1, 
-	8, 1, 10, 2, 2, 3, 2, 6, 
-	0, 2, 6, 5, 2, 9, 10, 2, 
-	10, 9, 3, 2, 3, 4
+	8, 1, 10, 2, 0, 5, 2, 2, 
+	3, 2, 3, 4, 2, 4, 10, 2, 
+	6, 0, 2, 8, 10, 2, 9, 10, 
+	2, 10, 9, 3, 2, 3, 4, 3, 
+	4, 9, 10, 3, 4, 10, 9, 3, 
+	6, 0, 5, 3, 8, 10, 9, 4, 
+	2, 3, 4, 10, 5, 2, 3, 4, 
+	9, 10, 5, 2, 3, 4, 10, 9
+	
 };
 
 static const short _httpclient_parser_key_offsets[] = {
-	0, 10, 10, 11, 22, 26, 27, 28, 
-	39, 54, 75, 90, 110, 125, 146, 161, 
-	181, 196, 214, 229, 246, 247, 248, 249, 
-	250, 252, 255, 257, 260, 262, 264, 266, 
-	268, 269, 270, 286, 302, 304, 305, 306
+	0, 0, 11, 12, 24, 29, 30, 31, 
+	43, 58, 80, 95, 116, 131, 153, 168, 
+	189, 204, 223, 238, 256, 257, 258, 259, 
+	260, 262, 265, 267, 270, 272, 274, 276, 
+	279, 281, 298, 314, 317, 319, 320, 322
 };
 
 static const char _httpclient_parser_trans_keys[] = {
-	13, 48, 59, 72, 49, 57, 65, 70, 
-	97, 102, 10, 13, 32, 59, 9, 12, 
-	48, 57, 65, 70, 97, 102, 13, 32, 
-	9, 12, 10, 10, 13, 32, 59, 9, 
-	12, 48, 57, 65, 70, 97, 102, 33, 
-	124, 126, 35, 39, 42, 43, 45, 46, 
-	48, 57, 65, 90, 94, 122, 13, 32, 
-	33, 59, 61, 124, 126, 9, 12, 35, 
-	39, 42, 43, 45, 46, 48, 57, 65, 
-	90, 94, 122, 33, 124, 126, 35, 39, 
-	42, 43, 45, 46, 48, 57, 65, 90, 
-	94, 122, 13, 32, 33, 59, 124, 126, 
-	9, 12, 35, 39, 42, 43, 45, 46, 
-	48, 57, 65, 90, 94, 122, 33, 124, 
-	126, 35, 39, 42, 43, 45, 46, 48, 
-	57, 65, 90, 94, 122, 13, 32, 33, 
-	59, 61, 124, 126, 9, 12, 35, 39, 
+	10, 13, 48, 59, 72, 49, 57, 65, 
+	70, 97, 102, 10, 10, 13, 32, 59, 
+	9, 12, 48, 57, 65, 70, 97, 102, 
+	10, 13, 32, 9, 12, 10, 10, 10, 
+	13, 32, 59, 9, 12, 48, 57, 65, 
+	70, 97, 102, 33, 124, 126, 35, 39, 
 	42, 43, 45, 46, 48, 57, 65, 90, 
-	94, 122, 33, 124, 126, 35, 39, 42, 
+	94, 122, 10, 13, 32, 33, 59, 61, 
+	124, 126, 9, 12, 35, 39, 42, 43, 
+	45, 46, 48, 57, 65, 90, 94, 122, 
+	33, 124, 126, 35, 39, 42, 43, 45, 
+	46, 48, 57, 65, 90, 94, 122, 10, 
+	13, 32, 33, 59, 124, 126, 9, 12, 
+	35, 39, 42, 43, 45, 46, 48, 57, 
+	65, 90, 94, 122, 33, 124, 126, 35, 
+	39, 42, 43, 45, 46, 48, 57, 65, 
+	90, 94, 122, 10, 13, 32, 33, 59, 
+	61, 124, 126, 9, 12, 35, 39, 42, 
 	43, 45, 46, 48, 57, 65, 90, 94, 
-	122, 13, 32, 33, 59, 124, 126, 9, 
+	122, 33, 124, 126, 35, 39, 42, 43, 
+	45, 46, 48, 57, 65, 90, 94, 122, 
+	10, 13, 32, 33, 59, 124, 126, 9, 
 	12, 35, 39, 42, 43, 45, 46, 48, 
 	57, 65, 90, 94, 122, 33, 124, 126, 
 	35, 39, 42, 43, 45, 46, 48, 57, 
-	65, 90, 94, 122, 13, 33, 59, 61, 
-	124, 126, 35, 39, 42, 43, 45, 46, 
-	48, 57, 65, 90, 94, 122, 33, 124, 
-	126, 35, 39, 42, 43, 45, 46, 48, 
-	57, 65, 90, 94, 122, 13, 33, 59, 
-	124, 126, 35, 39, 42, 43, 45, 46, 
-	48, 57, 65, 90, 94, 122, 84, 84, 
-	80, 47, 48, 57, 46, 48, 57, 48, 
-	57, 32, 48, 57, 48, 57, 48, 57, 
-	48, 57, 13, 32, 13, 10, 13, 33, 
-	124, 126, 35, 39, 42, 43, 45, 46, 
-	48, 57, 65, 90, 94, 122, 33, 58, 
+	65, 90, 94, 122, 10, 13, 33, 59, 
+	61, 124, 126, 35, 39, 42, 43, 45, 
+	46, 48, 57, 65, 90, 94, 122, 33, 
 	124, 126, 35, 39, 42, 43, 45, 46, 
-	48, 57, 65, 90, 94, 122, 13, 32, 
-	13, 13, 0
+	48, 57, 65, 90, 94, 122, 10, 13, 
+	33, 59, 124, 126, 35, 39, 42, 43, 
+	45, 46, 48, 57, 65, 90, 94, 122, 
+	84, 84, 80, 47, 48, 57, 46, 48, 
+	57, 48, 57, 32, 48, 57, 48, 57, 
+	48, 57, 48, 57, 10, 13, 32, 10, 
+	13, 10, 13, 33, 124, 126, 35, 39, 
+	42, 43, 45, 46, 48, 57, 65, 90, 
+	94, 122, 33, 58, 124, 126, 35, 39, 
+	42, 43, 45, 46, 48, 57, 65, 90, 
+	94, 122, 10, 13, 32, 10, 13, 10, 
+	10, 13, 0
 };
 
 static const char _httpclient_parser_single_lengths[] = {
-	4, 0, 1, 3, 2, 1, 1, 3, 
-	3, 7, 3, 6, 3, 7, 3, 6, 
-	3, 6, 3, 5, 1, 1, 1, 1, 
-	0, 1, 0, 1, 0, 0, 0, 2, 
-	1, 1, 4, 4, 2, 1, 1, 0
+	0, 5, 1, 4, 3, 1, 1, 4, 
+	3, 8, 3, 7, 3, 8, 3, 7, 
+	3, 7, 3, 6, 1, 1, 1, 1, 
+	0, 1, 0, 1, 0, 0, 0, 3, 
+	2, 5, 4, 3, 2, 1, 2, 0
 };
 
 static const char _httpclient_parser_range_lengths[] = {
-	3, 0, 0, 4, 1, 0, 0, 4, 
+	0, 3, 0, 4, 1, 0, 0, 4, 
 	6, 7, 6, 7, 6, 7, 6, 7, 
 	6, 6, 6, 6, 0, 0, 0, 0, 
 	1, 1, 1, 1, 1, 1, 1, 0, 
-	0, 0, 6, 6, 0, 0, 0, 0
+	0, 6, 6, 0, 0, 0, 0, 0
 };
 
-static const unsigned char _httpclient_parser_index_offsets[] = {
-	0, 8, 8, 10, 18, 22, 24, 26, 
-	34, 44, 59, 69, 83, 93, 108, 118, 
-	132, 142, 155, 165, 177, 179, 181, 183, 
-	185, 187, 190, 192, 195, 197, 199, 201, 
-	204, 206, 208, 219, 230, 233, 235, 237
+static const short _httpclient_parser_index_offsets[] = {
+	0, 0, 9, 11, 20, 25, 27, 29, 
+	38, 48, 64, 74, 89, 99, 115, 125, 
+	140, 150, 164, 174, 187, 189, 191, 193, 
+	195, 197, 200, 202, 205, 207, 209, 211, 
+	215, 218, 230, 241, 245, 248, 250, 253
 };
 
 static const char _httpclient_parser_indicies[] = {
-	14, 15, 17, 18, 16, 16, 16, 0, 
-	30, 0, 63, 37, 64, 37, 39, 39, 
-	39, 0, 19, 32, 32, 0, 29, 0, 
-	31, 0, 38, 37, 40, 37, 39, 39, 
-	39, 0, 58, 58, 58, 58, 58, 58, 
-	58, 58, 58, 0, 42, 41, 43, 44, 
-	45, 43, 43, 41, 43, 43, 43, 43, 
-	43, 43, 0, 59, 59, 59, 59, 59, 
-	59, 59, 59, 59, 0, 34, 33, 35, 
-	36, 35, 35, 33, 35, 35, 35, 35, 
-	35, 35, 0, 70, 70, 70, 70, 70, 
-	70, 70, 70, 70, 0, 65, 41, 66, 
-	67, 68, 66, 66, 41, 66, 66, 66, 
-	66, 66, 66, 0, 69, 69, 69, 69, 
-	69, 69, 69, 69, 69, 0, 60, 33, 
-	61, 62, 61, 61, 33, 61, 61, 61, 
-	61, 61, 61, 0, 10, 10, 10, 10, 
-	10, 10, 10, 10, 10, 0, 24, 25, 
-	26, 27, 25, 25, 25, 25, 25, 25, 
-	25, 25, 0, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 0, 21, 22, 23, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	0, 1, 0, 56, 0, 2, 0, 5, 
-	0, 7, 0, 6, 7, 0, 13, 0, 
-	12, 13, 0, 4, 0, 3, 0, 57, 
-	0, 54, 55, 53, 49, 48, 28, 0, 
-	19, 20, 20, 20, 20, 20, 20, 20, 
-	20, 20, 0, 8, 9, 8, 8, 8, 
-	8, 8, 8, 8, 8, 0, 47, 52, 
-	51, 47, 46, 49, 50, 0, 0
+	0, 2, 3, 5, 6, 4, 4, 4, 
+	1, 0, 1, 8, 9, 7, 11, 7, 
+	10, 10, 10, 1, 13, 14, 12, 12, 
+	1, 13, 1, 15, 1, 16, 17, 7, 
+	18, 7, 10, 10, 10, 1, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 1, 
+	21, 22, 20, 23, 24, 25, 23, 23, 
+	20, 23, 23, 23, 23, 23, 23, 1, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 1, 28, 29, 27, 30, 31, 30, 
+	30, 27, 30, 30, 30, 30, 30, 30, 
+	1, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 1, 33, 34, 20, 35, 36, 
+	37, 35, 35, 20, 35, 35, 35, 35, 
+	35, 35, 1, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 1, 39, 40, 27, 
+	41, 42, 41, 41, 27, 41, 41, 41, 
+	41, 41, 41, 1, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 1, 44, 45, 
+	46, 47, 48, 46, 46, 46, 46, 46, 
+	46, 46, 46, 1, 49, 49, 49, 49, 
+	49, 49, 49, 49, 49, 1, 50, 51, 
+	52, 53, 52, 52, 52, 52, 52, 52, 
+	52, 52, 1, 54, 1, 55, 1, 56, 
+	1, 57, 1, 58, 1, 59, 58, 1, 
+	60, 1, 61, 60, 1, 62, 1, 63, 
+	1, 64, 1, 66, 67, 68, 65, 70, 
+	71, 69, 13, 14, 72, 72, 72, 72, 
+	72, 72, 72, 72, 72, 1, 73, 74, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	1, 76, 77, 78, 75, 80, 81, 79, 
+	82, 1, 84, 85, 83, 1, 0
 };
 
-static const char _httpclient_parser_trans_targs_wi[] = {
-	1, 21, 23, 30, 29, 24, 26, 25, 
-	35, 36, 17, 19, 28, 27, 2, 3, 
-	7, 16, 20, 5, 35, 2, 19, 16, 
-	2, 17, 16, 18, 34, 39, 39, 39, 
-	4, 4, 5, 11, 8, 4, 5, 7, 
-	8, 4, 5, 9, 8, 10, 37, 33, 
-	32, 33, 32, 37, 36, 32, 33, 38, 
-	22, 31, 9, 11, 6, 15, 12, 6, 
-	12, 6, 13, 12, 14, 15, 13
+static const char _httpclient_parser_trans_targs[] = {
+	39, 0, 2, 3, 7, 16, 20, 4, 
+	39, 6, 7, 12, 4, 39, 5, 39, 
+	39, 5, 8, 9, 4, 39, 5, 9, 
+	8, 10, 11, 4, 39, 5, 11, 8, 
+	13, 39, 6, 13, 12, 14, 15, 39, 
+	6, 15, 12, 17, 39, 2, 17, 16, 
+	18, 19, 39, 2, 19, 16, 21, 22, 
+	23, 24, 25, 26, 27, 28, 29, 30, 
+	31, 32, 33, 37, 38, 32, 33, 37, 
+	34, 34, 35, 36, 33, 37, 35, 36, 
+	33, 37, 33, 32, 33, 37
 };
 
-static const char _httpclient_parser_trans_actions_wi[] = {
-	0, 0, 0, 0, 1, 0, 0, 0, 
-	0, 5, 3, 7, 13, 0, 0, 1, 
-	1, 0, 1, 0, 3, 9, 0, 9, 
-	34, 0, 34, 19, 0, 17, 28, 31, 
-	0, 9, 9, 0, 9, 15, 15, 0, 
-	15, 34, 34, 0, 34, 19, 0, 9, 
-	0, 11, 1, 7, 7, 22, 25, 22, 
-	0, 0, 3, 7, 9, 0, 9, 15, 
-	15, 34, 0, 34, 19, 7, 3
+static const char _httpclient_parser_trans_actions[] = {
+	37, 0, 0, 1, 1, 0, 1, 15, 
+	59, 15, 0, 15, 0, 17, 0, 40, 
+	34, 15, 15, 3, 43, 63, 43, 0, 
+	43, 22, 7, 9, 28, 9, 0, 9, 
+	3, 74, 43, 0, 43, 22, 7, 51, 
+	9, 0, 9, 3, 68, 43, 0, 43, 
+	22, 7, 47, 9, 0, 9, 0, 0, 
+	0, 0, 0, 0, 0, 13, 1, 0, 
+	0, 31, 55, 55, 31, 0, 11, 11, 
+	3, 0, 5, 7, 25, 25, 7, 0, 
+	9, 9, 0, 1, 19, 19
 };
 
-static const int httpclient_parser_start = 0;
-
+static const int httpclient_parser_start = 1;
 static const int httpclient_parser_first_final = 39;
+static const int httpclient_parser_error = 0;
+
+static const int httpclient_parser_en_main = 1;
 
-static const int httpclient_parser_error = 1;
 
 #line 99 "http11_parser.rl"
 
 int httpclient_parser_init(httpclient_parser *parser)  {
   int cs = 0;
   
-#line 178 "http11_parser.c"
+#line 195 "http11_parser.c"
 	{
 	cs = httpclient_parser_start;
 	}
+
 #line 103 "http11_parser.rl"
   parser->cs = cs;
   parser->body_start = 0;
@@ -206,7 +224,7 @@ size_t httpclient_parser_execute(httpclient_parser *parser, const char *buffer,
 
 
   
-#line 210 "http11_parser.c"
+#line 228 "http11_parser.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -215,10 +233,10 @@ size_t httpclient_parser_execute(httpclient_parser *parser, const char *buffer,
 	const char *_keys;
 
 	if ( p == pe )
+		goto _test_eof;
+	if ( cs == 0 )
 		goto _out;
 _resume:
-	if ( cs == 1 )
-		goto _out;
 	_keys = _httpclient_parser_trans_keys + _httpclient_parser_key_offsets[cs];
 	_trans = _httpclient_parser_index_offsets[cs];
 
@@ -269,12 +287,12 @@ _resume:
 
 _match:
 	_trans = _httpclient_parser_indicies[_trans];
-	cs = _httpclient_parser_trans_targs_wi[_trans];
+	cs = _httpclient_parser_trans_targs[_trans];
 
-	if ( _httpclient_parser_trans_actions_wi[_trans] == 0 )
+	if ( _httpclient_parser_trans_actions[_trans] == 0 )
 		goto _again;
 
-	_acts = _httpclient_parser_actions + _httpclient_parser_trans_actions_wi[_trans];
+	_acts = _httpclient_parser_actions + _httpclient_parser_trans_actions[_trans];
 	_nacts = (unsigned int) *_acts++;
 	while ( _nacts-- > 0 )
 	{
@@ -340,18 +358,22 @@ _match:
     parser->body_start = p - buffer + 1; 
     if(parser->header_done != NULL)
       parser->header_done(parser->data, p + 1, pe - p - 1);
-    goto _out;
+    {p++; goto _out; }
   }
 	break;
-#line 347 "http11_parser.c"
+#line 365 "http11_parser.c"
 		}
 	}
 
 _again:
+	if ( cs == 0 )
+		goto _out;
 	if ( ++p != pe )
 		goto _resume;
+	_test_eof: {}
 	_out: {}
 	}
+
 #line 130 "http11_parser.rl"
 
   parser->cs = cs;
@@ -366,10 +388,7 @@ _again:
 
   if(parser->body_start) {
     /* final \r\n combo encountered so stop right here */
-    
-#line 371 "http11_parser.c"
-#line 144 "http11_parser.rl"
-    parser->nread++;
+    parser->nread = parser->body_start;
   }
 
   return(parser->nread);
@@ -379,10 +398,6 @@ int httpclient_parser_finish(httpclient_parser *parser)
 {
   int cs = parser->cs;
 
-  
-#line 384 "http11_parser.c"
-#line 155 "http11_parser.rl"
-
   parser->cs = cs;
 
   if (httpclient_parser_has_error(parser) ) {

data/ext/http11_client/http11_parser.rl

@@ -62,7 +62,7 @@
   }
 
 # line endings
-  CRLF = "\r\n";
+  CRLF = ("\r\n" | "\n");
 
 # character types
   CTL = (cntrl | 127);
@@ -140,8 +140,7 @@ size_t httpclient_parser_execute(httpclient_parser *parser, const char *buffer,
 
   if(parser->body_start) {
     /* final \r\n combo encountered so stop right here */
-    %%write eof;
-    parser->nread++;
+    parser->nread = parser->body_start;
   }
 
   return(parser->nread);
@@ -151,8 +150,6 @@ int httpclient_parser_finish(httpclient_parser *parser)
 {
   int cs = parser->cs;
 
-  %%write eof;
-
   parser->cs = cs;
 
   if (httpclient_parser_has_error(parser) ) {

data/lib/em-http/client.rb

@@ -1,4 +1,3 @@
-# -*- coding: undecided -*-
 # #--
 # Copyright (C)2008 Ilya Grigorik
 #
@@ -21,6 +20,16 @@ module EventMachine
 
     # The status code (as a string!)
     attr_accessor :http_status
+    
+    # E-Tag
+    def etag
+      self["ETag"]
+    end
+    
+    def last_modified
+      time = self["Last-Modified"]
+      Time.parse(time) if time
+    end
 
     # HTTP response status as an integer
     def status
@@ -32,6 +41,11 @@ module EventMachine
       Integer(self[HttpClient::CONTENT_LENGTH]) rescue nil
     end
 
+    # Cookie header from the server
+    def cookie
+      self[HttpClient::SET_COOKIE]
+    end
+
     # Is the transfer encoding chunked?
     def chunked_encoding?
       /chunked/i === self[HttpClient::TRANSFER_ENCODING]
@@ -44,6 +58,10 @@ module EventMachine
     def compressed?
       /gzip|compressed|deflate/i === self[HttpClient::CONTENT_ENCODING]
     end
+
+    def location
+      self[HttpClient::LOCATION]
+    end
   end
 
   class HttpChunkHeader < Hash
@@ -86,7 +104,7 @@ module EventMachine
     # you include port 80 then further redirects will tack on the :80 which is
     # annoying.
     def encode_host
-      @uri.host + (@uri.port.to_i != 80 ? ":#{@uri.port}" : "")
+      @uri.host + (@uri.port != 80 ? ":#{@uri.port}" : "")
     end
 
     def encode_request(method, path, query)
@@ -94,12 +112,16 @@ module EventMachine
     end
 
     def encode_query(path, query)
-      return path unless query
-      if query.kind_of? String
-        return "#{path}?#{query}"
+      encoded_query = if query.kind_of?(Hash)
+        query.map { |k, v| encode_param(k, v) }.join('&')
       else
-        return path + "?" + query.map { |k, v| encode_param(k, v) }.join('&')
+        query.to_s
+      end
+      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}"
     end
 
     # URL encodes query parameters:
@@ -134,8 +156,12 @@ module EventMachine
       end
     end
 
-    def encode_cookies(cookies)
-      cookies.inject('') { |result, (k, v)| result << encode_field('Cookie', encode_param(k, v)) }
+    def encode_cookie(cookie)
+      if cookie.is_a? Hash
+        cookie.inject('') { |result, (k, v)| result <<  encode_param(k, v) + ";" }
+      else
+        cookie
+      end
     end
   end
 
@@ -164,17 +190,20 @@ module EventMachine
       @state = :response_header
       @parser_nbytes = 0
       @response = ''
-      @inflate = []
       @errors = ''
       @content_decoder = nil
+      @stream = nil
     end
 
     # start HTTP request once we establish connection to host
     def connection_completed
+      ssl = @options[:tls] || @options[:ssl] || {}
+      start_tls(ssl) if @uri.scheme == "https" #or @uri.port == 443 # A user might not want https even on port 443.
+
       send_request_header
       send_request_body
     end
-
+    
     # request is done, invoke the callback
     def on_request_complete
       begin
@@ -184,17 +213,33 @@ module EventMachine
       end
       unbind
     end
-
+    
     # request failed, invoke errback
-    def on_error(msg)
+    def on_error(msg, dns_error = false)
       @errors = msg
-      unbind
+      
+      # no connection signature on DNS failures
+      # fail the connection directly
+      dns_error == true ? fail : unbind
+    end
+
+    # assign a stream processing block
+    def stream(&blk)
+      @stream = blk
+    end
+
+    def normalize_body
+      if @options[:body].is_a? Hash
+        @options[:body].to_params
+      else
+        @options[:body]
+      end
     end
 
     def send_request_header
       query   = @options[:query]
       head    = @options[:head] ? munge_header_keys(@options[:head]) : {}
-      body    = @options[:body]
+      body    = normalize_body
 
       # Set the Host header if it hasn't been specified already
       head['host'] ||= encode_host
@@ -205,9 +250,9 @@ module EventMachine
       # Set the User-Agent if it hasn't been specified
       head['user-agent'] ||= "EventMachine HttpClient"
 
-      # Set auto-inflate flags
-      if head['accept-encoding']
-        @inflate = head['accept-encoding'].split(',').map {|t| t.strip}
+      # Set the cookie header if provided
+      if cookie = head.delete('cookie')
+        head['cookie'] = encode_cookie(cookie)
       end
 
       # Build the request
@@ -220,11 +265,7 @@ module EventMachine
 
     def send_request_body
       return unless @options[:body]
-      if @options[:body].is_a? Hash
-        body = @options[:body].to_params
-      else
-        body = @options[:body]
-      end
+      body = normalize_body
       send_data body
     end
 
@@ -247,15 +288,19 @@ module EventMachine
     end
 
     def on_decoded_body_data(data)
-      if (on_response = @options[:on_response])
-        on_response.call(data)
+      if @stream
+        @stream.call(data)
       else
         @response << data
       end
     end
 
     def unbind
-      (@state == :finished) ? succeed(self) : fail
+      if @state == :finished || (@state == :body && @bytes_remaining.nil?)
+        succeed(self) 
+      else
+        fail(self)
+      end
       close_connection
     end
 
@@ -286,7 +331,6 @@ module EventMachine
 
     def parse_header(header)
       return false if @data.empty?
-
       begin
         @parser_nbytes = @parser.execute(header, @data.to_str, @parser_nbytes)
       rescue EventMachine::HttpClientParserError
@@ -313,22 +357,50 @@ module EventMachine
         return false
       end
 
+      # correct location header - some servers will incorrectly give a relative URI
+      if @response_header.location
+        begin
+          location = URI.parse @response_header.location
+          if location.relative?
+            location = (@uri.merge location).to_s
+            @response_header[LOCATION] = location
+          end
+        rescue
+          on_error "Location header format error"
+          return false
+        end
+      end
+
+      # shortcircuit on HEAD requests 
+      if @method == "HEAD"
+        @state = :finished
+        on_request_complete
+      end
+
       if @response_header.chunked_encoding?
         @state = :chunk_header
+      elsif @response_header.content_length
+        if @response_header.content_length > 0
+          @state = :body
+          @bytes_remaining = @response_header.content_length 
+        else
+          @state = :body
+          @bytes_remaining = nil
+        end
       else
-        @state = :body
-        @bytes_remaining = @response_header.content_length
+        @state = :invalid
+        on_error "no HTTP response"
+        return false
       end
 
-      if @inflate.include?(response_header[CONTENT_ENCODING]) &&
-          decoder_class = HttpDecoders.decoder_for_encoding(response_header[CONTENT_ENCODING])
+      if decoder_class = HttpDecoders.decoder_for_encoding(response_header[CONTENT_ENCODING])
         begin
           @content_decoder = decoder_class.new do |s| on_decoded_body_data(s) end
         rescue HttpDecoders::DecoderError
           on_error "Content-decoder error"
         end
       end
-
+      
       true
     end
 

data/lib/em-http/decoders.rb

@@ -1,4 +1,5 @@
 require 'zlib'
+require 'stringio'
 
 ##
 # Provides a unified callback interface to decompression libraries.
@@ -115,5 +116,3 @@ module EventMachine::HttpDecoders
   DECODERS = [Deflate, GZip]
 
 end
-
-    

data/lib/em-http/request.rb

@@ -1,5 +1,5 @@
-require 'uri'
 require 'base64'
+require 'addressable/uri'
 
 module EventMachine
 
@@ -27,7 +27,7 @@ module EventMachine
 
     def initialize(host, headers = {})
       @headers = headers
-      @uri = host.kind_of?(URI) ? host : URI::parse(host)
+      @uri = host.kind_of?(Addressable::URI) ? host : Addressable::URI::parse(host)
     end
 
     # Send an HTTP request and consume the response. Supported options:
@@ -50,6 +50,7 @@ module EventMachine
     #     Host: header
 
     def get  options = {};    send_request(:get,  options);    end
+    def head options = {};    send_request(:head, options);    end
     def post options = {};    send_request(:post, options);    end
 
     protected
@@ -57,19 +58,30 @@ module EventMachine
     def send_request(method, options)
       raise ArgumentError, "invalid request path" unless /^\// === @uri.path
 
+      # 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
       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|
           c.uri = @uri
           c.method = method
           c.options = options
-          c.comm_inactivity_timeout = options[:timeout] || 5
+          if options.has_key?(:timeout) && options[:timeout]
+            c.comm_inactivity_timeout = options[:timeout]
+            c.pending_connect_timeout = options[:timeout]
+          elsif options.has_key?(:timeout)
+            c.comm_inactivity_timeout = 5
+            c.pending_connect_timeout = 5
+          end
         }
       rescue RuntimeError => e 
         raise e unless e.message == "no connection"
         conn = EventMachine::HttpClient.new("")
-        conn.on_error("no connection")
+        conn.on_error("no connection", true)
         conn
       end
     end

data/test/stallion.rb

@@ -80,9 +80,22 @@ Stallion.saddle :spec do |stable|
     elsif stable.request.path_info == '/echo_query'
       stable.response.write stable.request.query_string
 
+    elsif stable.request.path_info == '/echo_content_length'
+      stable.response.write stable.request.content_length
+
+    elsif stable.request.head?
+      stable.response.status = 200
+
     elsif stable.request.post?
       stable.response.write stable.request.body.read
 
+    elsif stable.request.path_info == '/set_cookie'
+      stable.response["Set-Cookie"] = "id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;"
+      stable.response.write "cookie set"
+
+    elsif stable.request.path_info == '/echo_cookie'
+      stable.response.write stable.request.env["HTTP_COOKIE"]
+
     elsif stable.request.path_info == '/timeout'
       sleep(10)
       stable.response.write 'timeout'
@@ -121,7 +134,11 @@ Stallion.saddle :spec do |stable|
 end
 
 Thread.new do
-  Stallion.run :Host => '127.0.0.1', :Port => 8080
+  begin
+    Stallion.run :Host => '127.0.0.1', :Port => 8080  
+  rescue Exception => e
+    print e
+  end
 end
 
-sleep(2)
+sleep(1)

data/test/stub_server.rb

@@ -0,0 +1,22 @@
+class StubServer
+  module Server
+    def receive_data(data)
+      send_data @response
+      close_connection_after_writing
+    end
+
+    def response=(response)
+      @response = response
+    end
+  end
+
+  def initialize(response, port=8081)
+    @sig = EventMachine::start_server("127.0.0.1", port, Server) { |s|
+      s.response = response
+    }
+  end
+
+  def stop
+    EventMachine.stop_server @sig
+  end
+end

data/test/{hash.rb → test_hash.rb}

@@ -1,6 +1,7 @@
 require 'test/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.should == "a=alpha&b=beta"
@@ -9,9 +10,10 @@ describe Hash do
     it "should transform a more complex hash into HTTP POST Params" do
       {:a => "a", :b => ["c", "d", "e"]}.to_params.should == "a=a&b[0]=c&b[1]=d&b[2]=e"
     end
-    
-    it "should transform a very complex hash into HTTP POST Params" do
-      {:a => "a", :b => [{:c => "c", :d => "d"}, {:e => "e", :f => "f"}]}.to_params.should == "a=a&b[0][d]=d&b[0][c]=c&b[1][e]=e&b[1][f]=f"
-    end
+
+    # Ruby 1.8 Hash is not sorted, so this test breaks randomly. Maybe once we're all on 1.9. ;-)
+    # it "should transform a very complex hash into HTTP POST Params" do
+    #    {:a => "a", :b => [{:c => "c", :d => "d"}, {:e => "e", :f => "f"}]}.to_params.should == "a=a&b[0][d]=d&b[0][c]=c&b[1][f]=f&b[1][e]=e"
+    # end
   end
 end

data/test/test_multi.rb

@@ -3,11 +3,6 @@ require 'test/stallion'
 
 describe EventMachine::MultiRequest do
 
-  def failed
-    EventMachine.stop
-    fail
-  end
-
   it "should submit multiple requests in parallel and return once all of them are complete" do
     EventMachine.run {
       
@@ -16,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://169.169.169.169/').get)
+      multi.add(EventMachine::HttpRequest.new('http://0.0.0.0/').get(:timeout => 1))
       
       multi.callback  {
         # verify successfull request

data/test/test_request.rb

@@ -1,16 +1,17 @@
 require 'test/helper'
 require 'test/stallion'
-
+require 'test/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
+      http = EventMachine::HttpRequest.new('http://127.1.1.1/').get :timeout => 1
       http.callback { failed }
       http.errback {
         http.response_header.status.should == 0
@@ -21,7 +22,7 @@ describe EventMachine::HttpRequest do
 
   it "should fail GET on invalid host" do
     EventMachine.run {
-      http = EventMachine::HttpRequest.new('http://google1.com/').get
+      http = EventMachine::HttpRequest.new('http://google1.com/').get :timeout => 1
       http.callback { failed }
       http.errback {
         http.response_header.status.should == 0
@@ -68,12 +69,26 @@ describe EventMachine::HttpRequest do
     }    
   end
 
+  it "should perform successfull HEAD with a URI passed as argument" do
+    EventMachine.run {
+      uri = URI.parse('http://127.0.0.1:8080/')
+      http = EventMachine::HttpRequest.new(uri).head
+
+      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 {
       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
       }
@@ -145,6 +160,20 @@ describe EventMachine::HttpRequest do
       }
     }
   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"}
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 200
+        
+        http.response.to_i.should == 10
+        EventMachine.stop
+      }
+    }
+  end
 
   it "should perform successfull GET with custom header" do
     EventMachine.run {
@@ -233,10 +262,10 @@ describe EventMachine::HttpRequest do
   it "should timeout after 10 seconds" do
     EventMachine.run {
       t = Time.now.to_i
-      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/timeout').get :timeout => 2
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/timeout').get :timeout => 1
 
       http.errback {
-        (Time.now.to_i - t).should == 2
+        (Time.now.to_i - t).should >= 2
         EventMachine.stop
       }
       http.callback { failed }
@@ -246,10 +275,11 @@ describe EventMachine::HttpRequest do
   it "should optionally pass the response body progressively" do
     EventMachine.run {
       body = ''
-      on_body = lambda { |chunk| body += chunk }
-      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :on_response => on_body
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get 
 
       http.errback { failed }
+      http.stream { |chunk| body += chunk }
+
       http.callback {
         http.response_header.status.should == 200
         http.response.should == ''
@@ -262,11 +292,11 @@ describe EventMachine::HttpRequest do
   it "should optionally pass the deflate-encoded response body progressively" do
     EventMachine.run {
       body = ''
-      on_body = lambda { |chunk| body += chunk }
-      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/deflate').get :head => {"accept-encoding" => "deflate, compressed"},
-      :on_response => on_body
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/deflate').get :head => {"accept-encoding" => "deflate, compressed"}
 
       http.errback { failed }
+      http.stream { |chunk| body += chunk }
+
       http.callback {
         http.response_header.status.should == 200
         http.response_header["CONTENT_ENCODING"].should == "deflate"
@@ -277,16 +307,86 @@ describe EventMachine::HttpRequest do
     }
   end
 
-  it "should respect manually-passed host address" do
+  it "should initiate SSL/TLS on HTTPS connections" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('https://mail.google.com:443/mail/').get
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 302
+        EventMachine.stop
+      }
+    }
+  end
+
+  it "should accept & return cookie header to user" do
     EventMachine.run {
-      http = EventMachine::HttpRequest.new('http://127.1.1.1:8080/').get :host => '127.0.0.1'
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/set_cookie').get
 
       http.errback { failed }
       http.callback {
         http.response_header.status.should == 200
-        http.response.should match(/Hello/)
+        http.response_header.cookie.should == "id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;"
+        EventMachine.stop
+      }
+    }
+  end
+
+  it "should pass cookie header to server from string" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_cookie').get :head => {'cookie' => 'id=2;'}
+
+      http.errback { failed }
+      http.callback {
+        http.response.should == "id=2;"
         EventMachine.stop
       }
     }
   end
+
+  it "should pass cookie header to server from Hash" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_cookie').get :head => {'cookie' => {'id' => 2}}
+
+      http.errback { failed }
+      http.callback {
+        http.response.should == "id=2;"
+        EventMachine.stop
+      }
+    }
+  end
+
+  context "when talking to a stub HTTP/1.0 server" do
+    it "should get the body without Content-Length" do
+      EventMachine.run {
+        @s = StubServer.new("HTTP/1.0 200 OK\r\nConnection: close\r\n\r\nFoo")
+
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/').get
+        http.errback { failed }
+        http.callback {
+          http.response.should match(/Foo/)
+
+          @s.stop
+          EventMachine.stop
+        }
+      }
+    end
+
+    it "should work with \\n instead of \\r\\n" do
+      EventMachine.run {
+        @s = StubServer.new("HTTP/1.0 200 OK\nContent-Type: text/plain\nContent-Length: 3\nConnection: close\n\nFoo")
+
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/').get
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response_header['CONTENT_TYPE'].should == 'text/plain'
+          http.response.should match(/Foo/)
+
+          @s.stop
+          EventMachine.stop
+        }
+      }
+    end
+  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.12
 platform: ruby
 authors: 
 - Ilya Grigorik
+- Stephan Maka
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-20 00:00:00 -07:00
+date: 2009-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,10 +21,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.2
+        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 HTTP Request interface
-email: ilya@igvita.com
+email: astro@spaceboyz.net
 executables: []
 
 extensions: 
@@ -52,13 +63,16 @@ files:
 - lib/em-http/decoders.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
-- test/hash.rb
+- test/test_hash.rb
 - test/helper.rb
 - test/stallion.rb
+- test/stub_server.rb
 - test/test_multi.rb
 - test/test_request.rb
 has_rdoc: true
 homepage: http://github.com/igrigorik/em-http-request
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -79,9 +93,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: em-http-request
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: EventMachine based HTTP Request interface
 test_files: []