http_tools 0.4.3 → 0.4.4

data/README.rdoc

@@ -13,8 +13,8 @@ should run across all Ruby implementations compatible with 1.8 or later, and
 install in environments without a compiler available.
 
 Tests are currently run on travis-ci[http://travis-ci.org/matsadler/http_tools]
-against Ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3, JRuby, Rubinius, Rubinius 2, and Ruby
-Enterprise Edition. Additionally tests are run against MacRuby 0.10
+against Ruby 1.8.7, 1.9.2, 1.9.3, JRuby, Rubinius, and Ruby
+Enterprise Edition. Additionally tests are run against 1.8.6 and MacRuby
 
 Performance tuning is mainly aimed at Ruby 1.9, with Ruby 1.8 and JRuby taken in
 to consideration. JRuby is generally fastest.

data/bench/parser/large_response_bench.rb

@@ -1,7 +1,8 @@
-base = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-require base + '/http_tools'
+require File.expand_path('../../../lib/http_tools', __FILE__)
 require 'benchmark'
 
+repeats = 200
+
 Benchmark.bm(26) do |x|
   body = "x" * 1024 * 1024
   chunks = []
@@ -9,7 +10,7 @@ Benchmark.bm(26) do |x|
   
   header = "HTTP/1.1 200 OK\r\nDate: Mon, 06 Jun 2011 14:55:51 GMT\r\nServer: Apache/2.2.17 (Unix) mod_ssl/2.2.17 OpenSSL/0.9.8l DAV/2 mod_fastcgi/2.4.2\r\nLast-Modified: Mon, 06 Jun 2011 14:55:49 GMT\r\nETag: \"3f18045-400-4a50c4c87c740\"\r\nAccept-Ranges: bytes\r\nContent-Length: #{body.length}\r\nContent-Type: text/plain\r\n\r\n"
   x.report("content_length") do
-    200.times do
+    repeats.times do
       parser = HTTPTools::Parser.new
       parser << header
       chunks.each {|chunk| parser << chunk}
@@ -18,7 +19,7 @@ Benchmark.bm(26) do |x|
   
   header = "HTTP/1.1 200 OK\r\nDate: Mon, 06 Jun 2011 14:55:51 GMT\r\nServer: Apache/2.2.17 (Unix) mod_ssl/2.2.17 OpenSSL/0.9.8l DAV/2 mod_fastcgi/2.4.2\r\nLast-Modified: Mon, 06 Jun 2011 14:55:49 GMT\r\nETag: \"3f18045-400-4a50c4c87c740\"\r\nAccept-Ranges: bytes\r\nConnection: close\r\nContent-Type: text/plain\r\n\r\n"
   x.report("close") do
-    200.times do
+    repeats.times do
       parser = HTTPTools::Parser.new
       parser << header
       chunks.each {|chunk| parser << chunk}
@@ -30,7 +31,7 @@ Benchmark.bm(26) do |x|
   chunks << nil
   chunks.map!(&HTTPTools::Encoding.method(:transfer_encoding_chunked_encode))
   x.report("chunked") do
-    200.times do
+    repeats.times do
       parser = HTTPTools::Parser.new
       parser << header
       chunks.each {|chunk| parser << chunk}

data/bench/parser/request_bench.rb

@@ -1,19 +1,19 @@
-base = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-require base + '/http_tools'
+require File.expand_path('../../../lib/http_tools', __FILE__)
 require 'benchmark'
 
 request = "GET / HTTP/1.1\r\nHost: example.com\r\nUser-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-gb) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16\r\nAccept: application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5\r\nAccept-Language: en-gb\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive\r\n\r\n"
+repeats = 10_000
 
 Benchmark.bm(41) do |x|
   x.report("HTTPTools::Parser") do
-    10_000.times do
+    repeats.times do
        HTTPTools::Parser.new << request
     end
   end
   
   x.report("HTTPTools::Parser (reset)") do
     parser = HTTPTools::Parser.new
-    10_000.times do
+    repeats.times do
        parser << request
        parser.reset
     end
@@ -23,7 +23,7 @@ Benchmark.bm(41) do |x|
     parser = HTTPTools::Parser.new
     parser.on(:header) {}
     parser.on(:finish) {}
-    10_000.times do
+    repeats.times do
        parser << request
        parser.reset
     end
@@ -31,35 +31,10 @@ Benchmark.bm(41) do |x|
   
   x.report("HTTPTools::Parser (reset, with env)") do
     parser = HTTPTools::Parser.new
-    10_000.times do
+    repeats.times do
        parser << request
        parser.env
        parser.reset
     end
   end
-  
-  begin
-    require 'rubygems'
-    require 'http/parser'
-    x.report("Http::Parser") do
-      10_000.times do
-        parser = Http::Parser.new
-        parser.on_headers_complete = Proc.new {}
-        parser.on_message_complete = Proc.new {}
-        parser << request
-      end
-    end
-  rescue LoadError
-  end
-  
-  begin
-    require 'rubygems'
-    require 'http11'
-    x.report("Mongrel::HttpParser") do
-      10_000.times do
-        Mongrel::HttpParser.new.execute({}, request.dup, 0)
-      end
-    end
-  rescue LoadError
-  end
-end
+end

data/bench/parser/response_bench.rb

@@ -1,19 +1,19 @@
-base = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-require base + '/http_tools'
+require File.expand_path('../../../lib/http_tools', __FILE__)
 require 'benchmark'
 
 response = "HTTP/1.1 200 OK\r\nServer: Apache/2.2.3 (CentOS)\r\nLast-Modified: Thu, 03 Jun 2010 17:40:12 GMT\r\nETag: \"4d2c-23e-48823b2cf3700\"\r\nAccept-Ranges: bytes\r\nContent-Type: text/html; charset=UTF-8\r\nConnection: Keep-Alive\r\nDate: Wed, 21 Jul 2010 16:26:04 GMT\r\nAge: 7985   \r\nContent-Length: 574\r\n\r\n<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\r\n<HTML>\r\n<HEAD>\r\n  <META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\r\n  <TITLE>Example Web Page</TITLE>\r\n</HEAD> \r\n<body>  \r\n<p>You have reached this web page by typing &quot;example.com&quot;,\r\n&quot;example.net&quot;,\r\n  or &quot;example.org&quot; into your web browser.</p>\r\n<p>These domain names are reserved for use in documentation and are not available \r\n  for registration. See <a href=\"http://www.rfc-editor.org/rfc/rfc2606.txt\">RFC \r\n  2606</a>, Section 3.</p>\r\n</BODY>\r\n</HTML>\r\n\r\n"
+repeats = 10_000
 
 Benchmark.bm(25) do |x|
   x.report("HTTPTools::Parser") do
-    10_000.times do
+    repeats.times do
        HTTPTools::Parser.new << response
     end
   end
   
   x.report("HTTPTools::Parser (reset)") do
     parser = HTTPTools::Parser.new
-    10_000.times do
+    repeats.times do
        parser << response
        parser.reset
     end
@@ -23,7 +23,7 @@ Benchmark.bm(25) do |x|
     require 'rubygems'
     require 'http/parser'
     x.report("Http::Parser") do
-      10_000.times do
+      repeats.times do
         parser = Http::Parser.new
         parser << response
       end

data/bench/transfer_encoding_chunked_bench.rb

@@ -1,25 +1,26 @@
-base = File.expand_path(File.dirname(__FILE__) + '/../lib')
-require base + '/http_tools'
+require File.expand_path('../../lib/http_tools', __FILE__)
 require 'benchmark'
 
+repeats = 1_000
+
 Benchmark.bm(36) do |x|
   encoded = "1\r\na\r\n" * 100 + "0\r\n"
   x.report("lots of very short chunks") do
-    1_000.times do
+    repeats.times do
        HTTPTools::Encoding.transfer_encoding_chunked_decode(encoded)
     end
   end
   
   encoded = "16\r\n<h1>Hello world</h1>\r\n\r\n12\r\n<p>Lorem ipsum</p>\r\n" * 50 + "0\r\n"
   x.report("slightly less slightly longer chunks") do
-    1_000.times do
+    repeats.times do
        HTTPTools::Encoding.transfer_encoding_chunked_decode(encoded)
     end
   end
   
   encoded = "2710\r\n#{"a" * 10000}\r\n" * 2 + "0\r\n"
   x.report("a couple of big chunks") do
-    1_000.times do
+    repeats.times do
        HTTPTools::Encoding.transfer_encoding_chunked_decode(encoded)
     end
   end

data/example/http_server.rb

@@ -3,19 +3,20 @@ require 'rubygems'
 require 'http_tools'
 
 module HTTP
+  
+  # Basic Rack HTTP server.
+  # 
+  # Usage:
+  # 
+  #   app = lambda {|env| [200, {"Content-Length" => "3"}, ["Hi\n"]]}
+  #   HTTP::Server.run(app)
+  # 
   class Server
-    CONNECTION = "Connection".freeze
-    KEEP_ALIVE = "Keep-Alive".freeze
-    CLOSE = "close".freeze
-    ONE_ONE = "1.1".freeze
     
     def initialize(app, options={})
-      host = options[:host] || options[:Host] || "0.0.0.0"
-      port = (options[:port] || options[:Port] || 9292).to_s
+      @host = options[:host] || options[:Host] || "0.0.0.0"
+      @port = (options[:port] || options[:Port] || 9292).to_s
       @app = app
-      @instance_env = {"rack.multithread" => true}
-      @server = TCPServer.new(host, port)
-      @server.listen(1024)
     end
     
     def self.run(app, options={})
@@ -23,25 +24,23 @@ module HTTP
     end
     
     def listen
-      while socket = @server.accept
-        Thread.new do
-          begin
-            on_connection(socket)
-          rescue StandardError, LoadError, SyntaxError => e
-            STDERR.puts("#{e.class}: #{e.message} #{e.backtrace.join("\n")}")
-          end
-        end
+      server = TCPServer.new(@host, @port)
+      while socket = server.accept
+        Thread.new {on_connection(socket)}
       end
     end
     
     private
+    
     def on_connection(socket)
       parser = HTTPTools::Parser.new
       
       parser.on(:finish) do
-        status, header, body = @app.call(parser.env.merge!(@instance_env))
-        keep_alive = keep_alive?(parser.version, parser.header[CONNECTION])
-        header[CONNECTION] = keep_alive ? KEEP_ALIVE : CLOSE
+        env = parser.env.merge!("rack.multithread" => true)
+        status, header, body = @app.call(env)
+        
+        keep_alive = parser.header["Connection"] != "close"
+        header["Connection"] = keep_alive ? "Keep-Alive" : "close"
         socket << HTTPTools::Builder.response(status, header)
         body.each {|chunk| socket << chunk}
         body.close if body.respond_to?(:close)
@@ -56,12 +55,12 @@ module HTTP
       rescue EOFError
         break
       end until parser.finished?
+      
+    rescue StandardError, LoadError, SyntaxError => e
+      STDERR.puts("#{e.class}: #{e.message} #{e.backtrace.join("\n")}")
+    ensure
       socket.close
     end
     
-    def keep_alive?(http_version, connection)
-      http_version == ONE_ONE && connection != CLOSE || connection == KEEP_ALIVE
-    end
-    
   end
 end

data/lib/http_tools.rb

@@ -108,11 +108,13 @@ module HTTPTools
   STATUS_DESCRIPTIONS.values.each {|val| val.freeze}
   
   # :stopdoc: hide from rdoc as it makes a mess
-  STATUS_LINES = Hash.new do |hash, key|
-    code = if key.kind_of?(Integer) then key else STATUS_CODES[key] end
-    description = STATUS_DESCRIPTIONS[code]
-    hash[key] = "#{code} #{description}"
+  STATUS_LINES = {}
+  STATUS_CODES.each do |name, code|
+    line = "#{code} #{STATUS_DESCRIPTIONS[code]}"
+    STATUS_LINES[name] = line
+    STATUS_LINES[code] = line
   end
+  STATUS_LINES.freeze
   # :startdoc:
   
   METHODS = %W{GET POST HEAD PUT DELETE OPTIONS TRACE CONNECT}.freeze

data/lib/http_tools/parser.rb

@@ -297,7 +297,7 @@ module HTTPTools
     alias on add_listener
     
     def inspect # :nodoc:
-      super.sub(/ .*>$/, " #{posstr} #{state}>")
+      super.sub(/ .*>$/, " #{posstr(false)} #{state}>")
     end
     
     private
@@ -313,6 +313,7 @@ module HTTPTools
       elsif @allow_html_without_header && @buffer.check(/\s*</i)
         skip_header
       else
+        @buffer.skip(/H(T(TP?)?)?/i) || @buffer.skip(/[a-z]+/i)
         raise ParseError.new("Protocol or method not recognised at " + posstr)
       end
     end
@@ -325,9 +326,10 @@ module HTTPTools
         @query_string = @path_info.slice!(/\?[a-z0-9;\/?:@&=+$,%_.!~*')(-]*/i)
         @query_string ? @query_string[0] = EMPTY : @query_string = ""
         request_http_version
-      elsif @buffer.check(/[a-z0-9;\/?:@&=+$,%_.!~*')(#-]+\Z/i)
+      elsif @buffer.check(/[a-z0-9;\/?:@&=+$,%_.!~*')(-]+\Z/i)
         :uri
       else
+        @buffer.skip(/[a-z0-9;\/?:@&=+$,%_.!~*')(-]+/i)
         raise ParseError.new("URI or path not recognised at " + posstr)
       end
     end
@@ -343,6 +345,7 @@ module HTTPTools
         @buffer.check(/ (H(T(T(P(\/(\d+(\.(\d+\r?)?)?)?)?)?)?)?)?\Z/i)
         :request_http_version
       else
+        @buffer.skip(/ (H(T(T(P(\/(\d+(\.(\d+\r?)?)?)?)?)?)?)?)?/i)
         raise ParseError.new("Invalid version specifier at " + posstr)
       end
     end
@@ -356,6 +359,7 @@ module HTTPTools
         @buffer.check(/H(T(T(P(\/(\d+(\.(\d+\r?)?)?)?)?)?)?)?\Z/i)
         :response_http_version
       else
+        @buffer.skip(/H(T(T(P(\/(\d+(\.(\d+\r?)?)?)?)?)?)?)?/i)
         raise ParseError.new("Invalid version specifier at " + posstr)
       end
     end
@@ -379,6 +383,7 @@ module HTTPTools
         @buffer.check(/\d(\d(\d( ([^\x00-\x1f\x7f]+\r?)?)?)?)?\Z/i)
         :status
       else
+        @buffer.skip(/\d(\d(\d( ([^\x00-\x1f\x7f]+\r?)?)?)?)?/i)
         raise ParseError.new("Invalid status line at " + posstr)
       end
     end
@@ -397,6 +402,9 @@ module HTTPTools
       elsif @last_key = @buffer.scan(/[ -9;-~]+:(?=[^ ])/i)
         @last_key.chomp!(COLON)
         value
+      elsif @request_method
+        @buffer.skip(/[ -9;-~]+/i)
+        raise ParseError.new("Illegal character in field name at " + posstr)
       else
         skip_bad_header
       end
@@ -408,6 +416,7 @@ module HTTPTools
       elsif @buffer.check(/[^\x00\n\x7f]+\Z/)
         :skip_bad_header
       else
+        @buffer.skip(/[ -9;-~]+/i)
         raise ParseError.new("Illegal character in field name at " + posstr)
       end
     end
@@ -430,20 +439,24 @@ module HTTPTools
       elsif @buffer.eos? || @buffer.check(/[^\x00\n\x7f]+\Z/i)
         :value
       else
+        @buffer.skip(/[^\x00\n\x7f]+/i)
         raise ParseError.new("Illegal character in field body at " + posstr)
       end
     end
     
     def value_extention
-      if @buffer.check(/[^ \t]/)
+      if @buffer.check(/[^ \t]/i)
         key_or_newline
-      elsif value_extra = @buffer.scan(/[ \t]+[^\x00\n\x7f]*\n/)
-        value_extra.sub!(/^[ \t]+/, SPACE)
+      elsif value_extra = @buffer.scan(/[ \t]+[^\x00\n\x7f]*\n/i)
+        value_extra.sub!(/^[ \t]+/i, SPACE)
         value_extra.chop!
         (@header[@last_key] << value_extra).strip!
         value_extention
-      else
+      elsif @buffer.eos? || @buffer.check(/[ \t]+[^\x00\n\x7f]*\Z/i)
         :value_extention
+      else
+        @buffer.skip(/[ \t]+[^\x00\n\x7f]*/i)
+        raise ParseError.new("Illegal character in field body at " + posstr)
       end
     end
     
@@ -544,6 +557,7 @@ module HTTPTools
         @last_key.chomp!(COLON)
         trailer_value
       else
+        @buffer.skip(/[ -9;-~]+/i)
         raise ParseError.new("Illegal character in field name at " + posstr)
       end
     end
@@ -561,20 +575,24 @@ module HTTPTools
       elsif @buffer.eos? || @buffer.check(/[^\x00\n\x7f]+\Z/i)
         :trailer_value
       else
+        @buffer.skip(/[^\x00\n\x7f]+/i)
         raise ParseError.new("Illegal character in field body at " + posstr)
       end
     end
     
     def trailer_value_extention
-      if @buffer.check(/[^ \t]/)
+      if @buffer.check(/[^ \t]/i)
         trailer_key_or_newline
-      elsif value_extra = @buffer.scan(/[ \t]+[^\x00\n\x7f]*\n/)
-        value_extra.sub!(/^[ \t]+/, SPACE)
+      elsif value_extra = @buffer.scan(/[ \t]+[^\x00\n\x7f]*\n/i)
+        value_extra.sub!(/^[ \t]+/i, SPACE)
         value_extra.chop!
         (@trailer[@last_key] << value_extra).strip!
         trailer_value_extention
-      else
+      elsif @buffer.eos? || @buffer.check(/[ \t]+[^\x00\n\x7f]*\Z/i)
         :trailer_value_extention
+      else
+        @buffer.skip(/[ \t]+[^\x00\n\x7f]*/i)
+        raise ParseError.new("Illegal character in field body at " + posstr)
       end
     end
     
@@ -603,19 +621,28 @@ module HTTPTools
     end
     
     def line_char(string, position)
-      line_count = 1
+      line_count = 0
       char_count = 0
       string.each_line do |line|
-        break if line.length + char_count > position
+        break if line.length + char_count >= position
         line_count += 1
         char_count += line.length
       end
-      [line_count, position + 1 - char_count]
-    end
-    
-    def posstr
-      line, char = line_char(@buffer.string, @buffer.pos)
-      "line #{line}, char #{char}"
+      [line_count, position - char_count]
+    end
+    
+    def posstr(visual=true)
+      line_num, char_num = line_char(@buffer.string, @buffer.pos)
+      out = "line #{line_num + 1}, char #{char_num + 1}"
+      return out unless visual && @buffer.string.respond_to?(:lines)
+      line = ""
+      pointer = nil
+      @buffer.string.lines.to_a[line_num].chars.each_with_index.map do |char, i|
+        line << char.dump.gsub(/(^"|"$)/, "")
+        pointer = "#{" " * (line.length - 1)}^" if i == char_num
+      end
+      pointer ||= " " * line.length + "^"
+      [out, "", line, pointer].join("\n")
     end
     
   end

data/profile/parser/request_profile.rb

@@ -1,20 +1,12 @@
 base = File.expand_path(File.dirname(__FILE__) + '/../../lib')
 require base + '/http_tools'
 require 'rubygems'
+require 'ruby-prof'
 
 request = "GET / HTTP/1.1\r\nHost: example.com\r\nUser-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-gb) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16\r\nAccept: application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5\r\nAccept-Language: en-gb\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive\r\n\r\n"
 parser = HTTPTools::Parser.new
 
-# require 'ruby-prof'
-# result = RubyProf.profile do
-#   parser << request
-# end
-# RubyProf::FlatPrinter.new(result).print(STDOUT, 0)
-
-require 'perftools'
-PerfTools::CpuProfiler.start("/tmp/http_tools_parser_request_profile") do
-  100_000.times do
-    parser << request
-    parser.reset
-  end
-end
+result = RubyProf.profile do
+  parser << request
+end
+RubyProf::FlatPrinter.new(result).print(STDOUT, 0)

data/test/cover.rb

@@ -1,28 +1,21 @@
 require 'coverage' # >= ruby 1.9 only
 
+testing = Dir[File.expand_path("../../lib/**/*.rb", __FILE__)]
+
 at_exit do
-  testing = Dir[File.expand_path("../../lib/**/*.rb", __FILE__)]
-  
   results = Coverage.result.select {|key, value| testing.include?(key)}
   
-  puts
-  total = results.map(&:last).flatten.compact
-  puts "#{total.select {|i| i > 0}.length}/#{total.length} executable lines covered"
-  puts
+  all = results.map(&:last).flatten.compact
+  print "\n#{all.reject(&:zero?).size}/#{all.size} executable lines covered\n\n"
   
   results.each do |key, value|
     next unless value.include?(0)
-    puts key
-    puts " line calls code"
-    puts
-    File.readlines(key).zip(value).each_with_index do |(line, val), i|
-      print val == 0 ? "> " : "  "
-      print "%3i %5s %s" % [(i + 1), val, line]
+    lines = File.readlines(key).zip(value).each_with_index.map do |(line,val),i|
+      "%-2s%3i %5s %s" % [(">" if val == 0), (i + 1), val, line]
     end
-    puts
-    puts
+    print "#{key}\n line calls code\n\n#{lines.join}\n\n"
   end
 end
 
 Coverage.start
-Dir[File.expand_path("../**/*_test.rb", __FILE__)].each {|test| require test}
+require_relative 'runner'

data/test/parser/request_test.rb

@@ -75,9 +75,17 @@ class ParserRequestTest < Test::Unit::TestCase
   def test_invalid_path
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) do
+    error = assert_raise(HTTPTools::ParseError) do
       parser << "GET \\ HTTP/1.1\r\n\r\n"
     end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+URI or path not recognised at line 1, char 5
+
+GET \\\\ HTTP/1.1\\r\\n
+     ^
+    MESSAGE
   end
   
   def test_uri
@@ -119,17 +127,49 @@ class ParserRequestTest < Test::Unit::TestCase
   def test_fragment_with_path
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) do
+    error = assert_raise(HTTPTools::ParseError) do
       parser << "GET /foo#bar HTTP/1.1\r\n\r\n"
     end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+URI or path not recognised at line 1, char 9
+
+GET /foo#bar HTTP/1.1\\r\\n
+        ^
+    MESSAGE
   end
   
   def test_fragment_with_uri
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) do
+    error = assert_raise(HTTPTools::ParseError) do
       parser << "GET http://example.com/foo#bar HTTP/1.1\r\n\r\n"
     end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+URI or path not recognised at line 1, char 27
+
+GET http://example.com/foo#bar HTTP/1.1\\r\\n
+                          ^
+    MESSAGE
+  end
+  
+  def test_fragment_with_unfinished_path
+    parser = HTTPTools::Parser.new
+    
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "GET /foo#ba"
+    end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+URI or path not recognised at line 1, char 9
+
+GET /foo#ba
+        ^
+    MESSAGE
   end
   
   def test_with_header
@@ -286,7 +326,15 @@ class ParserRequestTest < Test::Unit::TestCase
   def test_unknown_protocol
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) {parser << "GET / SPDY/1.1\r\n"}
+    error = assert_raise(HTTPTools::ParseError) {parser << "GET / SPDY/1.1\r\n"}
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Invalid version specifier at line 1, char 7
+
+GET / SPDY/1.1\\r\\n
+      ^
+    MESSAGE
   end
   
   def test_protocol_version
@@ -303,7 +351,15 @@ class ParserRequestTest < Test::Unit::TestCase
   def test_protocol_without_version
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) {parser << "GET / HTTP\r\n\r\n"}
+    error = assert_raise(HTTPTools::ParseError) {parser << "GET / HTTP\r\n\r\n"}
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Invalid version specifier at line 1, char 11
+
+GET / HTTP\\r\\n
+           ^
+    MESSAGE
   end
   
   def test_one_dot_x_protocol_version
@@ -432,7 +488,7 @@ class ParserRequestTest < Test::Unit::TestCase
   def test_not_a_http_request
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) {parser << "not a http request"}
+    assert_raise(HTTPTools::ParseError) {parser << "not a http/1.1 request"}
   end
   
   def test_data_past_end
@@ -458,6 +514,23 @@ class ParserRequestTest < Test::Unit::TestCase
     assert_equal("get", result)
   end
   
+  def test_invalid_method
+    parser = HTTPTools::Parser.new
+    
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "G3T / HTTP/1.1\r\n\r\n"
+    end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Protocol or method not recognised at line 1, char 2
+
+G3T / HTTP/1.1\\r\\n
+ ^
+    MESSAGE
+  end
+  
+  
   def test_lowercase_http
     parser = HTTPTools::Parser.new
     version = nil
@@ -472,31 +545,68 @@ class ParserRequestTest < Test::Unit::TestCase
   def test_invalid_version
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) {parser << "GET / HTTP/one dot one\r\n"}
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "GET / HTTP/one dot one\r\n"
+    end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Invalid version specifier at line 1, char 12
+
+GET / HTTP/one dot one\\r\\n
+           ^
+    MESSAGE
   end
   
   def test_invalid_header_key_with_control_character
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) do
+    error = assert_raise(HTTPTools::ParseError) do
       parser << "GET / HTTP/1.1\r\nx-invalid\0key: text/plain\r\n"
     end
+    
+    return unless "".respond_to?(:lines)
+    null = "\000".dump.gsub(/"/, "")
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field name at line 2, char 10
+
+x-invalid#{null}key: text/plain\\r\\n
+            ^
+    MESSAGE
   end
   
   def test_invalid_header_key_with_non_ascii_character
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) do
-      parser << "GET / HTTP/1.1\r\nx-invalid\000key: text/plain\r\n"
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "GET / HTTP/1.1\r\nx-invalid\342\200\224key: text/plain\r\n"
     end
+    
+    em_dash = "\342\200\224".dump.gsub(/"/, "")
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field name at line 2, char 10
+
+x-invalid#{em_dash}key: text/plain\\r\\n
+         #{" " * (em_dash.length / 4)}^
+    MESSAGE
   end
   
-  def test_invalid_header_value_with_non_ascii_character
+  def test_invalid_header_value_with_non_control_character
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) do
-      parser << "GET / HTTP/1.1\r\nAccept: \000text/plain\r\n"
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "GET / HTTP/1.1\r\nAccept: text\000plain\r\n"
     end
+    
+    return unless "".respond_to?(:lines)
+    null = "\000".dump.gsub(/"/, "")
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field body at line 2, char 13
+
+Accept: text#{null}plain\\r\\n
+               ^
+    MESSAGE
   end
   
   def test_error_callback
@@ -721,4 +831,12 @@ class ParserRequestTest < Test::Unit::TestCase
     assert_match(/#<HTTPTools::Parser:0x[a-f0-9]+ line 1, char 1 start>/, parser.inspect)
   end
   
-end
+  def test_inspect_position
+    parser = HTTPTools::Parser.new
+    
+    parser << "GET / HTTP/1.1\r\nHost: foo."
+    
+    assert_match(/#<HTTPTools::Parser:0x[a-f0-9]+ line 2, char 7 value>/, parser.inspect)
+  end
+  
+end

data/test/parser/response_test.rb

@@ -290,6 +290,26 @@ class ParserResponseTest < Test::Unit::TestCase
     assert_equal({"Content-Type" => "text/html; charset=utf-8"}, headers)
   end
   
+  def test_multi_line_header_invalid_value
+    parser = HTTPTools::Parser.new
+    
+    parser << "HTTP/1.1 200 OK\r\n"
+    parser << "Content-Type: text/html;\r\n"
+    
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << " charset=\0\r\n\r\n"
+    end
+    
+    return unless "".respond_to?(:lines)
+    null = "\000".dump.gsub(/"/, "")
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field body at line 3, char 10
+
+ charset=#{null}\\r\\n
+            ^
+    MESSAGE
+  end
+  
   def test_header_value_leading_and_trailing_whitespace_is_stripped
     parser = HTTPTools::Parser.new
     headers = nil
@@ -380,6 +400,23 @@ class ParserResponseTest < Test::Unit::TestCase
     assert(parser.finished?, "parser should be finished")
   end
   
+  def test_invalid_header_key_with_control_character
+    parser = HTTPTools::Parser.new
+    
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "HTTP/1.0 200 OK\r\nx-invalid\0key: valid key\r\n"
+    end
+    
+    return unless "".respond_to?(:lines)
+    null = "\000".dump.gsub(/"/, "")
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field name at line 2, char 10
+
+x-invalid#{null}key: valid key\\r\\n
+            ^
+    MESSAGE
+  end
+  
   def test_apple_dot_com
     parser = HTTPTools::Parser.new
     code, message, headers = nil
@@ -646,6 +683,29 @@ class ParserResponseTest < Test::Unit::TestCase
     assert(parser.finished?, "parser should be finished")
   end
   
+  def test_body_with_no_headers
+    parser = HTTPTools::Parser.new
+    code, message, headers = nil
+    body = ""
+    
+    parser.add_listener(:header) do
+      code = parser.status_code
+      message = parser.message
+      headers = parser.header
+    end
+    parser.add_listener(:stream) {|chunk| body << chunk}
+    
+    parser << "HTTP/1.1 200 OK\r\n\r\n"
+    parser << "<h1>hello world</h1>"
+    parser.finish # notify parser the connection has closed
+    
+    assert_equal(200, code)
+    assert_equal("OK", message)
+    assert_equal({}, headers)
+    assert_equal("<h1>hello world</h1>", body)
+    assert(parser.finished?, "parser should be finished")
+  end
+  
   def test_chunked
     parser = HTTPTools::Parser.new
     code, message, headers = nil
@@ -865,9 +925,17 @@ class ParserResponseTest < Test::Unit::TestCase
   def test_html_body_only_not_allowed
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) do
+    error = assert_raise(HTTPTools::ParseError) do
       parser << "<html><p>HTTP is hard</p></html>"
     end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Protocol or method not recognised at line 1, char 1
+
+<html><p>HTTP is hard</p></html>
+^
+    MESSAGE
   end
   
   def test_html_body_only_allowed
@@ -1155,6 +1223,29 @@ class ParserResponseTest < Test::Unit::TestCase
     assert_equal({"X-Test" => "one two"}, trailer)
   end
   
+  def test_multi_line_trailer_invalid_value
+    parser = HTTPTools::Parser.new
+    
+    parser << "HTTP/1.1 200 OK\r\n"
+    parser << "Transfer-Encoding: chunked\r\n"
+    parser << "Trailer: X-Test\r\n\r\n"
+    parser << "14\r\n<h1>Hello world</h1>\r\n0\r\n"
+    parser << "X-Test: one\r\n"
+    
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << " \0two\r\n"
+    end
+    
+    return unless "".respond_to?(:lines)
+    null = "\000".dump.gsub(/"/, "")
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field body at line 9, char 2
+
+ #{null}two\\r\\n
+    ^
+    MESSAGE
+  end
+  
   def test_trailer_value_leading_and_trailing_whitespace_is_stripped
     parser = HTTPTools::Parser.new
     trailer = nil
@@ -1237,9 +1328,18 @@ class ParserResponseTest < Test::Unit::TestCase
     parser << "Transfer-Encoding: chunked\r\nTrailer: X-Checksum\r\n\r\n"
     parser << "14\r\n<h1>Hello world</h1>\r\n0\r\n"
     
-    assert_raise(HTTPTools::ParseError) do
+    error = assert_raise(HTTPTools::ParseError) do
       parser << "x-invalid\0key: value\r\n\r\n"
     end
+    
+    return unless "".respond_to?(:lines)
+    null = "\000".dump.gsub(/"/, "")
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field name at line 8, char 10
+
+x-invalid#{null}key: value\\r\\n
+            ^
+    MESSAGE
   end
   
   def test_invalid_trailer_value
@@ -1252,21 +1352,65 @@ class ParserResponseTest < Test::Unit::TestCase
     parser << "Transfer-Encoding: chunked\r\nTrailer: X-Checksum\r\n\r\n"
     parser << "14\r\n<h1>Hello world</h1>\r\n0\r\n"
     
-    assert_raise(HTTPTools::ParseError) do
+    error = assert_raise(HTTPTools::ParseError) do
       parser << "x-test: inva\0lid\r\n\r\n"
     end
+    
+    return unless "".respond_to?(:lines)
+    null = "\000".dump.gsub(/"/, "")
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Illegal character in field body at line 8, char 13
+
+x-test: inva#{null}lid\\r\\n
+               ^
+    MESSAGE
   end
   
+  def test_invalid_protocol
+    parser = HTTPTools::Parser.new
+    
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "HTTZ/1.1 200 OX\r\n"
+    end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Protocol or method not recognised at line 1, char 4
+
+HTTZ/1.1 200 OX\\r\\n
+   ^
+    MESSAGE
+  end
+  
+  
   def test_invalid_version
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) {parser << "HTTP/one dot one 200 OK"}
+    error = assert_raise(HTTPTools::ParseError) do
+      parser << "HTTP/one dot one 200 OK"
+    end
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Invalid version specifier at line 1, char 6
+
+HTTP/one dot one 200 OK
+     ^
+    MESSAGE
   end
   
   def test_invalid_status
     parser = HTTPTools::Parser.new
     
-    assert_raise(HTTPTools::ParseError) {parser << "HTTP/1.1 0 Fail"}
+    error = assert_raise(HTTPTools::ParseError) {parser << "HTTP/1.1 0 Fail"}
+    
+    return unless "".respond_to?(:lines)
+    assert_equal(<<-MESSAGE.chomp, error.message)
+Invalid status line at line 1, char 11
+
+HTTP/1.1 0 Fail
+          ^
+    MESSAGE
   end
   
   def test_finish_early

metadata

@@ -1,24 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: http_tools
-version: !ruby/object:Gem::Version
-  version: 0.4.3
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 4
+  version: 0.4.4
 platform: ruby
-authors:
+authors: 
 - Matthew Sadler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000Z
+
+date: 2011-12-20 00:00:00 +00:00
+default_executable: 
 dependencies: []
-description: A fast-as-possible pure Ruby HTTP parser plus associated lower level
-  utilities to aid working with HTTP and the web.
+
+description: A fast-as-possible pure Ruby HTTP parser plus associated lower level utilities to aid working with HTTP and the web.
 email: mat@sourcetagsandcodes.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - lib/http_tools/builder.rb
 - lib/http_tools/encoding.rb
 - lib/http_tools/parser.rb
@@ -44,32 +53,42 @@ files:
 - example/websocket_client.rb
 - example/websocket_server.rb
 - README.rdoc
+has_rdoc: true
 homepage: http://github.com/matsadler/http_tools
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
 - --charset
 - utf-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Pure Ruby HTTP parser and friends
 test_files: []
+