http-parser 1.0.3 → 1.2.2

data/lib/http-parser/types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module HttpParser
     HTTP_MAX_HEADER_SIZE = (80 * 1024)
@@ -14,9 +15,10 @@ module HttpParser
         :CHUNKED => 1 << 2,
         :CONNECTION_KEEP_ALIVE => 1 << 3,
         :CONNECTION_CLOSE => 1 << 4,
-        :TRAILING => 1 << 5,
-        :UPGRADE => 1 << 6,
-        :SKIPBODY => 1 << 7
+        :CONNECTION_UPGRADE => 1 << 5,
+        :TRAILING => 1 << 6,
+        :UPGRADE => 1 << 7,
+        :SKIPBODY => 1 << 8
     }
 
     #
@@ -41,6 +43,10 @@ module HttpParser
         :PROPPATCH,
         :SEARCH,
         :UNLOCK,
+        :BIND,
+        :REBIND,
+        :UNBIND,
+        :ACL,
         # subversion
         :REPORT,
         :MKACTIVITY,
@@ -53,7 +59,12 @@ module HttpParser
         :UNSUBSCRIBE,
         # RFC-5789
         :PATCH,
-        :PURGE
+        :PURGE,
+        # CalDAV
+        :MKCALENDAR,
+        # RFC-2068, section 19.6.1.2
+        :LINK,
+        :UNLINK
     ]
 
 
@@ -79,7 +90,7 @@ module HttpParser
                 :index,          :uchar,
 
                 :nread,          :uint32,
-                :content_length, :int64,
+                :content_length, :uint64,
 
                 # READ-ONLY
                 :http_major,     :ushort,
@@ -260,6 +271,16 @@ module HttpParser
             ::HttpParser.http_should_keep_alive(self) > 0
         end
 
+        #
+        # Determines if a chunked response has completed
+        #
+        # @return [Boolean]
+        #   Specifies whether the chunked response has completed
+        #
+        def final_chunk?
+            ::HttpParser.http_body_is_final(self) > 0
+        end
+
         #
         # Halts the parser if called in a callback
         #
@@ -294,18 +315,21 @@ 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,
                 :on_body,             :http_data_cb,
-                :on_message_complete, :http_cb
+                :on_message_complete, :http_cb,
+                :on_chunk_header,     :http_cb,
+                :on_chunk_complete,   :http_cb
     end
 
 
-    attach_function :http_parser_init, [Instance.by_ref, :http_parser_type], :void, :blocking => true
-    attach_function :http_parser_execute, [Instance.by_ref, Settings.by_ref, :pointer, :size_t], :size_t, :blocking => true
+    attach_function :http_parser_init, [Instance.by_ref, :http_parser_type], :void
+    attach_function :http_parser_execute, [Instance.by_ref, Settings.by_ref, :pointer, :size_t], :size_t
+    attach_function :http_should_keep_alive, [Instance.by_ref], :int
 
-    attach_function :http_should_keep_alive, [Instance.by_ref], :int, :blocking => true
-    attach_function :http_method_str, [:http_method], :string, :blocking => true
+    # Checks if this is the final chunk of the body
+    attach_function :http_body_is_final, [Instance.by_ref], :int
 end

data/lib/http-parser/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HttpParser
-    VERSION = "1.0.3"
+    VERSION = "1.2.2"
 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