http-parser 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee24befc2a0a23054f11edb4379b9b6b1f8d21a
-  data.tar.gz: 816280693464c8c5daa1c7fb20fe4954c3dd1a26
+  metadata.gz: c7c15574adec9aefd70f9ad96c542b70ce3b3727
+  data.tar.gz: ebcfbcfbe13fa5e1155e4c0a41f242ea96b1e8a7
 SHA512:
-  metadata.gz: 1846519857ad32e3f688cf18f28fb3dd2cd33fa4c0a0909d6a2c934218b1ae5df30101b54a8b100cb8caaf28482a964e8e17ef5594abc91fddcb575d67ac5091
-  data.tar.gz: 82c5dba81e1673ab22497e5e1adda9d6f89ab115795747bc64a0043ced1511880c65d003b379a4f35e89976d92bdf793933bf196b2002876edb431f2c2dcc4c6
+  metadata.gz: 0e3a987b169359afe6229340fb4c28e74c411beb302f767bb45f836cc8579598c1d9b89286e9aeb4bf3c114d4fed9b87b5952510c36da676b063e4a60007ee4c
+  data.tar.gz: 6a531fd9df9c4f011a7163eb1e87dc260fa0a9ee6c201c9e8156f7b86db0b636f579ca3e094535d16a1bc0541c909f276026811de2ee9f5176177c17cb19f05d

data/ext/http-parser/http_parser.c

@@ -248,6 +248,7 @@ enum state
   , s_res_http_minor
   , s_res_first_status_code
   , s_res_status_code
+  , s_res_status_start
   , s_res_status
   , s_res_line_almost_done
 
@@ -581,6 +582,7 @@ size_t http_parser_execute (http_parser *parser,
   const char *header_value_mark = 0;
   const char *url_mark = 0;
   const char *body_mark = 0;
+  const char *status_mark = 0;
 
   /* We're in an error state. Don't bother doing anything. */
   if (HTTP_PARSER_ERRNO(parser) != HPE_OK) {
@@ -627,6 +629,9 @@ size_t http_parser_execute (http_parser *parser,
   case s_req_fragment:
     url_mark = data;
     break;
+  case s_res_status:
+    status_mark = data;
+    break;
   }
 
   for (p=data; p != data + len; p++) {
@@ -833,7 +838,7 @@ size_t http_parser_execute (http_parser *parser,
         if (!IS_NUM(ch)) {
           switch (ch) {
             case ' ':
-              parser->state = s_res_status;
+              parser->state = s_res_status_start;
               break;
             case CR:
               parser->state = s_res_line_almost_done;
@@ -859,24 +864,42 @@ size_t http_parser_execute (http_parser *parser,
         break;
       }
 
+      case s_res_status_start:
+      {
+        if (ch == CR) {
+          parser->state = s_res_line_almost_done;
+          break;
+        }
+
+        if (ch == LF) {
+          parser->state = s_header_field_start;
+          break;
+        }
+
+        MARK(status);
+        parser->state = s_res_status;
+        parser->index = 0;
+        break;
+      }
+
       case s_res_status:
-        /* the human readable status. e.g. "NOT FOUND"
-         * we are not humans so just ignore this */
         if (ch == CR) {
           parser->state = s_res_line_almost_done;
+          CALLBACK_DATA(status);
           break;
         }
 
         if (ch == LF) {
           parser->state = s_header_field_start;
+          CALLBACK_DATA(status);
           break;
         }
+
         break;
 
       case s_res_line_almost_done:
         STRICT_CHECK(ch != LF);
         parser->state = s_header_field_start;
-        CALLBACK_NOTIFY(status_complete);
         break;
 
       case s_start_req:
@@ -1854,12 +1877,14 @@ size_t http_parser_execute (http_parser *parser,
   assert(((header_field_mark ? 1 : 0) +
           (header_value_mark ? 1 : 0) +
           (url_mark ? 1 : 0)  +
-          (body_mark ? 1 : 0)) <= 1);
+          (body_mark ? 1 : 0) +
+          (status_mark ? 1 : 0)) <= 1);
 
   CALLBACK_DATA_NOADVANCE(header_field);
   CALLBACK_DATA_NOADVANCE(header_value);
   CALLBACK_DATA_NOADVANCE(url);
   CALLBACK_DATA_NOADVANCE(body);
+  CALLBACK_DATA_NOADVANCE(status);
 
   return len;
 

data/ext/http-parser/http_parser.h

@@ -26,7 +26,7 @@ extern "C" {
 
 /* Also update SONAME in the Makefile whenever you change these. */
 #define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 1
+#define HTTP_PARSER_VERSION_MINOR 2
 #define HTTP_PARSER_VERSION_PATCH 0
 
 #include <sys/types.h>
@@ -143,13 +143,13 @@ enum flags
                                                                      \
   /* Callback-related errors */                                      \
   XX(CB_message_begin, "the on_message_begin callback failed")       \
-  XX(CB_status_complete, "the on_status_complete callback failed")   \
   XX(CB_url, "the on_url callback failed")                           \
   XX(CB_header_field, "the on_header_field callback failed")         \
   XX(CB_header_value, "the on_header_value callback failed")         \
   XX(CB_headers_complete, "the on_headers_complete callback failed") \
   XX(CB_body, "the on_body callback failed")                         \
   XX(CB_message_complete, "the on_message_complete callback failed") \
+  XX(CB_status, "the on_status callback failed")                     \
                                                                      \
   /* Parsing-related errors */                                       \
   XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
@@ -224,7 +224,7 @@ struct http_parser {
 struct http_parser_settings {
   http_cb      on_message_begin;
   http_data_cb on_url;
-  http_cb      on_status_complete;
+  http_data_cb on_status;
   http_data_cb on_header_field;
   http_data_cb on_header_value;
   http_cb      on_headers_complete;

data/lib/http-parser/errors.rb

@@ -36,13 +36,13 @@ module HttpParser
         :OK => Error::OK,
 
         :CB_message_begin => Error::CALLBACK,
-        :CB_status_complete => Error::CALLBACK,
         :CB_url => Error::CALLBACK,
         :CB_header_field => Error::CALLBACK,
         :CB_header_value => Error::CALLBACK,
         :CB_headers_complete => Error::CALLBACK,
         :CB_body => Error::CALLBACK,
         :CB_message_complete => Error::CALLBACK,
+        :CB_status => Error::CALLBACK,
 
         :INVALID_EOF_STATE => Error::INVALID_EOF_STATE,
         :HEADER_OVERFLOW => Error::HEADER_OVERFLOW,

data/lib/http-parser/parser.rb

@@ -1,7 +1,7 @@
 
 module HttpParser
     class Parser
-        CALLBACKS = [:on_message_begin, :on_url, :on_status_complete, :on_header_field, :on_header_value, :on_headers_complete, :on_body, :on_message_complete]
+        CALLBACKS = [:on_message_begin, :on_url, :on_status, :on_header_field, :on_header_value, :on_headers_complete, :on_body, :on_message_complete]
 
         #
         # Returns a new request/response instance variable
@@ -72,10 +72,10 @@ module HttpParser
         # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
-        def on_status_complete(&block)
-            cb = Callback.new(&block)
-            @callbacks[:on_status_complete] = cb
-            @settings[:on_status_complete] = cb
+        def on_status(&block)
+            cb = DataCallback.new(&block)
+            @callbacks[:on_status] = cb
+            @settings[:on_status] = cb
         end
 
         #

data/lib/http-parser/types.rb

@@ -294,7 +294,7 @@ module HttpParser
     class Settings < FFI::Struct
         layout  :on_message_begin,    :http_cb,
                 :on_url,              :http_data_cb,
-                :on_status_complete,  :http_cb,
+                :on_status,           :http_data_cb,
                 :on_header_field,     :http_data_cb,
                 :on_header_value,     :http_data_cb,
                 :on_headers_complete, :http_cb,

data/lib/http-parser/version.rb

@@ -1,3 +1,3 @@
 module HttpParser
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
 end

data/spec/error_spec.rb

@@ -6,25 +6,25 @@ describe HttpParser::Parser, "#initialize" do
     end
 
     it "should return true when error" do
-        subject.parse(@inst, "GETS / HTTP/1.1\r\n").should be_true
-        @inst.error?.should be_true
+        expect(subject.parse(@inst, "GETS / HTTP/1.1\r\n")).to eq(true)
+        expect(@inst.error?).to eq(true)
     end
 
     it "should return false on success" do
-        subject.parse(@inst, "GET / HTTP/1.1\r\n").should be_false
-        @inst.error?.should be_false
+        expect(subject.parse(@inst, "GET / HTTP/1.1\r\n")).to eq(false)
+        expect(@inst.error?).to eq(false)
     end
 
     it "the error should be inspectable" do
-        subject.parse(@inst, "GETS / HTTP/1.1\r\n").should be_true
-        @inst.error.should be_kind_of(::HttpParser::Error::INVALID_METHOD)
-        @inst.error?.should be_true
+        expect(subject.parse(@inst, "GETS / HTTP/1.1\r\n")).to eq(true)
+        expect(@inst.error).to be_kind_of(::HttpParser::Error::INVALID_METHOD)
+        expect(@inst.error?).to eq(true)
     end
 
     it "raises different error types depending on the error" do
-        subject.parse(@inst, "GET / HTTP/23\r\n").should be_true
-        @inst.error.should be_kind_of(::HttpParser::Error::INVALID_VERSION)
-        @inst.error?.should be_true
+        expect(subject.parse(@inst, "GET / HTTP/23\r\n")).to eq(true)
+        expect(@inst.error).to be_kind_of(::HttpParser::Error::INVALID_VERSION)
+        expect(@inst.error?).to eq(true)
     end
 
     context "callback errors" do
@@ -35,10 +35,10 @@ describe HttpParser::Parser, "#initialize" do
         end
 
         it "should handle unhandled errors gracefully" do
-            subject.parse(@inst, "GET /foo?q=1 HTTP/1.1").should be_true
+            expect(subject.parse(@inst, "GET /foo?q=1 HTTP/1.1")).to eq(true)
 
-            @inst.error?.should be_true
-            @inst.error.should be_kind_of(::HttpParser::Error::CALLBACK)
+            expect(@inst.error?).to eq(true)
+            expect(@inst.error).to be_kind_of(::HttpParser::Error::CALLBACK)
         end
     end
 end

data/spec/instance_spec.rb

@@ -1,23 +1,13 @@
 require 'http-parser'
 
 describe ::HttpParser::Instance, "#initialize" do
-    context "when initialized from a pointer" do
-        it "should not call http_parser_init" do
-            ptr = described_class.new.to_ptr
-
-            ::HttpParser.should_not_receive(:http_parser_init)
-
-            described_class.new(ptr)
-        end
-    end
-
     context "when given a block" do
         it "should yield the new Instance" do
             expected = nil
 
             described_class.new { |inst| expected = inst }
 
-            expected.should be_kind_of(described_class)
+            expect(expected).to be_kind_of(described_class)
         end
 
         it "should allow changing the parser type" do
@@ -25,25 +15,25 @@ describe ::HttpParser::Instance, "#initialize" do
                 inst.type = :request
             end
 
-            inst.type.should == :request
+            expect(inst.type).to eq(:request)
         end
     end
 
     describe "#type" do
         it "should default to :both" do
-            subject.type.should == :both
+            expect(subject.type).to eq(:both)
         end
 
         it "should convert the type to a Symbol" do
             subject[:type_flags] = ::HttpParser::TYPES[:request]
 
-            subject.type.should == :request
+            expect(subject.type).to eq(:request)
         end
 
         it "should extract the type from the type_flags field" do
             subject[:type_flags] = ((0xff & ~0x3) | ::HttpParser::TYPES[:response])
 
-            subject.type.should == :response
+            expect(subject.type).to eq(:response)
         end
     end
 
@@ -51,7 +41,7 @@ describe ::HttpParser::Instance, "#initialize" do
         it "should set the type" do
             subject.type = :response
 
-            subject.type.should == :response
+            expect(subject.type).to eq(:response)
         end
 
         it "should not change flags" do
@@ -60,29 +50,19 @@ describe ::HttpParser::Instance, "#initialize" do
 
             subject.type = :request
 
-            subject[:type_flags].should == (flags | ::HttpParser::TYPES[:request])
+            expect(subject[:type_flags]).to eq((flags | ::HttpParser::TYPES[:request]))
         end
     end
 
     describe "#stop!" do
         it "should throw :return, 1" do
-            lambda { subject.stop! }.should throw_symbol(:return,1)
+            expect { subject.stop! }.to throw_symbol(:return,1)
         end
     end
 
     describe "#error!" do
         it "should throw :return, -1" do
-            lambda { subject.error! }.should throw_symbol(:return,-1)
-        end
-    end
-
-    describe "#reset!" do
-        it "should call http_parser_init" do
-            inst = described_class.new
-
-            ::HttpParser.should_receive(:http_parser_init)
-
-            inst.reset!
+            expect { subject.error! }.to throw_symbol(:return,-1)
         end
     end
 
@@ -92,7 +72,7 @@ describe ::HttpParser::Instance, "#initialize" do
         end
 
         inst.reset!
-        inst.type.should == :request
+        expect(inst.type).to eq(:request)
     end
 end
 

data/spec/parser_spec.rb

@@ -15,7 +15,7 @@ describe HttpParser::Parser, "#initialize" do
 
             it "should trigger on a new request" do
                 subject.parse @inst, "GET / HTTP/1.1"
-                @begun.should be_true
+                expect(@begun).to eq(true)
             end
         end
 
@@ -31,11 +31,11 @@ describe HttpParser::Parser, "#initialize" do
             it "should pass the recognized url" do
                 subject.parse @inst, "GET "
 
-                @url.should be_nil
+                expect(@url).to be_nil
 
                 subject.parse @inst, "#{expected} HTTP/1.1"
 
-                @url.should == expected
+                expect(@url).to eq(expected)
             end
         end
 
@@ -51,11 +51,11 @@ describe HttpParser::Parser, "#initialize" do
             it "should pass the recognized header-name" do
                 subject.parse @inst, "GET /foo HTTP/1.1\r\n"
 
-                @header_field.should be_nil
+                expect(@header_field).to be_nil
 
                 subject.parse @inst, "#{expected}: example.com\r\n"
 
-                @header_field.should == expected
+                expect(@header_field).to eq(expected)
             end
         end
 
@@ -71,11 +71,11 @@ describe HttpParser::Parser, "#initialize" do
             it "should pass the recognized header-value" do
                 subject.parse @inst, "GET /foo HTTP/1.1\r\n"
 
-                @header_value.should be_nil
+                expect(@header_value).to be_nil
 
                 subject.parse @inst, "Host: #{expected}\r\n"
 
-                @header_value.should == expected
+                expect(@header_value).to eq(expected)
             end
         end
 
@@ -89,11 +89,11 @@ describe HttpParser::Parser, "#initialize" do
             it "should trigger on the last header" do
                 subject.parse @inst, "GET / HTTP/1.1\r\nHost: example.com\r\n"
 
-                @header_complete.should be_nil
+                expect(@header_complete).to be_nil
 
                 subject.parse @inst, "\r\n"
 
-                @header_complete.should be_true
+                expect(@header_complete).to eq(true)
             end
 
             context "when #stop! is called" do
@@ -108,7 +108,7 @@ describe HttpParser::Parser, "#initialize" do
                 it "should indicate there is no request body to parse" do
                     subject.parse @inst, "GET / HTTP/1.1\r\nHost: example.com\r\n\r\nBody"
 
-                    @body.should be_nil
+                    expect(@body).to be_nil
                 end
             end
         end
@@ -125,11 +125,11 @@ describe HttpParser::Parser, "#initialize" do
             it "should trigger on the body" do
                 subject.parse @inst, "POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
 
-                @body.should be_nil
+                expect(@body).to be_nil
 
                 subject.parse @inst, "#{"%x" % expected.length}\r\n#{expected}"
 
-                @body.should == expected
+                expect(@body).to eq(expected)
             end
         end
 
@@ -143,11 +143,11 @@ describe HttpParser::Parser, "#initialize" do
             it "should trigger at the end of the message" do
                 subject.parse @inst, "GET / HTTP/1.1\r\n"
 
-                @message_complete.should be_nil
+                expect(@message_complete).to be_nil
 
                 subject.parse @inst, "Host: example.com\r\n\r\n"
 
-                @message_complete.should be_true
+                expect(@message_complete).to eq(true)
             end
         end
     end
@@ -159,7 +159,7 @@ describe HttpParser::Parser, "#initialize" do
         it "should set the http_method field" do
             subject.parse @inst, "#{expected} / HTTP/1.1\r\n"
 
-            @inst.http_method.should == expected
+            expect(@inst.http_method).to eq(expected)
         end
     end
 
@@ -174,7 +174,7 @@ describe HttpParser::Parser, "#initialize" do
             it "should set the http_major field" do
                 subject.parse @inst, "GET / HTTP/#{expected}."
 
-                @inst.http_major.should == expected
+                expect(@inst.http_major).to eq(expected)
             end
         end
 
@@ -186,7 +186,7 @@ describe HttpParser::Parser, "#initialize" do
             it "should set the http_major field" do
                 subject.parse @inst, "HTTP/#{expected}."
 
-                @inst.http_major.should == expected
+                expect(@inst.http_major).to eq(expected)
             end
         end
     end
@@ -198,7 +198,7 @@ describe HttpParser::Parser, "#initialize" do
             it "should set the http_minor field" do
                 subject.parse @inst, "GET / HTTP/1.#{expected}\r\n"
 
-                @inst.http_minor.should == expected
+                expect(@inst.http_minor).to eq(expected)
             end
         end
 
@@ -210,7 +210,7 @@ describe HttpParser::Parser, "#initialize" do
             it "should set the http_major field" do
                 subject.parse @inst, "HTTP/1.#{expected} "
 
-                @inst.http_minor.should == expected
+                expect(@inst.http_minor).to eq(expected)
             end
         end
     end
@@ -223,7 +223,7 @@ describe HttpParser::Parser, "#initialize" do
         end
 
         it "should combine #http_major and #http_minor" do
-            @inst.http_version.should == expected
+            expect(@inst.http_version).to eq(expected)
         end
     end
 
@@ -234,7 +234,7 @@ describe HttpParser::Parser, "#initialize" do
             end
 
             it "should not be set" do
-                @inst.http_status.should be_zero
+                expect(@inst.http_status).to be_zero
             end
         end
 
@@ -248,7 +248,7 @@ describe HttpParser::Parser, "#initialize" do
             end
 
             it "should set the http_status field" do
-                @inst.http_status.should == expected
+                expect(@inst.http_status).to eq(expected)
             end
         end
     end
@@ -267,7 +267,7 @@ describe HttpParser::Parser, "#initialize" do
         end
 
         it "should return true if the Upgrade header was set" do
-            @inst.upgrade?.should be_true
+            expect(@inst.upgrade?).to eq(true)
         end
     end
 
@@ -281,7 +281,7 @@ describe HttpParser::Parser, "#initialize" do
 
         it "should trigger on a new request" do
             subject.parse @inst, "GET /demo HTTP/1.1\r\n\r\nGET /demo HTTP/1.1\r\n\r\n"
-            @begun.should == 2
+            expect(@begun).to eq(2)
         end
     end
 
@@ -302,11 +302,11 @@ describe HttpParser::Parser, "#initialize" do
 
             parser.parse @inst, "GET "
 
-            callbacks.url.should be_nil
+            expect(callbacks.url).to be_nil
 
             parser.parse @inst, "#{expected} HTTP/1.1"
 
-            callbacks.url.should == expected
+            expect(callbacks.url).to eq(expected)
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler