yarn 0.0.2 → 0.0.9

data/.gitignore

@@ -8,3 +8,4 @@ pkg/*
 *.rbc
 doc/*
 .rvmrc
+.rbx/

data/LICENCE

@@ -0,0 +1,22 @@
+Portions copyright (c) 2011 Jesper Kjeldgaard
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,10 +1,6 @@
 # Yarn #
 
-Yarn is a multi-threaded webserver written in Ruby 1.9 by Jesper Kjeldgaard.
-It handles concurrent requests by means of a set of workers and a job queue for incomming requests.
-
-Supports:
-* 
+Yarn is a multi-process webserver written in Ruby 1.9 by Jesper Kjeldgaard.
 
 
 ## Installation ##
@@ -12,16 +8,21 @@ Supports:
 
 
 ## Usage ##
-To use Yarn with Rack applications:
-
-`rackup -s Yarn <rackup file (config.ru)>`
-
-
-To use Yarn for serving static and ruby (*.rb) files:
 
 
-    yarn [options]
+    Usage: yarn [options]
     where [options] are:
       --host, -h <s>:   Hostname or IP address of the server (default: 127.0.0.1)
       --port, -p <i>:   Port number to listen on for incomming requests (default: 3000)
-      --workers, -w <s>:   Number of worker threads (default: 32)
+      --workers, -w <i>:   Number of worker threads (default: 4)
+      --rack, -r <s>:   Rackup file <config.ru> (default: off)
+      --log, -l:   Enable logging
+      --debug, -d:   Output debug messages
+      --version, -v:   Print version and exit
+      --help, -e:   Show this message
+
+
+## Todo list ##
+
+
+* Support persistent connections.

data/bin/yarn

@@ -9,7 +9,7 @@ require 'yarn'
 opts = Trollop::options do
   version "Yarn v#{Yarn::VERSION} 2011 Jesper Kjeldgaard"
   banner <<-EOS
-Yarn v#{Yarn::VERSION} is a multiprocess webserver written in Ruby 1.9.2
+Yarn v#{Yarn::VERSION} is a multiprocess webserver written in Ruby 1.9
 
 Usage: yarn [options]
 where [options] are:
@@ -19,7 +19,8 @@ EOS
   opt :port, "Port number to listen on for incomming requests", :default => 3000
   opt :workers, "Number of worker threads", :default => 4
   opt :rack, "Rackup file <config.ru>", :default => "off"
-  opt :debug, "Output debug messages"
+  opt :log, "Enable logging", :default => false
+  opt :debug, "Output debug messages", :default => false
 end
 
 server = Yarn::Server.new(opts)

data/features/server.feature

@@ -1,8 +1,8 @@
 Feature: Server control
 
   As a developer
-  I want to be able to command the server
-  So that I can control the server
+  I want to be able to start and stop
+  So that I can serve files to the web
 
   Scenario: Start server
     When I start the server on port 3000
@@ -12,7 +12,3 @@ Feature: Server control
     Given the server is running
     When I stop the server
     Then I should see "Server stopped"
-
-  Scenario: Supply port number when starting the server
-    When I start the server on port 4000
-    Then I should see "Server started on port 4000"

data/lib/yarn.rb

@@ -1,4 +1,3 @@
-require 'pry'
 require 'rack/handler/yarn'
 require 'rack/handler'
 
@@ -6,16 +5,15 @@ module Yarn
 
   autoload :Server,           "yarn/server"
   autoload :VERSION,          "yarn/version"
+  autoload :AbstractHandler,  "yarn/abstract_handler"
   autoload :RequestHandler,   "yarn/request_handler"
   autoload :RackHandler,      "yarn/rack_handler"
   autoload :DirectoryLister,  "yarn/directory_lister"
   autoload :ErrorPage,        "yarn/error_page"
   autoload :Logging,          "yarn/logging"
-  autoload :ParsletParser,    "yarn/parslet_parser"
+  autoload :Parser,           "yarn/parser"
   autoload :Response,         "yarn/response"
   autoload :STATUS_CODES,     "yarn/statuses"
-  autoload :Worker,           "yarn/worker"
-  autoload :WorkerPool,       "yarn/worker_pool"
 
   Rack::Handler.register 'yarn', 'Yarn'
 

data/lib/yarn/abstract_handler.rb

@@ -0,0 +1,116 @@
+require 'date'
+require 'rubygems'
+require 'parslet'
+
+module Yarn
+
+  class EmptyRequestError < StandardError; end
+  class ProcessingError < StandardError; end
+
+  class AbstractHandler
+
+    include Logging
+    include ErrorPage
+
+    attr_accessor :session, :parser, :request, :response
+
+    def initialize
+      @parser = Parser.new
+      @response = Response.new
+    end
+
+    def run(session)
+      set_common_headers
+      @session = session
+      begin
+        parse_request
+        debug "Request parsed, path: #{request_path}"
+        prepare_response
+        debug "Response prepared: #{@response.status}"
+        return_response
+        log "#{STATUS_CODES[@response.status]} #{client_address} #{request_path}"
+      rescue EmptyRequestError
+        log "Empty request from #{client_address}"
+      ensure
+        @session.close
+        debug "Connection closed"
+      end
+    end
+
+    def parse_request
+      raw_request = read_request
+      raise EmptyRequestError if raw_request.empty?
+
+      begin
+        @request = @parser.run raw_request
+      rescue Parslet::ParseFailed => e
+        @response.status = 400
+        debug "Parse failed: #{@request}"
+      end
+    end
+
+    def prepare_response
+    end
+
+    def return_response
+      @session.puts "HTTP/1.1 #{@response.status} #{STATUS_CODES[@response.status]}"
+      @session.puts @response.headers.map { |k,v| "#{k}: #{v}" }
+      @session.puts ""
+
+      @response.body.each do |line|
+        @session.puts line
+      end
+    end
+
+    def read_request
+      input = []
+      while (line = @session.gets) do
+        length = line.gsub(/\D/,"") if line =~ /Content-Length/
+          if line == "\r\n"
+            input << line
+            input << @session.read(length.to_i) if length
+            break
+          else
+            input << line
+          end
+      end
+
+      debug "Done reading request"
+      input.join
+    end
+
+    def persistent?
+      return @request[:headers]["Connection"] == "keep-alive"
+    end
+
+    def set_common_headers
+      @response.headers[:Server] = "Yarn webserver v#{VERSION}"
+
+      # HTTP date format: Fri, 31 Dec 1999 23:59:59 GMT
+      time ||= DateTime.now.new_offset(0)
+      @response.headers[:Date] = time.strftime("%a, %d %b %Y %H:%M:%S GMT")
+      # Close connection header ( until support for persistent connections )
+      @response.headers[:Connection] = "Close"
+    end
+
+    def extract_path
+      path = @request[:uri][:path].to_s
+      if path[0] == "/" && path != "/"
+        path = path[1..-1] 
+      end
+      path.gsub(/%20/, " ").strip
+    end
+
+    def post_body
+      @request ? @request[:body].to_s : ""
+    end
+
+    def request_path
+      @request[:uri][:path] if @request
+    end
+
+    def client_address
+      @session.peeraddr(:numeric)[2] if @session
+    end
+  end
+end

data/lib/yarn/logging.rb

@@ -1,10 +1,10 @@
-require 'logger'
 require 'date'
 
 module Yarn
   module Logging
 
     def log(msg)
+      return nil unless $log
       if msg.respond_to?(:each)
         msg.each do |line|
           output.puts "#{timestamp} #{line}"
@@ -19,7 +19,8 @@ module Yarn
     end
 
     def output
-      $output || $stdout
+      out ||= $output || $stdout
+      out
     end
 
     def timestamp

data/lib/yarn/{parslet_parser.rb → parser.rb}

@@ -1,10 +1,8 @@
 require 'rubygems'
 require 'parslet'
 
-module Parslet::Atoms::DSL; def once; repeat(1); end; end
-
 module Yarn
-  class ParsletParser < Parslet::Parser
+  class Parser < Parslet::Parser
     
     # general rules
 
@@ -15,9 +13,9 @@ module Yarn
     rule(:spaces) { match('\s+') }
 
     # header rules
-    rule(:header_value) { match['^\r\n'].once }
+    rule(:header_value) { match['^\r\n'].repeat(1) }
 
-    rule(:header_name) { match['a-zA-Z\-'].once }
+    rule(:header_name) { match['a-zA-Z\-'].repeat(1) }
 
     rule(:header) do 
       header_name.as(:name) >> 
@@ -28,7 +26,7 @@ module Yarn
     end
 
     # request-line rules
-    rule(:http_version) { match['HTTP\/\d\.\d'].once }
+    rule(:http_version) { match['HTTP\/\d\.\d'].repeat(1) }
 
     rule(:query) do
       match['\S+'].repeat(1)
@@ -37,12 +35,12 @@ module Yarn
     rule(:path) do 
       match['^\?'].repeat(1).as(:path) >> 
       str("?") >> 
-      query.as(:query) | match['^\s'].once.as(:path)
+      query.as(:query) | match['^\s'].repeat(1).as(:path)
     end
 
     rule(:port) { match['\d+'].repeat(1) }
 
-    rule(:host) { match['^\/:'].once }
+    rule(:host) { match['^\/:'].repeat(1) }
 
     rule(:absolute_uri) do
       str("http://") >> 
@@ -56,7 +54,7 @@ module Yarn
 
     rule(:spaces) { match('\s+') }
 
-    rule(:method) { match['OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT'].once }
+    rule(:method) { match['OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT'].repeat(1) }
 
     # RFC2616: Method SP Request-URI SP HTTP-Version CRLF
     rule(:request_line) do 
@@ -69,7 +67,7 @@ module Yarn
     end
      
     # body rule
-    rule(:body) { match['\S'].once }
+    rule(:body) { match['\S'].repeat(1) }
 
     # RFC2616: Request-Line *(( header ) CRLF) CRLF [ message-body ]
     rule(:request) do 

data/lib/yarn/rack_handler.rb

@@ -1,15 +1,16 @@
 require 'rack'
-require 'pry'
 
 module Yarn
-  class RackHandler < RequestHandler
+  class RackHandler < AbstractHandler
 
-    attr_accessor :env
+    attr_accessor :env, :opts
 
-    def initialize(app)
-      @parser = ParsletParser.new
+    def initialize(app,opts={})
+      @parser = Parser.new
       @response = Response.new
       @app = app
+      @host = opts[:host]
+      @port = opts[:port].to_s
     end
 
     def prepare_response
@@ -23,14 +24,18 @@ module Yarn
     end
 
     def make_env
+      input = StringIO.new("").set_encoding(Encoding::ASCII_8BIT)
+      if has_body?
+        input.string = @request[:body]
+      end
       @env = {
         "REQUEST_METHOD"    => @request[:method].to_s,
         "PATH_INFO"         => @request[:uri][:path].to_s,
         "QUERY_STRING"      => @request[:uri][:query].to_s,
-        "SERVER_NAME"       => @request[:uri][:host].to_s,
-        "SERVER_PORT"       => @request[:uri][:port].to_s,
+        "SERVER_NAME"       => @host,
+        "SERVER_PORT"       => @port,
         "SCRIPT_NAME"       => "",
-        "rack.input"        => StringIO.new("").set_encoding(Encoding::ASCII_8BIT),
+        "rack.input"        => input,
         "rack.version"      => Rack::VERSION,
         "rack.errors"       => $output,
         "rack.multithread"  => true,
@@ -38,6 +43,14 @@ module Yarn
         "rack.run_once"     => false,
         "rack.url_scheme"   => "http"
       }
+      @env["CONTENT_LENGTH"] = @request[:body].size.to_i if has_body?
+
+      return @env
+    end
+
+    def has_body?
+      value ||= !! @request[:body]
+      value
     end
 
   end

data/lib/yarn/request_handler.rb

@@ -1,69 +1,15 @@
-require 'date'
-require 'rubygems'
-require 'parslet'
-
 module Yarn
-
-  class EmptyRequestError < StandardError; end
-  class ProcessingError < StandardError; end
-
-  class RequestHandler
-
-    include Logging
-    include ErrorPage
-
-    attr_accessor :session, :parser, :request, :response
-
-    def initialize
-      @parser = ParsletParser.new
-      @response = Response.new
-    end
-
-    def run(session)
-      set_common_headers
-      @session = session
-      begin
-        parse_request
-        debug "Request parsed, path: #{request_path}"
-        prepare_response
-        debug "Response prepared: #{@response.status}"
-        return_response
-        log "#{STATUS_CODES[@response.status]} #{client_address} #{request_path}"
-      rescue EmptyRequestError
-        log "Empty request from #{client_address}"
-      ensure
-        close_connection
-        debug "Connection closed"
-      end
-    end
-
-    def parse_request
-      raw_request = read_request
-      raise EmptyRequestError if raw_request.empty?
-
-      begin
-        @request = @parser.run raw_request
-      rescue Parslet::ParseFailed => e
-        @response.status = 400
-        debug "Parse failed: #{@request}"
-      end
-    end
-
+  class RequestHandler < AbstractHandler
     def prepare_response
       path = extract_path
 
       @response.headers["Content-Type"] = "text/html"
 
       begin
-        if File.directory? path
-          serve_directory path
+        if File.directory?(path)
+          serve_directory(path)
         elsif File.exists?(path)
-          if path =~ /.*\.rb$/
-            @response.body << execute_script(path)
-            @response.status = 200
-          else
-            serve_file(path)
-          end
+          path =~ /.*\.rb$/ ? serve_ruby_file(path) : serve_file(path)
         else
           serve_404_page
         end
@@ -73,72 +19,15 @@ module Yarn
       end
     end
 
-    def execute_script(path)
-      response = `ruby #{path} #{post_body}`
-      if !! ($?.to_s =~ /1$/)
-        raise ProcessingError
-      else
-        response
-      end
-    end
-
-    def post_body
-      @request ? @request[:body].to_s : ""
-    end
-
-    def return_response
-      @session.puts "HTTP/1.1 #{@response.status} #{STATUS_CODES[@response.status]}"
-      @session.puts @response.headers.map { |k,v| "#{k}: #{v}" }
-      @session.puts ""
-
-      @response.body.each do |line|
-        @session.puts line
-      end
-    end
-
-    def close_connection
-      if @session #&& !persistent?
-        @session.close
-      else
-        # TODO: start some kind of timeout
-      end
-    end
-
-    def read_request
-      input = []
-      while (line = @session.gets) do
-        length = line.gsub(/\D/,"") if line =~ /Content-Length/
-        if line == "\r\n"
-          input << line
-          input << @session.read(length.to_i) if length
-          break
-        else
-          input << line
-        end
-      end
-      @session.close_read
-      debug "Done reading request"
-      input.join
-    end
-
-    def persistent?
-      return @request[:headers]["Connection"] == "keep-alive"
-    end
-
-    def set_common_headers
-      @response.headers[:Server] = "Yarn webserver v#{VERSION}"
-
-      # HTTP date format: Fri, 31 Dec 1999 23:59:59 GMT
-      time = DateTime.now.new_offset(0)
-      @response.headers[:Date] = time.strftime("%a, %d %b %Y %H:%M:%S GMT")
-      # Close connection header ( until support for persistent connections )
-      @response.headers[:Connection] = "Close"
-    end
-
     def serve_file(path)
-      @response.status = 200
       @response.body << read_file(path)
       @response.headers["Content-Type"] = get_mime_type path
+      @response.status = 200
+    end
+
+    def serve_ruby_file(path)
+      @response.body << execute_script(path)
+      @response.status = 200
     end
 
     def serve_directory(path)
@@ -148,8 +37,7 @@ module Yarn
         @response.headers["Content-Type"] = "text/html"
       else
         @response.headers["Content-Type"] = "text/html"
-        directory_lister = DirectoryLister.new
-        @response.body << directory_lister.list(path)
+        @response.body << DirectoryLister.list(path)
       end
     end
 
@@ -160,22 +48,12 @@ module Yarn
       file_contents
     end
 
-    def extract_path
-      path = @request[:uri][:path].to_s
-      if path[0] == "/" && path != "/"
-        path = path[1..-1] 
-      end
-      path.gsub(/%20/, " ").strip
-    end
-
-    def serve_directory(path)
-      @response.status = 200
-      if File.exists?("index.html")# || File.exists?("/index.html")
-        @response.body = read_file "index.html"
-        @response.headers["Content-Type"] = "text/html"
+    def execute_script(path)
+      response = `ruby #{path} #{post_body}`
+      if !! ($?.to_s =~ /1$/)
+        raise ProcessingError
       else
-        @response.headers["Content-Type"] = "text/html"
-        @response.body << DirectoryLister.list(path)
+        response
       end
     end
 
@@ -184,28 +62,20 @@ module Yarn
       filetype = path.split('.').last
 
       return case
-    when ["html", "htm"].include?(filetype)
-      "text/html"
-    when "txt" == filetype 
-      "text/plain"
-    when "css" == filetype
-      "text/css"
-    when "js" == filetype
-      "text/javascript"
-    when ["png", "jpg", "jpeg", "gif", "tiff"].include?(filetype)
-      "image/#{filetype}"
-    when ["zip","pdf","postscript","x-tar","x-dvi"].include?(filetype)
-      "application/#{filetype}"
-    else false
+      when ["html", "htm"].include?(filetype)
+        "text/html"
+      when "txt" == filetype 
+        "text/plain"
+      when "css" == filetype
+        "text/css"
+      when "js" == filetype
+        "text/javascript"
+      when ["png", "jpg", "jpeg", "gif", "tiff"].include?(filetype)
+        "image/#{filetype}"
+      when ["zip","pdf","postscript","x-tar","x-dvi"].include?(filetype)
+        "application/#{filetype}"
+      else false
+      end
     end
   end
-
-  def request_path
-    @request[:uri][:path] if @request
-  end
-
-  def client_address
-    @session.peeraddr(:numeric)[2] if @session
-  end
-end
 end

data/lib/yarn/server.rb

@@ -14,15 +14,18 @@ module Yarn
         host: '127.0.0.1', 
         port: 3000,
         workers: 4,
+        log: true,
         rack: "off" 
       }.merge(options)
 
       @app = nil
       @app = load_rack_app(opts[:rack]) unless opts[:rack] == "off"
+      @opts = opts
 
       @host, @port, @num_workers = opts[:host], opts[:port], opts[:workers]
       @workers = []
       $output, $debug = opts[:output], opts[:debug]
+      $log = opts[:log] || opts[:debug]
     end
 
     def load_rack_app(app_path)
@@ -48,14 +51,20 @@ module Yarn
 
     def init_workers
       @num_workers.times do
-        @workers << fork do
-          trap("INT") { exit }
-          loop do
-            handler ||= @app ? RackHandler.new(@app) : RequestHandler.new
-            session = @socket.accept
-            handler.run session 
-          end
-        end
+        @workers << fork_worker
+      end
+    end
+
+    def fork_worker
+      fork { worker }
+    end
+
+    def worker
+      trap("INT") { exit }
+      loop do
+        @handler ||= @app ? RackHandler.new(@app,@opts) : RequestHandler.new
+        session = @socket.accept
+        @handler.run session 
       end
     end
 

data/lib/yarn/version.rb

@@ -1,3 +1,3 @@
 module Yarn
-  VERSION = "0.0.2"
+  VERSION = "0.0.9"
 end

data/spec/spec_helper.rb

@@ -2,18 +2,15 @@ $LOAD_PATH << File.expand_path('../../../lib', __FILE__)
 
 require 'rubygems'
 require 'bundler/setup'
+require 'simplecov'
 
-# unless /jruby/ =~ `ruby -v`
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/spec/"
-    add_filter "lib/yarn/http*"
-  end
-# end
+SimpleCov.start do
+  add_filter "/spec/"
+  add_filter "lib/rack/handler/"
+end
 
 require 'yarn'
 require 'helpers'
-require 'pry'
 
 RSpec.configure do |config|
   config.include Helpers

data/spec/yarn/abstract_handler_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+module Yarn
+  describe AbstractHandler do
+    describe "Common behaviour" do
+
+      before(:each) do
+        @dummy_request = "GET /resource/1 HTTP/1.1\r\n "
+
+        @session = mock('TCPSocket')
+        @session.stub(:gets)
+        @session.stub(:close)
+
+        @handler = AbstractHandler.new
+        @handler.session = @session
+        @handler.stub(:read_request).and_return(@dummy_request)
+      end
+
+      describe "#read_request" do
+        it "should return a string from a feed" do
+          @handler.unstub!(:read_request)
+          @handler.session = StringIO.new
+          @handler.session.string = "line1\nline2\nline3"
+
+          @handler.read_request.should == "line1\nline2\nline3"
+        end
+
+        it "should handle POST body" do
+          @req = "POST /app HTTP/1.1\nCookie: $key=value;\nContent-Length: 17;\n\r\nfield1=1&field2=2"
+          @handler.unstub!(:read_request)
+          @handler.session = StringIO.new
+          @handler.session.string = @req
+
+          @handler.read_request.should == @req
+        end
+      end
+
+      describe "#parse_request" do
+        it "should invoke the Parser" do
+          @handler.parser.should_receive(:run)
+
+          @handler.parse_request
+        end
+
+        it "should set the bad-request header if parsing fails" do
+          bad_request = "BAD Warble warble request"
+          @handler.response.status.should be_nil
+
+          @session.stub(:gets).and_return(bad_request)
+          @handler.parse_request
+
+          @handler.response.status.should == 400
+        end
+      end
+
+      describe "#return_response" do
+        it "should write the response to the socket" do
+          @handler.session.should_receive(:puts).at_least(1).times
+          @handler.stub(:response).and_return("HTTP/1.1 201 OK")
+          @handler.return_response
+        end
+      end
+
+      describe "#persistent?" do
+        it "should return true if the Connection header is set to keep-alive" do
+          @handler.request = { headers: { "Connection" => "keep-alive" } }
+
+          @handler.persistent?.should be_true
+        end
+
+        it "should return false if the Connection header is set to close" do
+          @handler.request = { headers: { "Connection" => "close" } }
+
+          @handler.persistent?.should be_false
+        end
+      end
+
+      describe "#run" do
+        it "should call all relevant template methods" do
+          @handler.stub(:client_address)
+          @handler.should_receive(:parse_request).once
+          @handler.should_receive(:prepare_response).once
+          @handler.should_receive(:return_response).once
+
+          @handler.run(@session)
+        end
+      end
+    end
+
+
+  end
+end

data/spec/yarn/{parslet_parser_spec.rb → parser_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 module Yarn
-  describe ParsletParser do
+  describe Parser do
     before do
-      @parser = ParsletParser.new
+      @parser = Parser.new
     end 
 
     describe "#parse request_line" do
@@ -53,13 +53,11 @@ module Yarn
     describe "#parse parameters" do
       it "parses query in the url" do
         result = @parser.run("GET /page?param1=1&param2=2 HTTP/1.1\n")
-        puts result
         result[:uri][:query].should == "param1=1&param2=2"
       end
 
       it "should parse query on rails assets" do
         result = @parser.run("GET assets/application.js?body=0 HTTP/1.1\n")
-        puts result
         result[:uri][:query].should == "body=0"
         result[:uri][:path].should == "assets/application.js"
       end
@@ -116,7 +114,6 @@ module Yarn
         body = "attr=test&attr2=some_other_value&attr3=1231682368125361823"
         request = "POST /form HTTP/1.1\r\n#{header}\r\n\r\n#{body}"
         result = @parser.run(request)
-        puts result
         result[:body].should == body
       end
     end

data/spec/yarn/rack_handler_spec.rb

@@ -4,7 +4,8 @@ module Yarn
   describe RackHandler do
 
     before(:each) do
-      @handler = RackHandler.new(nil)
+      @app = mock('app')
+      @handler = RackHandler.new(@app, { host: "www.hostname.com", port: 8888 })
       @handler.request = @handler.parser.run "GET http://www.hostname.com:8888/some_controller/some_action?param1=1&param2=2 HTTP/1.1"
     end
 

data/spec/yarn/request_handler_spec.rb

@@ -3,92 +3,6 @@ require 'spec_helper'
 module Yarn
   describe RequestHandler do
 
-    describe "Common behaviour" do
-
-      before(:each) do
-        @dummy_request = "GET /resource/1 HTTP/1.1\r\n "
-
-        @session = mock('TCPSocket')
-        @session.stub(:gets).and_return(@dummy_request)
-
-        @handler = RequestHandler.new
-        @handler.session = @session
-        @handler.stub(:debug,:log).and_return(true) #silence output
-        @handler.stub(:read_request).and_return(@dummy_request)
-      end
-
-      describe "#read_request" do
-        it "should return a string from a feed" do
-          @handler.unstub!(:read_request)
-          @handler.session = StringIO.new
-          @handler.session.string = "line1\nline2\nline3"
-
-          @handler.read_request.should == "line1\nline2\nline3"
-        end
-
-        it "should handle POST body" do
-          @req = "POST /app HTTP/1.1\nCookie: $key=value;\nContent-Length: 17;\n\r\nfield1=1&field2=2"
-          @handler.unstub!(:read_request)
-          @handler.session = StringIO.new
-          @handler.session.string = @req
-
-          @handler.read_request.should == @req
-        end
-      end
-
-      describe "#parse_request" do
-        it "should invoke the Parser" do
-          @handler.parser.should_receive(:run)
-
-          @handler.parse_request
-        end
-
-        it "should set the bad-request header if parsing fails" do
-          bad_request = "BAD Warble warble request"
-          @handler.response.status.should be_nil
-
-          @session.stub(:gets).and_return(bad_request)
-          @handler.parse_request
-
-          @handler.response.status.should == 400
-        end
-      end
-
-      describe "#return_response" do
-        it "should write the response to the socket" do
-          @handler.session.should_receive(:puts).at_least(1).times
-          @handler.stub(:response).and_return("HTTP/1.1 201 OK")
-          @handler.return_response
-        end
-      end
-
-      describe "#persistent?" do
-        it "should return true if the Connection header is set to keep-alive" do
-          @handler.request = { headers: { "Connection" => "keep-alive" } }
-
-          @handler.persistent?.should be_true
-        end
-
-        it "should return false if the Connection header is set to close" do
-          @handler.request = { headers: { "Connection" => "close" } }
-
-          @handler.persistent?.should be_false
-        end
-      end
-
-      describe "#run" do
-        it "should call all relevant template methods" do
-          @handler.stub(:client_address)
-          @handler.should_receive(:parse_request).once
-          @handler.should_receive(:prepare_response).once
-          @handler.should_receive(:return_response).once
-          @handler.should_receive(:close_connection).once
-
-          @handler.run(@dummy_request)
-        end
-      end
-    end
-
     describe "Static requests" do
 
       before(:each) do
@@ -103,7 +17,6 @@ module Yarn
       end
 
       after(:each) do
-        @handler.close_connection
         File.delete("index.html") if File.exists?("index.html")
         File.delete("testdir/index.html") if File.exists?("testdir/index.html")
         Dir.delete("testdir") if Dir.exists?("testdir")
@@ -216,6 +129,7 @@ module Yarn
         end
       end
     end
+
     describe "Dynamic requests" do
       before(:each) do
         @file_content = "!#/bin/ruby\nputs 'Success!'"

data/spec/yarn/server_spec.rb

@@ -47,18 +47,6 @@ module Yarn
       end
     end
 
-    # describe "#start" do
-    #   it "should start the socket_listener" do
-    #     @thread = Thread.new do
-    #       @server = Server.new({ output: $console })
-    #       @server.start
-    #     end
-    #     sleep 2
-    #     get("/").should be_true
-    #     @thread.kill
-    #   end
-    # end
-
     describe "#stop" do
       it "should notify the server is stopped" do
         $console = MockIO.new

data/test_objects/rails_test/Gemfile

@@ -6,7 +6,7 @@ gem 'rails', '3.1.0'
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
 gem 'sqlite3'
-gem 'yarn'
+gem 'yarn', '~> 0.1'
 gem 'pry'
 
 # Gems used only for assets and not required

data/yarn.gemspec

@@ -8,9 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Jesper Kjeldgaard"]
   s.email       = ["jkjeldgaard@gmail.com"]
   s.homepage    = "https://github.com/thejspr/yarn"
-  s.summary     = %q{Multi-threaded webserver for static and dynamic (*.rb) files as well as rack applications.}
-  s.description = %q{A multi-threaded web-server written in Ruby 1.9.}
-
+  s.summary     = %q{Multi-process webserver for static, dynamic (*.rb) files and Rack applications.}
+  s.description = %q{A multi-process web-server written in Ruby 1.9.}
   s.rubyforge_project = "yarn"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarn
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000 Z
+date: 2011-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &19662180 !ruby/object:Gem::Requirement
+  requirement: &12100240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *19662180
+  version_requirements: *12100240
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &20080020 !ruby/object:Gem::Requirement
+  requirement: &12099740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *20080020
+  version_requirements: *12099740
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &20077620 !ruby/object:Gem::Requirement
+  requirement: &12099280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *20077620
+  version_requirements: *12099280
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &20075460 !ruby/object:Gem::Requirement
+  requirement: &12098900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20075460
+  version_requirements: *12098900
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &20069600 !ruby/object:Gem::Requirement
+  requirement: &12098440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20069600
+  version_requirements: *12098440
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &20066540 !ruby/object:Gem::Requirement
+  requirement: &12098020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20066540
+  version_requirements: *12098020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20064440 !ruby/object:Gem::Requirement
+  requirement: &12097600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20064440
+  version_requirements: *12097600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &20057640 !ruby/object:Gem::Requirement
+  requirement: &12097180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,8 +98,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20057640
-description: A multi-threaded web-server written in Ruby 1.9.
+  version_requirements: *12097180
+description: A multi-process web-server written in Ruby 1.9.
 email:
 - jkjeldgaard@gmail.com
 executables:
@@ -113,6 +113,7 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- LICENCE
 - README.md
 - Rakefile
 - bin/yarn
@@ -132,10 +133,11 @@ files:
 - features/support/hooks.rb
 - lib/rack/handler/yarn.rb
 - lib/yarn.rb
+- lib/yarn/abstract_handler.rb
 - lib/yarn/directory_lister.rb
 - lib/yarn/error_page.rb
 - lib/yarn/logging.rb
-- lib/yarn/parslet_parser.rb
+- lib/yarn/parser.rb
 - lib/yarn/rack_handler.rb
 - lib/yarn/request_handler.rb
 - lib/yarn/response.rb
@@ -145,10 +147,11 @@ files:
 - spec/helpers.rb
 - spec/rack/handler/yarn_spec.rb
 - spec/spec_helper.rb
+- spec/yarn/abstract_handler_spec.rb
 - spec/yarn/directory_lister_spec.rb
 - spec/yarn/error_page_spec.rb
 - spec/yarn/logging_spec.rb
-- spec/yarn/parslet_parser_spec.rb
+- spec/yarn/parser_spec.rb
 - spec/yarn/rack_handler_spec.rb
 - spec/yarn/request_handler_spec.rb
 - spec/yarn/response_spec.rb
@@ -219,9 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: yarn
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Multi-threaded webserver for static and dynamic (*.rb) files as well as rack
-  applications.
+summary: Multi-process webserver for static, dynamic (*.rb) files and Rack applications.
 test_files: []