net-http-server 0.1.0 → 0.2.0

data/.gitignore

@@ -0,0 +1,3 @@
+doc/
+pkg/
+vendor/

data/ChangeLog.md

@@ -1,3 +1,13 @@
+### 0.2.0 / 2011-08-23
+
+* Added support for handling Streams and Chunked Transfer-Encoding:
+  * Added {Net::HTTP::Server::Stream}.
+  * Added {Net::HTTP::Server::ChunkedStream}.
+  * Added {Net::HTTP::Server::Responses#write_body_streamed}.
+* Use `Rack::RewindableInput` with {Net::HTTP::Server::Stream}.
+* Fixed a bug where Parslet Strings were being returned in the Headers.
+* Catch all IOErrors in {Net::HTTP::Server::Requests#read_request}.
+
 ### 0.1.0 / 2011-01-26
 
 * Initial release:

data/README.md

@@ -3,7 +3,7 @@
 * [Homepage](http://github.com/postmodern/net-http-server)
 * [Issues](http://github.com/postmodern/net-http-server/issues)
 * [Documentation](http://rubydoc.info/gems/net-http-server)
-* Postmodern (postmodern.mod3 at gmail.com)
+* [Email](mailto:postmodern.mod3 at gmail.com)
 
 ## Description
 
@@ -12,6 +12,8 @@
 ## Features
 
 * Pure Ruby.
+* Supports Streamed Request/Response Bodies.
+* Supports Chunked Transfer-Encoding.
 * Provides a [Rack](http://rack.rubyforge.org/) Handler.
 
 ## Examples
@@ -21,7 +23,7 @@ Simple HTTP Server:
     require 'net/http/server'
     require 'pp'
 
-    Net::HTTP::Server.run(:port => 8080) do |request,socket|
+    Net::HTTP::Server.run(:port => 8080) do |request,stream|
       pp request
 
       [200, {'Content-Type' => 'text/html'}, ['Hello World']]

data/Rakefile

@@ -2,17 +2,17 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.3.0'
+  gem 'ore-tasks', '~> 0.4'
   require 'ore/tasks'
 
   Ore::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install ore-tasks` to install 'ore/tasks'."
 end
 
 begin
-  gem 'rspec', '~> 2.4.0'
+  gem 'rspec', '~> 2.4'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new

data/benchmarks/parser.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+require 'net/http/server/parser'
+
+HTTP_REQUEST = [
+  'GET /search?q=test&hl=en&fp=1&cad=b&tch=1&ech=1&psi=DBQ4Te_qCI2Y_QaIuPSTCA12955207804903 HTTP/1.1',
+  'Host: www.google.com',
+  'Referer: http://www.google.com/',
+  'Accept: */*',
+  'User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US) AppleWebKit/534.10 (KHTML, like Gecko) Chrome/8.0.552.237 Safari/534.10',
+  'Accept-Encoding: gzip,deflate,sdch',
+  'Avail-Dictionary: GeNLY2f-',
+  'Accept-Language: en-US,en;q=0.8',
+  'Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3',
+  'Cookie: NID=43=bgvZmm1C00aC41wQA0Yl5lVPEJZerwnK9LYDFo4Ph9_qBZFfbwT-auI64LZzdquh8StFriEuQfhrIgf_GlVd9erjOGppXZISHpoFgdiUUfpTqUbKC8gbfNh09eZXmcK7; PREF=ID=c28d27fb5ff1280b:U=fedcd44ca2fdef4f:FF=0:LD=en:CR=2:TM=1295517030:LM=1295517030:S=D36Ccqf-FQ78ZWE7',
+  '',
+  ''
+].join("\r\n")
+
+require 'benchmark'
+
+Benchmark.bm do |bench|
+  parser = Net::HTTP::Server::Parser.new
+
+  (1..10).each do |i|
+    bench.report("parse ##{i}: ") { parser.parse(HTTP_REQUEST) }
+  end
+end

data/benchmarks/server.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+require 'net/http/server'
+
+puts ">>> Starting the HTTP Server on port 8080 ..."
+puts ">>> Prepare to run: ab -n 1000 http://localhost:8080/"
+
+Net::HTTP::Server.run(:port => 8080) do |request,socket|
+  [200, {'Content-Type' => 'text/html'}, ['Hello World']]
+end

data/gemspec.yml

@@ -11,6 +11,6 @@ dependencies:
   parslet: ~> 1.0
 
 development_dependencies:
-  ore-tasks: ~> 0.3.0
-  rspec: ~> 2.4.0
+  ore-tasks: ~> 0.4
+  rspec: ~> 2.4
   yard: ~> 0.6.0

data/lib/net/http/server/chunked_stream.rb

@@ -0,0 +1,116 @@
+require 'net/http/server/stream'
+
+require 'net/protocol'
+require 'stringio'
+
+module Net
+  class HTTP < Protocol
+    module Server
+      #
+      # Handles reading and writing to Chunked Transfer-Encoded streams.
+      #
+      # @since 0.2.0
+      #
+      class ChunkedStream < Stream
+
+        #
+        # Initializes the chuked stream.
+        #
+        # @param [#read, #write, #flush] socket
+        #   The socket to read from and write to.
+        #
+        def initialize(socket)
+          super(socket)
+
+          @buffer = ''
+        end
+
+        #
+        # Reads a chunk from the stream.
+        #
+        # @param [Integer] length
+        #
+        # @param [#<<] buffer
+        #   The optional buffer to append the data to.
+        #
+        # @return [String, nil]
+        #   A chunk from the stream.
+        #
+        # @raise [ArgumentError]
+        #   The buffer did not respond to `#<<`.
+        #
+        # @since 0.2.0
+        #
+        def read(length=4096,buffer='')
+          unless buffer.respond_to?(:<<)
+            raise(ArgumentError,"buffer must respond to #<<")
+          end
+
+          until @buffer.length >= length
+            length_line = @socket.readline("\r\n").chomp
+            chunk_length, chunk_extension = length_line.split(';',2)
+            chunk_length = chunk_length.to_i(16)
+
+            # read the chunk
+            @buffer << @socket.read(chunk_length)
+
+            # chomp the terminating CRLF
+            @socket.read(2)
+
+            # end-of-stream
+            break if chunk_length == 0
+          end
+
+          # clear the buffer before appending
+          buffer.clear
+
+          unless @buffer.empty?
+            # empty a slice of the buffer
+            buffer << @buffer.slice!(0,length)
+            return buffer
+          end
+        end
+
+        #
+        # Writes data to the chunked stream.
+        #
+        # @param [String] data
+        #   The data to write to the stream.
+        #
+        # @return [Integer]
+        #   The length of the data written.
+        #
+        # @since 0.2.0
+        #
+        def write(data)
+          length = data.length
+
+          # do not write empty chunks
+          unless length == 0
+            # write the chunk length
+            @socket.write("%X\r\n" % length)
+
+            # write the data
+            @socket.write(data)
+            @socket.write("\r\n")
+            @socket.flush
+          end
+
+          return length
+        end
+
+        #
+        # Closes the chunked stream.
+        #
+        # @since 0.2.0
+        #
+        def close
+          # last chunk
+          @socket.write("0\r\n\r\n")
+          @socket.flush
+        end
+
+      end
+    end
+  end
+end

data/lib/net/http/server/daemon.rb

@@ -1,6 +1,8 @@
 require 'net/http/server/parser'
 require 'net/http/server/requests'
 require 'net/http/server/responses'
+require 'net/http/server/stream'
+require 'net/http/server/chunked_stream'
 
 require 'net/protocol'
 require 'gserver'
@@ -36,7 +38,7 @@ module Net
         # @option options [Integer] :max_connections (MAX_CONNECTIONS)
         #   The maximum number of simultaneous connections.
         #
-        # @option options [IO] :log (STDERR)
+        # @option options [IO] :log ($stderr)
         #   The log to write errors to.
         #
         # @option options [#call] :handler
@@ -55,7 +57,7 @@ module Net
           host = options.fetch(:host,DEFAULT_HOST)
           port = options.fetch(:port,DEFAULT_PORT).to_i
           max_connections = options.fetch(:max_connections,MAX_CONNECTIONS)
-          log = options.fetch(:log,STDERR)
+          log = options.fetch(:log,$stderr)
 
           super(port,host,max_connections,log,false,true)
 
@@ -68,14 +70,14 @@ module Net
         # @param [#call, nil] object
         #   The HTTP Request Handler object.
         #
-        # @yield [request, socket]
+        # @yield [request, stream]
         #   If a block is given, it will be used to process HTTP Requests.
         #
         # @yieldparam [Hash{Symbol => String,Array,Hash}] request
         #   The HTTP Request.
         #
-        # @yieldparam [TCPSocket] socket
-        #   The TCP socket of the client.
+        # @yieldparam [Stream, ChunkedStream] stream
+        #   The stream of the HTTP Request body.
         #
         # @raise [ArgumentError]
         #   The HTTP Request Handler must respond to `#call`.
@@ -110,8 +112,14 @@ module Net
 
             normalize_request(request)
 
+            stream = if request[:headers]['Transfer-Encoding'] == 'chunked'
+                       ChunkedStream.new(socket)
+                     else
+                       Stream.new(socket)
+                     end
+
             # rack compliant
-            status, headers, body = @handler.call(request,socket)
+            status, headers, body = @handler.call(request,stream)
 
             write_response(socket,status,headers,body)
           end

data/lib/net/http/server/requests.rb

@@ -24,29 +24,33 @@ module Net
         def read_request(stream)
           buffer = ''
 
-          request_line = stream.readline("\r\n")
+          begin
+            request_line = stream.readline("\r\n")
 
-          # the request line must contain 'HTTP/'
-          return unless request_line.include?('HTTP/')
+            # the request line must contain 'HTTP/'
+            return unless request_line.include?('HTTP/')
 
-          buffer << request_line
+            buffer << request_line
 
-          stream.each_line("\r\n") do |header|
-            buffer << header
+            stream.each_line("\r\n") do |header|
+              buffer << header
 
-            # a header line must contain a ':' character followed by
-            # linear-white-space (either ' ' or "\t").
-            unless (header.include?(': ') || header.include?(":\t"))
-              # if this is not a header line, check if it is the end
-              # of the request
-              if header == "\r\n"
-                # end of the request
-                break
-              else
-                # invalid header line
-                return
+              # a header line must contain a ':' character followed by
+              # linear-white-space (either ' ' or "\t").
+              unless (header.include?(': ') || header.include?(":\t"))
+                # if this is not a header line, check if it is the end
+                # of the request
+                if header == "\r\n"
+                  # end of the request
+                  break
+                else
+                  # invalid header line
+                  return
+                end
               end
             end
+          rescue IOError, SystemCallError
+            return
           end
 
           return buffer
@@ -92,8 +96,8 @@ module Net
 
           unless headers.empty?
             headers.each do |header|
-              name = header[:name]
-              value = header[:value]
+              name = header[:name].to_s
+              value = header[:value].to_s
 
               if normalized_headers.has_key?(name)
                 previous_value = normalized_headers[name]

data/lib/net/http/server/responses.rb

@@ -1,3 +1,5 @@
+require 'net/http/server/chunked_stream'
+
 require 'net/protocol'
 require 'time'
 
@@ -124,6 +126,26 @@ module Net
           end
         end
 
+        #
+        # Writes the body of a HTTP Response to a stream, using Chunked
+        # Transfer-Encoding.
+        #
+        # @param [IO] stream
+        #   The stream to write the headers back to.
+        #
+        # @param [#each] body
+        #   The body of the HTTP Response.
+        #
+        # @since 0.2.0
+        #
+        def write_body_streamed(stream,body)
+          chunked_stream = ChunkedStream.new(stream)
+
+          body.each { |chunk| chunked_stream.write(chunk) }
+
+          chunked_stream.close
+        end
+
         #
         # Writes a HTTP Response to a stream.
         #
@@ -142,7 +164,16 @@ module Net
         def write_response(stream,status,headers,body)
           write_status stream, status
           write_headers stream, headers
-          write_body stream, body
+
+          if headers['Transfer-Encoding'] == 'chunked'
+            write_body_streamed stream, body
+          else
+            write_body stream, body
+
+            # if neither `Content-Length` or `Transfer-Encoding`
+            # were specified, close the stream after writing the response.
+            stream.close unless headers['Content-Length']
+          end
         end
 
       end

data/lib/net/http/server/stream.rb

@@ -0,0 +1,123 @@
+require 'net/protocol'
+
+module Net
+  class HTTP < Protocol
+    module Server
+      #
+      # Handles reading and writing to raw HTTP streams.
+      #
+      # @since 0.2.0
+      #
+      class Stream
+
+        include Enumerable
+
+        # The raw socket of the stream.
+        attr_reader :socket
+
+        #
+        # Creates a new stream.
+        #
+        # @param [TCPSocket] socket
+        #   The raw socket that will be read/write to.
+        #
+        # @since 0.2.0
+        #
+        def initialize(socket)
+          @socket = socket
+        end
+
+        #
+        # Reads data from the stream.
+        #
+        # @param [Integer] length
+        #   The number of bytes to read.
+        #
+        # @param [#<<] buffer
+        #   The optional buffer to append the data to.
+        #
+        # @return [String, nil]
+        #   A chunk from the stream.
+        #
+        # @since 0.2.0
+        #
+        def read(length=4096,buffer='')
+          @socket.read(length,buffer)
+        end
+
+        #
+        # Reads each chunk from the stream.
+        #
+        # @yield [chunk]
+        #   The given block will be passed each chunk.
+        #
+        # @yieldparam [String] chunk
+        #   A chunk from the stream.
+        #
+        # @return [Enumerator]
+        #   If no block is given, an Enumerator will be returned.
+        #
+        # @since 0.2.0
+        #
+        def each
+          return enum_for unless block_given?
+
+          while (chunk = read)
+            yield chunk
+          end
+        end
+
+        #
+        # Reads the entire body.
+        #
+        # @return [String]
+        #   The complete body.
+        #
+        # @since 0.2.0
+        #
+        def body
+          buffer = ''
+
+          each { |chunk| buffer << chunk }
+          return buffer
+        end
+
+        #
+        # Writes data to the stream.
+        #
+        # @param [String] data
+        #   The data to write to the stream.
+        #
+        # @return [Integer]
+        #   The length of the data written.
+        #
+        # @since 0.2.0
+        #
+        def write(data)
+          result = @socket.write(data)
+
+          @socket.flush
+          return result
+        end
+
+        #
+        # @see #write
+        #
+        # @since 0.2.0
+        #
+        def <<(data)
+          write(data)
+        end
+
+        #
+        # Closes the stream.
+        #
+        # @since 0.2.0
+        #
+        def close
+        end
+
+      end
+    end
+  end
+end

data/lib/net/http/server/version.rb

@@ -4,7 +4,7 @@ module Net
   class HTTP < Protocol
     module Server
       # net-http-server version.
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

data/lib/rack/handler/http.rb

@@ -2,6 +2,7 @@ require 'net/http/server/daemon'
 require 'net/http/server/version'
 
 require 'rack'
+require 'rack/rewindable_input'
 require 'set'
 
 module Rack
@@ -14,7 +15,7 @@ module Rack
       # The default environment settings.
       DEFAULT_ENV = {
         'rack.version' => Rack::VERSION,
-        'rack.errors' => STDERR,
+        'rack.errors' => $stderr,
         'rack.multithread' => true,
         'rack.multiprocess' => false,
         'rack.run_once' => false,
@@ -27,7 +28,7 @@ module Rack
       # Special HTTP Headers used by Rack::Request
       SPECIAL_HEADERS = Set[
         'Content-Type',
-        'Content-Length',
+        'Content-Length'
       ]
 
       #
@@ -81,16 +82,16 @@ module Rack
       # @param [Hash] request
       #   An HTTP Request received from {Net::HTTP::Server}.
       #
-      # @param [TCPSocket] socket
-      #   The socket that the request was received from.
+      # @param [Net::HTTP::Server::Stream, Net::HTTP::Server::ChunkedStream] stream
+      #   The stream that represents the body of the request.
       #
       # @return [Array<Integer, Hash, Array>]
       #   The response status, headers and body.
       #
-      def call(request,socket)
+      def call(request,stream)
         request_uri = request[:uri]
-        remote_address = socket.remote_address
-        local_address = socket.local_address
+        remote_address = stream.socket.remote_address
+        local_address = stream.socket.local_address
 
         env = {}
 
@@ -98,10 +99,10 @@ module Rack
         env.merge!(DEFAULT_ENV)
 
         # populate
-        env['rack.input'] = socket
+        env['rack.input'] = Rack::RewindableInput.new(stream)
 
         if request_uri[:scheme]
-          env['rack.url_scheme'] = request_uri[:scheme]
+          env['rack.url_scheme'] = request_uri[:scheme].to_s
         end
 
         env['SERVER_NAME'] = local_address.getnameinfo[0]
@@ -111,8 +112,8 @@ module Rack
         env['REMOTE_ADDR'] = remote_address.ip_address
         env['REMOTE_PORT'] = remote_address.ip_port.to_s
 
-        env['REQUEST_METHOD'] = request[:method]
-        env['PATH_INFO'] = request_uri.fetch(:path,'*')
+        env['REQUEST_METHOD'] = request[:method].to_s
+        env['PATH_INFO'] = request_uri.fetch(:path,'*').to_s
         env['QUERY_STRING'] = request_uri[:query_string].to_s
 
         # add the headers

data/net-http-server.gemspec

@@ -1,10 +1,131 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
-begin
-  Ore::Specification.new do |gemspec|
-    # custom logic here
+require 'yaml'
+
+Gem::Specification.new do |gemspec|
+  root = File.dirname(__FILE__)
+  lib_dir = File.join(root,'lib')
+  files = if File.directory?('.git')
+            `git ls-files`.split($/)
+          elsif File.directory?('.hg')
+            `hg manifest`.split($/)
+          elsif File.directory?('.svn')
+            `svn ls -R`.split($/).select { |path| File.file?(path) }
+          else
+            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
+          end
+
+  filter_files = lambda { |paths|
+    case paths
+    when Array
+      (files & paths)
+    when String
+      (files & Dir[paths])
+    end
+  }
+
+  version = {
+    :file => 'net/http/server/version.rb',
+    :constant => 'Net::HTTP::Server::VERSION'
+  }
+
+  defaults = {
+    'name' => File.basename(File.dirname(__FILE__)),
+    'files' => files,
+    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
+    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
+    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
+  }
+
+  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+
+  gemspec.name = metadata.fetch('name',defaults[:name])
+  gemspec.version = if metadata['version']
+                      metadata['version']
+                    else
+                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+                      require version[:file]
+                      eval(version[:constant])
+                    end
+
+  gemspec.summary = metadata.fetch('summary',metadata['description'])
+  gemspec.description = metadata.fetch('description',metadata['summary'])
+
+  case metadata['license']
+  when Array
+    gemspec.licenses = metadata['license']
+  when String
+    gemspec.license = metadata['license']
+  end
+
+  case metadata['authors']
+  when Array
+    gemspec.authors = metadata['authors']
+  when String
+    gemspec.author = metadata['authors']
+  end
+
+  gemspec.email = metadata['email']
+  gemspec.homepage = metadata['homepage']
+
+  case metadata['require_paths']
+  when Array
+    gemspec.require_paths = metadata['require_paths']
+  when String
+    gemspec.require_path = metadata['require_paths']
+  end
+
+  gemspec.files = filter_files[metadata['files']]
+
+  gemspec.executables = metadata['executables']
+  gemspec.extensions = metadata['extensions']
+
+  if Gem::VERSION < '1.7.'
+    gemspec.default_executable = gemspec.executables.first
+  end
+
+  gemspec.test_files = filter_files[metadata['test_files']]
+
+  unless gemspec.files.include?('.document')
+    gemspec.extra_rdoc_files = metadata['extra_doc_files']
+  end
+
+  gemspec.post_install_message = metadata['post_install_message']
+  gemspec.requirements = metadata['requirements']
+
+  if gemspec.respond_to?(:required_ruby_version=)
+    gemspec.required_ruby_version = metadata['required_ruby_version']
+  end
+
+  if gemspec.respond_to?(:required_rubygems_version=)
+    gemspec.required_rubygems_version = metadata['required_ruby_version']
+  end
+
+  parse_versions = lambda { |versions|
+    case versions
+    when Array
+      versions.map { |v| v.to_s }
+    when String
+      versions.split(/,\s*/)
+    end
+  }
+
+  if metadata['dependencies']
+    metadata['dependencies'].each do |name,versions|
+      gemspec.add_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['runtime_dependencies']
+    metadata['runtime_dependencies'].each do |name,versions|
+      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['development_dependencies']
+    metadata['development_dependencies'].each do |name,versions|
+      gemspec.add_development_dependency(name,parse_versions[versions])  
+    end
   end
-rescue NameError
-  STDERR.puts "The 'net-http-server.gemspec' file requires Ore."
-  STDERR.puts "Run `gem install ore-core` to install Ore."
 end

data/spec/net/http/server/chunked_stream_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+require 'stringio'
+
+require 'net/http/server/chunked_stream'
+
+describe Net::HTTP::Server::ChunkedStream do
+  describe "#read" do
+    let(:data) { "foo\0bar" }
+
+    it "should read the length-line and then the following chunk" do
+      socket = StringIO.new("%x\r\n%s\r\n0\r\n\r\n" % [data.length, data])
+      stream = described_class.new(socket)
+
+      stream.read.should == data
+    end
+
+    it "should ignore any extension data, after the length field" do
+      socket = StringIO.new("%x;lol\r\n%s\r\n0\r\n\r\n" % [data.length, data])
+      stream = described_class.new(socket)
+
+      stream.read.should == data
+    end
+
+    it "should read an amount of data from a socket, directly into a buffer" do
+      length = 3
+      buffer = ''
+
+      socket = StringIO.new("%x\r\n%s\r\n0\r\n\r\n" % [data.length, data])
+      stream = described_class.new(socket)
+
+      stream.read(length,buffer).should == data[0,length]
+    end
+
+    it "should buffer unread data from the previously read chunk" do
+      socket = StringIO.new("%x\r\n%s\r\n0\r\n\r\n" % [data.length, data])
+      stream = described_class.new(socket)
+
+      stream.read(4).should == data[0,4]
+      stream.read.should == data[4..-1]
+    end
+
+    it "should return nil after it reads the last chunk" do
+      socket = StringIO.new("0\r\n\r\n")
+      stream = described_class.new(socket)
+
+      stream.read.should be_nil
+    end
+  end
+
+  describe "#write" do
+    it "should return the length of the data written" do
+      socket = StringIO.new
+      stream = described_class.new(socket)
+
+      stream.write('foo').should == 3
+    end
+
+    it "should write a length-line along with the data" do
+      socket = StringIO.new
+      stream = described_class.new(socket)
+
+      stream.write('foo')
+
+      socket.string.should == "3\r\nfoo\r\n"
+    end
+
+    it "should not write empty Strings" do
+      socket = StringIO.new
+      stream = described_class.new(socket)
+
+      stream.write('')
+
+      socket.string.should be_empty
+    end
+  end
+
+  describe "#close" do
+    it "should write the 0 length-line" do
+      socket = StringIO.new
+      stream = described_class.new(socket)
+
+      stream.close
+
+      socket.string.should == "0\r\n\r\n"
+    end
+  end
+end

data/spec/net/http/server/stream_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'net/http/server/stream'
+
+require 'stringio'
+
+describe Net::HTTP::Server::Stream do
+  describe "#read" do
+    let(:data) { "foo\0bar" }
+
+    it "should read data from a socket" do
+      stream = described_class.new(StringIO.new(data))
+      stream.read.should == data
+    end
+
+    it "should read an amount of data from a socket, directly into a buffer" do
+      length = 3
+      buffer = ''
+
+      stream = described_class.new(StringIO.new(data))
+      stream.read(length,buffer)
+      
+      buffer.should == data[0,length]
+    end
+  end
+
+  describe "#each" do
+    it "should stop yielding data on 'nil'" do
+      results = []
+
+      stream = described_class.new(StringIO.new())
+      stream.each { |chunk| results << chunk }
+
+      results.should be_empty
+    end
+
+    it "should yield each chunk in the stream" do
+      chunks = ['A' * 4096, 'B' * 4096]
+      data = chunks.join('')
+      results = []
+
+      stream = described_class.new(StringIO.new(data))
+      stream.each { |chunk| results << chunk }
+
+      results.should == chunks
+    end
+  end
+
+  describe "#body" do
+    it "should append each chunk to a buffer" do
+      chunks = ['A' * 4096, 'B' * 4096]
+      data = chunks.join('')
+
+      stream = described_class.new(StringIO.new(data))
+      stream.body.should == data
+    end
+  end
+
+  describe "#write" do
+    it "should write to the socket and flush" do
+      data = "foo\n\rbar"
+
+      stream = described_class.new(StringIO.new)
+      stream.write(data).should == data.length
+    end
+  end
+end

data/spec/rack/handler/http_spec.rb

@@ -9,9 +9,6 @@ require 'rack/static'
 describe Rack::Handler::HTTP do
   include TestRequest::Helpers
 
-  let(:host) { '0.0.0.0' }
-  let(:port) { 9204 }
-  
   before(:all) do
     app = Rack::Builder.app do
       use Rack::Lint
@@ -19,7 +16,9 @@ describe Rack::Handler::HTTP do
       run TestRequest.new
     end
     
-    @server = Rack::Handler::HTTP.new(app, :Host => host, :Port => port)
+    @host = '127.0.0.1'
+    @port = 9204
+    @server = Rack::Handler::HTTP.new(app, :Host => @host, :Port => @port)
 
     Thread.new { @server.run }
     Thread.pass until @server.running?

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-gem 'rspec', '~> 2.4.0'
+gem 'rspec', '~> 2.4'
 require 'rspec'

metadata

@@ -1,155 +1,131 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: net-http-server
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-26 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: parslet
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &16921520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ore-tasks
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *16921520
+- !ruby/object:Gem::Dependency
+  name: ore-tasks
+  requirement: &16920560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *16920560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &16920080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *16920080
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &16919540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *16919540
 description: A Rack compatible pure Ruby HTTP Server.
 email: postmodern.mod3@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.md
-- ChangeLog.md
-- LICENSE.txt
-files: 
+extra_rdoc_files: []
+files:
 - .document
 - .gemtest
+- .gitignore
 - .rspec
 - .yardopts
 - ChangeLog.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/parser.rb
+- benchmarks/server.rb
 - gemspec.yml
 - lib/net/http/server.rb
+- lib/net/http/server/chunked_stream.rb
 - lib/net/http/server/daemon.rb
 - lib/net/http/server/parser.rb
 - lib/net/http/server/requests.rb
 - lib/net/http/server/responses.rb
 - lib/net/http/server/server.rb
+- lib/net/http/server/stream.rb
 - lib/net/http/server/version.rb
 - lib/rack/handler/http.rb
 - net-http-server.gemspec
+- spec/net/http/server/chunked_stream_spec.rb
+- spec/net/http/server/daemon_spec.rb
+- spec/net/http/server/parser_spec.rb
+- spec/net/http/server/requests_spec.rb
+- spec/net/http/server/responses_spec.rb
+- spec/net/http/server/server_spec.rb
+- spec/net/http/server/stream_spec.rb
 - spec/rack/handler/helpers/test_request.rb
 - spec/rack/handler/http_spec.rb
 - spec/rack/handler/images/image.jpg
-- spec/server/daemon_spec.rb
-- spec/server/parser_spec.rb
-- spec/server/requests_spec.rb
-- spec/server/responses_spec.rb
-- spec/server/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: yard
 homepage: http://github.com/postmodern/net-http-server
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-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 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: net-http-server
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A pure Ruby HTTP Server
-test_files: 
-- spec/server/daemon_spec.rb
-- spec/server/requests_spec.rb
-- spec/server/parser_spec.rb
-- spec/server/responses_spec.rb
-- spec/server/server_spec.rb
+test_files:
+- spec/net/http/server/chunked_stream_spec.rb
+- spec/net/http/server/daemon_spec.rb
+- spec/net/http/server/parser_spec.rb
+- spec/net/http/server/requests_spec.rb
+- spec/net/http/server/responses_spec.rb
+- spec/net/http/server/server_spec.rb
+- spec/net/http/server/stream_spec.rb
 - spec/rack/handler/http_spec.rb