http_parser.rb 0.5.2 → 0.5.3

data/.gitmodules

@@ -1,6 +1,6 @@
 [submodule "ext/ruby_http_parser/vendor/http-parser"]
 	path = ext/ruby_http_parser/vendor/http-parser
-	url = git://github.com/ry/http-parser.git
+	url = git://github.com/joyent/http-parser.git
 [submodule "ext/ruby_http_parser/vendor/http-parser-java"]
 	path = ext/ruby_http_parser/vendor/http-parser-java
 	url = git://github.com/a2800276/http-parser.java.git

data/README.md

@@ -3,7 +3,7 @@
 A simple callback-based HTTP request/response parser for writing http
 servers, clients and proxies.
 
-This gem is built on top of [ry/http-parser](http://github.com/ry/http-parser) and its java port [a2800276/http-parser.java](http://github.com/a2800276/http-parser.java).
+This gem is built on top of [joyent/http-parser](http://github.com/joyent/http-parser) and its java port [a2800276/http-parser.java](http://github.com/a2800276/http-parser.java).
 
 ## Supported Platforms
 

data/ext/ruby_http_parser/ruby_http_parser.c

@@ -100,6 +100,7 @@ static ID Ion_body;
 static ID Ion_message_complete;
 
 static VALUE Sstop;
+static VALUE Sreset;
 static VALUE Sarrays;
 static VALUE Sstrings;
 static VALUE Smixed;
@@ -229,6 +230,8 @@ int on_headers_complete(ryah_http_parser *parser) {
   if (ret == Sstop) {
     wrapper->stopped = Qtrue;
     return -1;
+  } else if (ret == Sreset){
+    return 1;
   } else {
     return 0;
   }
@@ -348,7 +351,7 @@ VALUE Parser_execute(VALUE self, VALUE data) {
   if (wrapper->parser.upgrade) {
     rb_str_cat(wrapper->upgrade_data, ptr + nparsed + 1, len - nparsed - 1);
 
-  } else if (nparsed != len) {
+  } else if (nparsed != (size_t)len) {
     if (!RTEST(wrapper->stopped) && !RTEST(wrapper->completed))
       rb_raise(eParserError, "Could not parse data entirely");
     else
@@ -401,7 +404,7 @@ VALUE Parser_upgrade_p(VALUE self) {
   ParserWrapper *wrapper = NULL;
   DATA_GET(self, ParserWrapper, wrapper);
 
-  return wrapper->parser.upgrade == 1 ? Qtrue : Qfalse;
+  return wrapper->parser.upgrade ? Qtrue : Qfalse;
 }
 
 VALUE Parser_http_version(VALUE self) {
@@ -502,6 +505,7 @@ void Init_ruby_http_parser() {
   Ion_body = rb_intern("on_body");
   Ion_message_complete = rb_intern("on_message_complete");
   Sstop = ID2SYM(rb_intern("stop"));
+  Sreset = ID2SYM(rb_intern("reset"));
 
   Sarrays = ID2SYM(rb_intern("arrays"));
   Sstrings = ID2SYM(rb_intern("strings"));

data/http_parser.rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "http_parser.rb"
-  s.version = "0.5.2"
+  s.version = "0.5.3"
   s.summary = "Simple callback-based HTTP request/response parser"
   s.description = "Ruby bindings to http://github.com/ry/http-parser and http://github.com/a2800276/http-parser.java"
 

data/spec/parser_spec.rb

@@ -53,11 +53,11 @@ describe HTTP::Parser do
   it "should throw an Argument Error if header value type is invalid" do
     proc{ @parser.header_value_type = 'bob' }.should raise_error(ArgumentError)
   end
-  
+
   it "should throw an Argument Error if default header value type is invalid" do
     proc{ HTTP::Parser.default_header_value_type = 'bob' }.should raise_error(ArgumentError)
   end
-  
+
   it "should implement basic api" do
     @parser <<
       "GET /test?ok=1 HTTP/1.1\r\n" +
@@ -135,6 +135,25 @@ describe HTTP::Parser do
     @parser.fragment.should be_nil
   end
 
+  it "should optionally reset parser state on no-body responses" do
+   @parser.reset!.should be_true
+
+   @head, @complete = 0, 0
+   @parser.on_headers_complete = proc {|h| @head += 1; :reset }
+   @parser.on_message_complete = proc { @complete += 1 }
+   @parser.on_body = proc {|b| fail }
+
+   head_response = "HTTP/1.1 200 OK\r\nContent-Length:10\r\n\r\n"
+
+   @parser << head_response
+   @head.should == 1
+   @complete.should == 1
+
+   @parser << head_response
+   @head.should == 2
+   @complete.should == 2
+  end
+
   it "should retain callbacks after reset" do
     @parser.reset!.should be_true
 

data/tasks/fixtures.rake

@@ -15,7 +15,7 @@ task :fixtures => :submodules do
     tmp.gsub!('FALSE', 'false')
 
     # remove macros and comments
-    tmp.gsub!(/^#define.+$/,'')
+    tmp.gsub!(/^#(if|elif|endif|define).+$/,'')
     tmp.gsub!(/\/\*(.+?)\*\/$/,'')
 
     # HTTP_* enums become strings

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_parser.rb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-27 00:00:00 -07:00
+date: 2011-10-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency