yarn 0.0.9 → 0.1.0

data/features/concurrency.feature

@@ -4,12 +4,10 @@ Feature: Concurrency
   I want to be able to serve multiple requests in parallel
   To increase server performance
 
-  Background:
-    Given the server is running
-
   Scenario: Perform two requests in parallel
-    Given a client "A"
+    Given the server is running
+    And a client "A"
     And a client "B"
-    When client "A" makes a "1" seconds request
+    When client "A" makes a "1" second request
     And client "B" makes a "0.1" second request
     Then client "B" receives a response before client "A"

data/features/parser.feature

@@ -0,0 +1,15 @@
+Feature: Parse HTTP requests
+
+  As a web-developer
+  I want to be able to parse HTTP requests
+  To be able to respond accordingly
+
+  Scenario: Parse HTTP request
+    Given a HTTP request "GET /index.html HTTP/1.1\r\nUser-Agent: cucumber\r\n"
+    And a parser
+    When I feed the request to the parser
+    Then the result "method" should be "GET"
+    And the result "uri" should include "path" with "/index.html"
+    And the result "version" should be "HTTP/1.1"
+    And the result "headers" should have "User-Agent" with "cucumber"
+    

data/features/step_definitions/parser_steps.rb

@@ -0,0 +1,23 @@
+Given /^a parser$/ do
+  @parser = Yarn::Parser.new
+end
+
+When /^I feed the request to the parser$/ do
+  @result = @parser.run(@request)
+end
+
+Given /^a HTTP request "([^"]*)"$/ do |req|
+  @request = req.gsub('\\r\\n') { "\r\n" }
+end
+
+Then /^the result "([^"]*)" should be "([^"]*)"$/ do |key, value|
+  @result[key.to_sym].to_s.should == value
+end
+
+Then /^the result "([^"]*)" should include "([^"]*)" with "([^"]*)"$/ do |outer_key, inner_key, value|
+  @result[outer_key.to_sym][inner_key.to_sym].to_s.should == value
+end
+
+Then /^the result "([^"]*)" should have "([^"]*)" with "([^"]*)"$/ do |outer_key, inner_key, value|
+  @result[outer_key.to_sym][inner_key].to_s.should == value
+end

data/lib/yarn/abstract_handler.rb

@@ -53,12 +53,16 @@ module Yarn
     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
+      begin
+        @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
+      rescue Exception => exception
+        log "An error occured returning the response to the client"
       end
     end
 
@@ -110,7 +114,11 @@ module Yarn
     end
 
     def client_address
-      @session.peeraddr(:numeric)[2] if @session
+      begin
+        @session.peeraddr(:numeric)[2] if @session
+      rescue Errno::ENOTCONN
+        return ""
+      end
     end
   end
 end

data/lib/yarn/rack_handler.rb

@@ -17,6 +17,7 @@ module Yarn
       begin
         make_env
         @response.content = @app.call(@env)
+        @response.body.close if @response.body.respond_to?("close")
       rescue Exception => e
         log e.message
         log e.backtrace
@@ -38,7 +39,7 @@ module Yarn
         "rack.input"        => input,
         "rack.version"      => Rack::VERSION,
         "rack.errors"       => $output,
-        "rack.multithread"  => true,
+        "rack.multithread"  => false,
         "rack.multiprocess" => true,
         "rack.run_once"     => false,
         "rack.url_scheme"   => "http"
@@ -50,7 +51,6 @@ module Yarn
 
     def has_body?
       value ||= !! @request[:body]
-      value
     end
 
   end

data/lib/yarn/server.rb

@@ -4,6 +4,16 @@ module Yarn
   class Server
 
     include Logging
+    include Socket::Constants
+    
+    # TCP optimizations
+    TCP_OPTS = [ 
+      # delays accepting connections until clients send data
+      [Socket::SOL_TCP, TCP_DEFER_ACCEPT, 1],
+      # send ACK flags in their own packets (faster)
+      [Socket::SOL_TCP, TCP_QUICKACK, 1],
+      # set maximum number of
+    ]
 
     attr_accessor :host, :port, :socket, :workers
 
@@ -41,6 +51,8 @@ module Yarn
     def start
       trap("INT") { stop }
       @socket = TCPServer.new(@host, @port)
+      @socket.listen(1024)
+      ::BasicSocket.do_not_reverse_lookup=true
       log "Yarn started #{@num_workers} workers and is listening on #{@host}:#{@port}"
 
       init_workers
@@ -49,10 +61,12 @@ module Yarn
       Process.waitall
     end
 
+    def configure_socket
+      TCP_OPTS.each { |opt| @session.setsockopt(*opt) }
+    end
+
     def init_workers
-      @num_workers.times do
-        @workers << fork_worker
-      end
+      @num_workers.times { @workers << fork_worker }
     end
 
     def fork_worker
@@ -61,13 +75,18 @@ module Yarn
 
     def worker
       trap("INT") { exit }
+      handler = get_handler
       loop do
-        @handler ||= @app ? RackHandler.new(@app,@opts) : RequestHandler.new
-        session = @socket.accept
-        @handler.run session 
+        @session = @socket.accept
+        configure_socket
+        handler.run @session
       end
     end
 
+    def get_handler
+      @app ? RackHandler.new(@app,@opts) : RequestHandler.new
+    end
+
     def stop
       @socket.close if (@socket && !@socket.closed?)
 

data/lib/yarn/version.rb

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

data/spec/yarn/abstract_handler_spec.rb

@@ -85,8 +85,14 @@ module Yarn
           @handler.run(@session)
         end
       end
-    end
 
+      describe "#client_address" do
+        it "should return the clients address" do
+          @handler.session.stub(:peeraddr).and_return([nil,nil,"some_host"])
 
+          @handler.client_address.should == "some_host"
+        end
+      end 
+    end
   end
 end

data/spec/yarn/server_spec.rb

@@ -8,6 +8,11 @@ module Yarn
     end
 
     describe "#new" do
+      it "should set the app if parameter is given" do
+        @server = Server.new({ rack: "test_objects/config.ru" })
+
+        @server.instance_variable_get("@app").should_not be_nil
+      end
     end
 
     describe "#load_rack_app" do
@@ -47,6 +52,40 @@ module Yarn
       end
     end
 
+    describe "#worker" do
+      it "should start the handler" do
+        # modify loop to only run once
+        class Yarn::Server
+          private
+          def loop
+            yield
+          end
+        end
+        @server = Server.new
+        @server.stub(:init_workers)
+        @server.stub(:configure_socket)
+        @server.socket.stub(:accept).and_return("GET / HTTP/1.1")
+
+        RequestHandler.any_instance.should_receive(:run)
+
+        @server.worker
+      end
+    end
+
+    describe "#get_handler" do
+      it "should return the RequestHandler if an app is not given" do
+        @server = Server.new
+
+        @server.get_handler.class.should == RequestHandler
+      end
+
+      it "should return the Rackhandler if an app is given" do
+        @server = Server.new(rack: "test_objects/config.ru")
+
+        @server.get_handler.class.should == RackHandler
+      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', '~> 0.1'
+gem 'yarn'
 gem 'pry'
 
 # Gems used only for assets and not required

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarn
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000 Z
+date: 2011-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &12100240 !ruby/object:Gem::Requirement
+  requirement: &23448020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *12100240
+  version_requirements: *23448020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &12099740 !ruby/object:Gem::Requirement
+  requirement: &23447520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *12099740
+  version_requirements: *23447520
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12099280 !ruby/object:Gem::Requirement
+  requirement: &23447040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *12099280
+  version_requirements: *23447040
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &12098900 !ruby/object:Gem::Requirement
+  requirement: &23446660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12098900
+  version_requirements: *23446660
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &12098440 !ruby/object:Gem::Requirement
+  requirement: &23446200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12098440
+  version_requirements: *23446200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12098020 !ruby/object:Gem::Requirement
+  requirement: &23445780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12098020
+  version_requirements: *23445780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12097600 !ruby/object:Gem::Requirement
+  requirement: &23445360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12097600
+  version_requirements: *23445360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &12097180 !ruby/object:Gem::Requirement
+  requirement: &23444940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12097180
+  version_requirements: *23444940
 description: A multi-process web-server written in Ruby 1.9.
 email:
 - jkjeldgaard@gmail.com
@@ -118,14 +118,15 @@ files:
 - Rakefile
 - bin/yarn
 - cucumber.yml
-- doc/lib/yarn.html
 - features/concurrency.feature
 - features/dynamic_request.feature
 - features/logger.feature
+- features/parser.feature
 - features/rack.feature
 - features/server.feature
 - features/static_request.feature
 - features/step_definitions/concurrency_steps.rb
+- features/step_definitions/parser_steps.rb
 - features/step_definitions/rack_steps.rb
 - features/step_definitions/server_steps.rb
 - features/step_definitions/web_steps.rb