http-parser 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4294a329a0339635dbcafcf057d23f832b80c8ec
-  data.tar.gz: 23d181a796fd7d9aaec50b32aa525fdb03ce2e86
+  metadata.gz: ef7dd40436524e48ef90904d871caed3ba2754d6
+  data.tar.gz: d1eebb668464073456f155757c4d34d06c3ebd1d
 SHA512:
-  metadata.gz: af8092393a33fa87bb0b0182f34ace79e593b6f1672cd4dee0c2a8fa8d8161b3984071c684054451f926c82ce5ee4de29052c899f560a5ea83c8aef1b7044027
-  data.tar.gz: dec2187b798145b8f2c670048a8c885d13d27d874c404ce9f9feb391a61336d9516c9e86ed85604887ab6e03f7f19b48b5be3a6f2752a013ad666883b19d6cde
+  metadata.gz: 477ec97207cb8c602db5279f4e1ef315cb896d3d79e2669c712d0c4a950c36b941a8d1aa5ba490813e6bd5a6befcbd5947f00dd1d1e28acaeb340d20c789f111
+  data.tar.gz: e5b18b9ddd5bc2befbd6b334834bc9cd16f5428c2d0413bb791a0ede0141ca9f6dbed49daddc42177dcf96b5e51610fcdc92bc5ea5753b66f15e2cccb5d31cbf

data/README.md

@@ -1,6 +1,6 @@
 # http-parser
 
-Ruby FFI bindings to [http-parser](https://github.com/joyent/http-parser)
+Ruby FFI bindings to [http-parser](https://github.com/joyent/http-parser) [![Build Status](https://travis-ci.org/cotag/http-parser.png)](https://travis-ci.org/cotag/http-parser)
 
 ## Install
 

data/Rakefile

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'rake'
+require 'rspec/core/rake_task'
+
+task :default => [:compile, :test]
+
+task :compile do
+    protect = ['http_parser.c', 'http_parser.h']
+    Dir["ext/http-parser/**/*"].each do |file|
+        begin
+            next if protect.include? File.basename(file)
+            FileUtils.rm file
+        rescue
+        end
+    end
+    system 'cd ext && rake'
+end
+
+RSpec::Core::RakeTask.new(:test)

data/ext/Rakefile

@@ -5,5 +5,4 @@ FFI::Compiler::CompileTask.new('http-parser-ext') do |t|
   t.cflags << "-D_GNU_SOURCE=1" if RbConfig::CONFIG["host_os"].downcase =~ /mingw/
   t.cflags << "-arch x86_64 -arch i386" if t.platform.mac?
   t.ldflags << "-arch x86_64 -arch i386" if t.platform.mac?
-  t.export '../lib/http-parser/ext.rb'
 end

data/ext/http-parser/http_parser.c

@@ -929,6 +929,7 @@ size_t http_parser_execute (http_parser *parser,
           } else if (parser->index == 2  && ch == 'P') {
             parser->method = HTTP_COPY;
           } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
             goto error;
           }
         } else if (parser->method == HTTP_MKCOL) {
@@ -941,12 +942,14 @@ size_t http_parser_execute (http_parser *parser,
           } else if (parser->index == 2 && ch == 'A') {
             parser->method = HTTP_MKACTIVITY;
           } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
             goto error;
           }
         } else if (parser->method == HTTP_SUBSCRIBE) {
           if (parser->index == 1 && ch == 'E') {
             parser->method = HTTP_SEARCH;
           } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
             goto error;
           }
         } else if (parser->index == 1 && parser->method == HTTP_POST) {
@@ -957,13 +960,27 @@ size_t http_parser_execute (http_parser *parser,
           } else if (ch == 'A') {
             parser->method = HTTP_PATCH;
           } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
             goto error;
           }
         } else if (parser->index == 2) {
           if (parser->method == HTTP_PUT) {
-            if (ch == 'R') parser->method = HTTP_PURGE;
+            if (ch == 'R') {
+              parser->method = HTTP_PURGE;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
           } else if (parser->method == HTTP_UNLOCK) {
-            if (ch == 'S') parser->method = HTTP_UNSUBSCRIBE;
+            if (ch == 'S') {
+              parser->method = HTTP_UNSUBSCRIBE;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
           }
         } else if (parser->index == 4 && parser->method == HTTP_PROPFIND && ch == 'P') {
           parser->method = HTTP_PROPPATCH;
@@ -2173,3 +2190,10 @@ int
 http_body_is_final(const struct http_parser *parser) {
     return parser->state == s_message_done;
 }
+
+unsigned long
+http_parser_version(void) {
+  return HTTP_PARSER_VERSION_MAJOR * 0x10000 |
+         HTTP_PARSER_VERSION_MINOR * 0x00100 |
+         HTTP_PARSER_VERSION_PATCH * 0x00001;
+}

data/ext/http-parser/http_parser.h

@@ -27,6 +27,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_PATCH 0
 
 #include <sys/types.h>
 #if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
@@ -68,7 +69,7 @@ typedef struct http_parser_settings http_parser_settings;
  * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
  * chunked' headers that indicate the presence of a body.
  *
- * http_data_cb does not return data chunks. It will be call arbitrarily
+ * http_data_cb does not return data chunks. It will be call arbitrarally
  * many times for each string. E.G. you might get 10 callbacks for "on_url"
  * each providing just a few characters more data.
  */
@@ -262,6 +263,18 @@ struct http_parser_url {
 };
 
 
+/* Returns the library version. Bits 16-23 contain the major version number,
+ * bits 8-15 the minor version number and bits 0-7 the patch level.
+ * Usage example:
+ *
+ *   unsigned long version = http_parser_version();
+ *   unsigned major = (version >> 16) & 255;
+ *   unsigned minor = (version >> 8) & 255;
+ *   unsigned patch = version & 255;
+ *   printf("http_parser v%u.%u.%u\n", major, minor, version);
+ */
+unsigned long http_parser_version(void);
+
 void http_parser_init(http_parser *parser, enum http_parser_type type);
 
 

data/http-parser.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.version     = HttpParser::VERSION
   s.authors     = ["Stephen von Takach"]
   s.email       = ["steve@cotag.me"]
+  s.license     = 'MIT'
   s.homepage    = "https://github.com/cotag/http-parser"
   s.summary     = "Ruby bindings to joyent/http-parser"
   s.description = <<-EOF

data/lib/http-parser/parser.rb

@@ -160,7 +160,7 @@ module HttpParser
         #
         def parse(inst, data)
             ::HttpParser.http_parser_execute(inst, @settings, data, data.length)
-            return !inst.error?
+            return inst.error?
         end
 
 

data/lib/http-parser/version.rb

@@ -1,3 +1,3 @@
 module HttpParser
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
 end

data/spec/error_spec.rb

@@ -5,24 +5,24 @@ describe HttpParser::Parser, "#initialize" do
         @inst = HttpParser::Parser.new_instance
     end
 
-    it "should return true when no error" do
-        subject.parse(@inst, "GET / HTTP/1.1\r\n").should be_true
-        @inst.error?.should be_false
+    it "should return true when error" do
+        subject.parse(@inst, "GETS / HTTP/1.1\r\n").should be_true
+        @inst.error?.should be_true
     end
 
-    it "should return false on error" do
-        subject.parse(@inst, "GETS / HTTP/1.1\r\n").should be_false
-        @inst.error?.should be_true
+    it "should return false on success" do
+        subject.parse(@inst, "GET / HTTP/1.1\r\n").should be_false
+        @inst.error?.should be_false
     end
 
     it "the error should be inspectable" do
-        subject.parse(@inst, "GETS / HTTP/1.1\r\n").should be_false
+        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
     end
 
     it "raises different error types depending on the error" do
-        subject.parse(@inst, "GET / HTTP/23\r\n").should be_false
+        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
     end
@@ -35,7 +35,7 @@ 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_false
+            subject.parse(@inst, "GET /foo?q=1 HTTP/1.1").should be_true
 
             @inst.error?.should be_true
             @inst.error.should be_kind_of(::HttpParser::Error::CALLBACK)

data/spec/parser_spec.rb

@@ -270,5 +270,19 @@ describe HttpParser::Parser, "#initialize" do
             @inst.upgrade?.should be_true
         end
     end
+
+    describe "pipelined requests" do
+        subject do
+            @begun = 0
+            described_class.new do |parser|
+                parser.on_message_begin { @begun += 1 }
+            end
+        end
+
+        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
+        end
+    end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -94,7 +94,8 @@ files:
 - spec/parser_spec.rb
 - ext/Rakefile
 homepage: https://github.com/cotag/http-parser
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []