yakischloba-http-parser 0.0.2 → 0.0.3

data/http-parser.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "http-parser"
-  s.version = "0.0.2"
-  s.date = "2009-08-07"
+  s.version = "0.0.3"
+  s.date = "2009-08-08"
   s.authors = ["Ryan Dahl", "Zed Shaw", "Jake Douglas"]
   s.email = "jakecdouglas@gmail.com"
   s.has_rdoc = true

data/lib/http-parser.rb

@@ -7,25 +7,27 @@ class HttpParser
   callback :http_data_cb, [:pointer, :pointer, :size_t], :int
   callback :http_cb, [:pointer], :int
 
-  # Request methods
-  HTTP_COPY       = 0x0001
-  HTTP_DELETE     = 0x0002
-  HTTP_GET        = 0x0004
-  HTTP_HEAD       = 0x0008
-  HTTP_LOCK       = 0x0010
-  HTTP_MKCOL      = 0x0020
-  HTTP_MOVE       = 0x0040
-  HTTP_OPTIONS    = 0x0080
-  HTTP_POST       = 0x0100
-  HTTP_PROPFIND   = 0x0200
-  HTTP_PROPPATCH  = 0x0400
-  HTTP_PUT        = 0x0800
-  HTTP_TRACE      = 0x1000
-  HTTP_UNLOCK     = 0x2000
-
-  # Transfer encodings
-  HTTP_IDENTITY   = 0x01
-  HTTP_CHUNKED    = 0x02
+  METHODS = {
+    0x0001  => :COPY,
+    0x0002  => :DELETE,
+    0x0004  => :GET,
+    0x0008  => :HEAD,
+    0x0010  => :LOCK,
+    0x0020  => :MKCOL,
+    0x0040  => :MOVE,
+    0x0080  => :OPTIONS,
+    0x0100  => :POST,
+    0x0200  => :PROPFIND,
+    0x0400  => :PROPPATCH,
+    0x0800  => :PUT,
+    0x1000  => :TRACE,
+    0x2000  => :UNLOCK
+  }
+
+  ENCODINGS = {
+    0x01 => :IDENTITY,
+    0x02 => :CHUNKED
+  }
 
   enum :http_parser_type, [:HTTP_REQUEST, :HTTP_RESPONSE]
 
@@ -100,6 +102,38 @@ class HttpParser
     @abort = true
   end
 
+  def method
+    METHODS[@parser[:method]]
+  end
+
+  def status_code
+    @parser[:status_code]
+  end
+
+  def transfer_encoding
+    ENCODINGS[@parser[:transfer_encoding]]
+  end
+
+  def version_major
+    @parser[:version_major]
+  end
+
+  def version_minor
+    @parser[:version_minor]
+  end
+
+  def version
+    [version_major, version_minor]
+  end
+
+  def content_length
+    @parser[:content_length]
+  end
+
+  def keep_alive?
+    @parser[:keep_alive].zero? ? false : true
+  end
+
   def on_message_begin(proc=nil, &blk)
     proc ||= blk
     @on_message_begin = Proc.new do |ptr|

data/test/request.rb

@@ -35,7 +35,15 @@ describe "http-parser request parsing" do
   @parser.on_header_field {|f| @current_field = f }
   @parser.on_header_value {|v| @headers[@current_field] = v }
   @parser.on_headers_complete { @headers_complete = true }
-  @parser.on_message_complete { @message_complete = true }
+  @parser.on_message_complete do
+    @message_complete = true
+    @content_length = @parser.content_length
+    @status_code = @parser.status_code
+    @method = @parser.method
+    @version = @parser.version
+    @keep_alive = @parser.keep_alive?
+    @encoding = @parser.transfer_encoding
+  end
   @parser.execute(REQUEST_BUFFER)
 
   it "calls back when beginning a message" do
@@ -62,6 +70,21 @@ describe "http-parser request parsing" do
     @headers_complete.should.equal true
   end
 
+  it "makes the method/version/keepalive/encoding available after headers are parsed" do
+    @method.should.equal :GET
+    @version.should.equal [1,1]
+    @keep_alive.should.equal true
+    @encoding.should.equal :IDENTITY
+  end
+
+  it "has a 0 status code since its a request" do
+    @status_code.should.equal 0
+  end
+
+  it "has a 0 content_length since we have no body" do
+    @content_length.should.equal 0
+  end
+
   it "calls back when parsing of the message is complete" do
     @message_complete.should.equal true
   end

data/test/response.rb

@@ -36,7 +36,15 @@ describe "http-parser response parsing" do
   @parser.on_message_begin { @message_begun = true }
   @parser.on_header_field {|f| @current_field = f }
   @parser.on_header_value {|v| @headers[@current_field] = v }
-  @parser.on_headers_complete { @headers_complete = true }
+  @parser.on_headers_complete do
+    @headers_complete = true
+    @method = @parser.method
+    @version = @parser.version
+    @status_code = @parser.status_code
+    @encoding = @parser.transfer_encoding
+    @content_length = @parser.content_length
+    @keep_alive = @parser.keep_alive?
+  end
   @parser.on_body {|b| @body = b }
   @parser.on_message_complete { @message_complete = true }
   @parser.execute(RESPONSE_BUFFER)
@@ -53,6 +61,18 @@ describe "http-parser response parsing" do
     @headers_complete.should.equal true
   end
 
+  it "makes the version/status code/encoding/content length/keepalive available after headers are parsed" do
+    @version.should.equal [1,1]
+    @status_code.should.equal 200
+    @encoding.should.equal :IDENTITY
+    @content_length.should.equal 17
+    @keep_alive.should.equal false
+  end
+
+  it "has a nil method since it's a response" do
+    @method.should.equal nil
+  end
+
   it "calls back with the body" do
     @body.should.equal RESPONSE_BODY
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yakischloba-http-parser
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ryan Dahl
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-07 00:00:00 -07:00
+date: 2009-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency