http-parser-lite 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.3.0 (2012-06-27)
+
+* Added optional type argument to Parser#initialize and Parser#reset
+* Added Parser#error? and Parser#error
+
 == 0.2.0 (2012-06-25)
 
 * Added Parser#pause, Parser#resume and Parser#paused?

data/README.md

@@ -52,10 +52,9 @@ parser << "GET http://www.google.com/ HTTP/1.1\r\n\r\n"
 
 ```
 HTTP::Parser
-    .new
-
-    #reset
+    .new(type = HTTP::Parser::TYPE_BOTH)
 
+    #reset(type = nil)
     #parse(data)
     #<<(data)
 
@@ -73,6 +72,19 @@ HTTP::Parser
     #pause
     #resume
     #paused?
+
+    #error?
+    #error
+
+Constants:
+
+* HTTP::Parser::TYPE_REQUEST
+* HTTP::Parser::TYPE_RESPONSE
+* HTTP::Parser::TYPE_BOTH
+
+Exceptions:
+
+* HTTP::Parser::Error
 ```
 
 ## License

data/ext/http-parser/ruby_http_parser.c

@@ -25,17 +25,13 @@ http_parser* rb_http_parser_handle(VALUE self) {
     return parser;
 }
 
-VALUE rb_parser_callback_for(VALUE self, VALUE name) {
-    return rb_hash_aref(rb_iv_get(self, "@callbacks"), name);
-}
-
 void rb_parser_callback_call(VALUE self, const char *name, char *data, size_t length) {
-    VALUE func = rb_parser_callback_for(self, ID2SYM(rb_intern(name)));
-    if (!NIL_P(func)) {
+    VALUE callback = rb_hash_aref(rb_iv_get(self, "@callbacks"), ID2SYM(rb_intern(name)));
+    if (!NIL_P(callback)) {
         VALUE args = rb_ary_new();
         if (data)
             rb_ary_push(args, rb_str_new(data, length));
-        rb_proc_call(func, args);
+        rb_proc_call(callback, args);
     }
 }
 
@@ -92,9 +88,9 @@ VALUE rb_parser_parse(VALUE self, VALUE data) {
     return Qtrue;
 }
 
-VALUE rb_parser_reset(VALUE self) {
+VALUE rb_parser_reset_bang(VALUE self, VALUE type) {
     http_parser *parser = rb_http_parser_handle(self);
-    http_parser_init(parser, HTTP_BOTH);
+    http_parser_init(parser, FIX2INT(type));
     return Qtrue;
 }
 
@@ -132,6 +128,17 @@ VALUE rb_parser_http_status(VALUE self) {
     return INT2NUM(parser->status_code);
 }
 
+VALUE rb_parser_error_q(VALUE self) {
+    http_parser *parser = rb_http_parser_handle(self);
+    return HTTP_PARSER_ERRNO(parser) != HPE_OK ? Qtrue : Qfalse;
+}
+
+VALUE rb_parser_error(VALUE self) {
+    http_parser *parser = rb_http_parser_handle(self);
+    int errno = HTTP_PARSER_ERRNO(parser);
+    return errno != HPE_OK ? rb_str_new2(http_errno_description(errno)) : Qnil;
+}
+
 Init_http_parser() {
     mHTTP        = rb_define_module("HTTP");
     cParser      = rb_define_class_under(mHTTP,   "Parser", rb_cObject);
@@ -144,8 +151,11 @@ Init_http_parser() {
     rb_define_method(cParser, "pause",        rb_parser_pause,        0);
     rb_define_method(cParser, "resume",       rb_parser_resume,       0);
     rb_define_method(cParser, "paused?",      rb_parser_is_paused,    0);
-    rb_define_method(cParser, "reset",        rb_parser_reset,        0);
+    rb_define_method(cParser, "error?",       rb_parser_error_q,      0);
+    rb_define_method(cParser, "error",        rb_parser_error,        0);
     rb_define_method(cParser, "http_method",  rb_parser_http_method,  0);
     rb_define_method(cParser, "http_version", rb_parser_http_version, 0);
     rb_define_method(cParser, "http_status",  rb_parser_http_status,  0);
+
+    rb_define_private_method(cParser, "reset!", rb_parser_reset_bang, 1);
 }

data/lib/http-parser.rb

@@ -2,7 +2,10 @@ require 'http-parser/http_parser'
 
 module HTTP
   class Parser
-    CALLBACKS = %w(on_url on_header_field on_header_value on_body on_message_begin on_message_complete)
+    TYPE_REQUEST  = 0
+    TYPE_RESPONSE = 1
+    TYPE_BOTH     = 2
+    CALLBACKS     = %w(on_url on_header_field on_header_value on_body on_message_begin on_message_complete)
 
     CALLBACKS.each do |name|
       define_method(name) do |&block|
@@ -11,8 +14,20 @@ module HTTP
       end
     end
 
-    def initialize
+    attr_reader :type
+
+    def initialize type = TYPE_BOTH
       @callbacks = {}
+      reset(type)
+    end
+
+    def reset value = nil
+      if value
+        raise ArgumentError, "Invalid parser type #{value}" unless [0, 1, 2].include?(value)
+        @type = value
+      end
+
+      reset!(@type)
     end
   end
 end

data/test/test_http_parser.rb

@@ -106,4 +106,51 @@ describe 'http-parser' do
 
     assert %w(/hello X-Test-Field 1), got
   end
+
+  it 'should create parser of appropriate type' do
+    parser = HTTP::Parser.new(HTTP::Parser::TYPE_REQUEST)
+    assert parser << "GET /hello HTTP/1.1\r\n\r\n"
+    assert_raises(HTTP::Parser::Error) do
+      parser << "HTTP/1.1 200 OK\r\n\r\n"
+    end
+  end
+
+  it 'should be able to reset parser to another type' do
+    parser.reset(HTTP::Parser::TYPE_RESPONSE)
+    assert parser << "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"
+    assert_raises(HTTP::Parser::Error) do
+      parser << "GET / HTTP/1.1\r\n\r\n"
+    end
+
+    parser.reset(HTTP::Parser::TYPE_REQUEST)
+    assert parser << "GET / HTTP/1.1\r\n\r\n"
+  end
+
+  it '#reset should validate parser type' do
+    assert_raises(ArgumentError) do
+      parser.reset("foo")
+    end
+    assert_raises(ArgumentError) do
+      parser.reset(4)
+    end
+    assert parser.reset(0)
+  end
+
+  it 'should expose parser error status' do
+    parser.reset(HTTP::Parser::TYPE_REQUEST)
+
+    assert parser << "GET / HTTP/1.1\r\n\r\n"
+    assert !parser.error?
+
+    assert_raises(HTTP::Parser::Error) do
+      parser << "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"
+    end
+    assert parser.error?
+    assert_match %r{invalid http method}i, parser.error
+
+    # reset should give you a clean slate
+    parser.reset(HTTP::Parser::TYPE_REQUEST)
+    assert !parser.error?
+    assert !parser.error
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-parser-lite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake