rity 0.0.2 → 0.0.3

data/README.md

@@ -6,11 +6,9 @@ Rity is a lightweight Ruby webserver that runs inside an EventMachine loop and p
 TODO
 ----
 
-- Command Line Interface
-- Let Request handle parsing and building errors
-- More robust error handling in general
 - Proxying via EM.enable_proxy
 - Rack Handler
 - Support for keep-alive connections
 - Investigate MVM support in JRuby/Rubinius/MRI
 - Support for SPDY
+- Investigate preforking and letting multiple EventMachine loops listen on a shared socket

data/lib/rity.rb

@@ -1,4 +1,3 @@
 require "rity/connection"
 require "rity/request"
-require "rity/server"
 require "rity/version"

data/lib/rity/cli.rb

@@ -1,9 +1,17 @@
 require "rity"
 require "thor"
 
+require "eventmachine"
+require "em-synchrony"
+require "rack"
+require "logger"
+
 module Rity
   class CLI < Thor
-    map "--version" => :version, "-v" => :version
+    map "--version" => :version
+    map "-v" => :version
+    
+    default_task :start
     
     desc :version, "Print version information"
     def version
@@ -11,9 +19,41 @@ module Rity
     end
     
     desc :start, "Start an instance of Rity"
+    method_option :bind, :aliases => "-b", :type => :string,
+      :banner => "Bind to the specified TCP interface (default: 127.0.0.1)"
+    method_option :port, :aliases => "-p", :type => :numeric,
+      :banner => "Bind to the specified port (default: 3000)"
+    method_option :rackup, :aliases => "-r", :type => :string,
+      :banner => "Load specified rackup (.ru) file (default: config.ru)"
+    method_option :quiet, :aliases => "-q", :type => :boolean,
+      :banner => "Don't log to stderr"
     def start
-      server = Rity::Server.new
-      server.start
+      address = options[:bind] || "127.0.0.1"
+      port = options[:port] || 3000
+      
+      rackup = options[:rackup] || "config.ru"
+      app = Rack::Builder.parse_file(rackup)[0]
+      
+      unless options[:quiet]
+        log = Logger.new($stderr)
+        log.formatter = proc do |severity, time, progname, message|
+          "[#{time}] #{severity}: #{message}\n"
+        end
+        
+        log.info("Binding to #{address}:#{port}")
+      end
+      
+      EM.synchrony do
+        trap("INT") { EM.stop }
+        trap("TERM") { EM.stop }
+        
+        EM.epoll
+        
+        EM.start_server(address, port, Connection) do |conn|
+          conn.app = app
+          conn.log = log if defined? log
+        end
+      end
     end
   end
 end

data/lib/rity/connection.rb

@@ -16,7 +16,7 @@ module Rity
           request = Request.new(@app, verb, url)
           request.log = log
           @requests.push(request)
-          @requests.last.callback &@responder.method(:resume)
+          @requests.last.callback &method(:write_responses)
         end
         
         p.on_header do |name, value|
@@ -33,6 +33,15 @@ module Rity
         
         p.on_complete do
           @requests.last.call
+          request = nil
+        end
+        
+        p.on_error do |e|
+          if request
+            request.error(e)
+          else
+            raise(e)
+          end
         end
       end
       
@@ -42,22 +51,29 @@ module Rity
         b.on_complete do
           close_connection_after_writing if @requests.empty?
         end
+        
+        b.on_error &method(:error)
       end
-      
-      @responder = Fiber.new do
-        loop do
-          while @requests[0] && @requests[0].response
-            request = @requests.shift
-            @builder.response(request.response)
-          end
-          Fiber.yield
-        end
+    end
+    
+    def write_responses
+      while requests[0] && requests[0].response
+        request = requests.shift
+        builder.response(request.response)
       end
     end
     
     def receive_data(data)
       @parser << data
-    rescue Exception
+    rescue Exception => e
+      error(e)
+    end
+    
+    def error(e)
+      if log
+        log.error(e.message)
+        log << e.backtrace.join("\n") + "\n"
+      end
       close_connection
     end
   end

data/lib/rity/request.rb

@@ -54,16 +54,23 @@ module Rity
     def postcall(response)
       return if @response || response[0] < 0
       @response = response
-      log.info("#{response[0]} - #{env["REQUEST_METHOD"]} #{env["REQUEST_URI"]}") if log
       succeed
     end
     
+    def error(e)
+      if log
+        log.error(e.message)
+        log << e.backtrace.join("\n") + "\n"
+      end
+      postcall [500, {"Content-Type" => "text/html"},
+        ["<h1>#{Hatetepe::STATUS_CODES[500]}</h1>"]]
+    end
+    
     def rescue_errors
       begin
         yield
-      rescue Exception
-        postcall([500, {"Content-Type" => "text/html"},
-          ["<h1>#{Hatetepe::STATUS_CODES[500]}</h1>"]])
+      rescue Exception => e
+        error(e)
       end
     end
   end

data/lib/rity/version.rb

@@ -1,3 +1,3 @@
 module Rity
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/rity.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
   
   s.add_development_dependency "rspec"
+  s.add_development_dependency "fakefs"
+  s.add_development_dependency "em-http-request"
 
   s.files         = `git ls-files`.split("\n") - [".gitignore"]
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/integration/start_spec.rb

@@ -0,0 +1,140 @@
+require "spec_helper"
+require "rity/cli"
+require "socket"
+require "em-synchrony/em-http"
+
+describe "start command" do
+  def hook_event_loop(&block)
+    EM.spec_hooks << block
+  end
+  
+  def add_stop_timer(timeout)
+    hook_event_loop do
+      EM.add_timer(timeout) { EM.stop }
+    end
+  end
+  
+  before do
+    $stderr = StringIO.new ""
+    
+    FakeFS.activate!
+    File.open("config.ru", "w") do |f|
+      f.write %q{run proc {|e| [200, {"Content-Type" => "text/plain"}, [e["REQUEST_URI"]]] }}
+    end
+    File.open("config2.ru", "w") do |f|
+      f.write %q{run proc {|e| [200, {"Content-Type" => "text/plain"}, ["config2.ru loaded"]] }}
+    end
+  end
+  
+  after do
+    $stderr = STDERR
+    
+    FakeFS.deactivate!
+    FakeFS::FileSystem.clear
+  end
+  
+  it "starts an instance of Rity" do
+    add_stop_timer 0.01
+    hook_event_loop do
+      Socket.tcp("127.0.0.1", 3000) {|*| }
+    end
+    Rity::CLI.start %w{}
+
+    $stderr.string.should include("127.0.0.1:3000")
+  end
+  
+  it "answers HTTP requests" do
+    add_stop_timer 0.02
+    hook_event_loop do
+      request = EM::HttpRequest.new("http://127.0.0.1:3000").aget
+      response = EM::Synchrony.sync(request)
+      
+      response.response_header.status.should == 200
+      response.response_header["CONTENT_TYPE"].should == "text/plain"
+      response.response.should == "/"
+    end
+    Rity::CLI.start %w{}
+  end
+  
+  describe "--port option" do
+    it "changes the listen port" do
+      add_stop_timer 0.01
+      hook_event_loop do
+        Socket.tcp("127.0.0.1", 3001) {|*| }
+      end
+      Rity::CLI.start %w{--port=3001}
+      
+      $stderr.string.should include(":3001")
+    end
+    
+    it "has an alias: -p" do
+      add_stop_timer 0.01
+      hook_event_loop do
+        Socket.tcp("127.0.0.1", 3002) {|*| }
+      end
+      Rity::CLI.start %w{-p 3002}
+      
+      $stderr.string.should include(":3002")
+    end
+  end
+  
+  describe "--bind option" do
+    it "changes the listen interface" do
+      add_stop_timer 0.01
+      hook_event_loop do
+        Socket.tcp("127.0.0.2", 3000) {|*| }
+      end
+      Rity::CLI.start %w{--bind=127.0.0.2}
+      
+      $stderr.string.should include("127.0.0.2:")
+    end
+    
+    it "has an alias: -b" do
+      add_stop_timer 0.01
+      hook_event_loop do
+        Socket.tcp("127.0.0.3", 3000) {|*| }
+      end
+      Rity::CLI.start %w{-b 127.0.0.3}
+      
+      $stderr.string.should include("127.0.0.3:")
+    end
+  end
+  
+  describe "--rackup option" do
+    it "changes the rackup file that'll be loaded" do
+      add_stop_timer 0.01
+      hook_event_loop do
+        request = EM::HttpRequest.new("http://127.0.0.1:3000").aget
+        response = EM::Synchrony.sync(request)
+        response.response.should include("config2.ru")
+      end
+      Rity::CLI.start %w{--rackup=config2.ru}
+    end
+    
+    it "has an alias: -r" do
+      add_stop_timer 0.01
+      hook_event_loop do
+        request = EM::HttpRequest.new("http://127.0.0.1:3000").aget
+        response = EM::Synchrony.sync(request)
+        response.response.should include("config2.ru")
+      end
+      Rity::CLI.start %w{-r config2.ru}
+    end
+  end
+  
+  describe "--quiet option" do
+    it "discards all output" do
+      add_stop_timer 0.01
+      Rity::CLI.start %w{--quiet}
+      
+      $stderr.string.should be_empty
+    end
+    
+    it "has an alias: -q" do
+      add_stop_timer 0.01
+      Rity::CLI.start %w{-q}
+      
+      $stderr.string.should be_empty
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,4 +3,40 @@ Bundler.setup :default
 
 require "rity"
 require "rspec"
-require "awesome_print"
+require "fakefs"
+
+begin
+  require "awesome_print"
+rescue LoadError; end
+
+require "em-synchrony"
+
+RSpec.configure do |config|
+  config.before do
+    EM.class_eval do
+      @spec_hooks = []
+      class << self
+        attr_reader :spec_hooks
+        def synchrony_with_hooks(blk = nil, tail = nil, &block)
+          synchrony_without_hooks do
+            (blk || block).call
+            @spec_hooks.each {|sh| sh.call }
+          end
+        end
+        alias_method :synchrony_without_hooks, :synchrony
+        alias_method :synchrony, :synchrony_with_hooks
+      end
+    end
+  end
+  
+  config.after do
+    EM.class_eval do
+      @spec_hooks = nil
+      class << self
+        remove_method :spec_hooks
+        alias_method :synchrony, :synchrony_without_hooks
+        remove_method :synchrony_with_hooks
+      end
+    end
+  end
+end

data/spec/unit/connection_spec.rb

@@ -38,7 +38,7 @@ describe Rity::Connection do
   end
   
   it "adds the responder as request's callback" do
-    @conn.responder.should_receive(:resume)
+    @conn.should_receive(:write_responses)
     @conn.parser.on_request[0].call("GET", "/")
     @conn.requests[0].succeed
   end
@@ -74,13 +74,13 @@ describe Rity::Connection do
       @conn.requests[0].stub(:response => response)
       
       @conn.builder.should_receive(:response).with(response)
-      @conn.responder.resume
+      @conn.write_responses
     end
     
     it "doesn't push the response until it's ready" do
       @conn.requests.push(Rity::Request.new(nil, nil, nil))
       @conn.builder.should_not_receive(:response)
-      @conn.responder.resume
+      @conn.write_responses
     end
     
     it "pushes responses in the order the resp. requests came in" do
@@ -91,20 +91,20 @@ describe Rity::Connection do
       request1.stub(:response => nil)
       request2.stub(:response => response2)
       @conn.builder.should_not_receive(:response)
-      @conn.responder.resume
+      @conn.write_responses
       
       request1.stub(:response => response1)
       request2.stub(:response => nil)
       @conn.builder.rspec_reset
       @conn.builder.should_receive(:response).with(response1)
-      @conn.responder.resume
+      @conn.write_responses
       
       @conn.requests.should_not include(request1)
       
       request2.stub(:response => response2)
       @conn.builder.rspec_reset
       @conn.builder.should_receive(:response).with(response2)
-      @conn.responder.resume
+      @conn.write_responses
       
       @conn.requests.should be_empty
     end

metadata

@@ -2,7 +2,7 @@
 name: rity
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lars Gierth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -89,6 +89,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: fakefs
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: Rity is a lightweight Ruby webserver that runs inside an EventMachine loop and puts each request into a fiber.
 email: 
 - lars.gierth@gmail.com
@@ -109,10 +131,10 @@ files:
 - lib/rity/cli.rb
 - lib/rity/connection.rb
 - lib/rity/request.rb
-- lib/rity/server.rb
 - lib/rity/version.rb
 - myapp.rb
 - rity.gemspec
+- spec/integration/start_spec.rb
 - spec/spec_helper.rb
 - spec/unit/connection_spec.rb
 - spec/unit/request_spec.rb
@@ -129,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 34399981
+      hash: -888247411
       segments: 
       - 0
       version: "0"
@@ -138,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 34399981
+      hash: -888247411
       segments: 
       - 0
       version: "0"

data/lib/rity/server.rb

@@ -1,27 +0,0 @@
-require "eventmachine"
-require "em-synchrony"
-require "logger"
-
-require "rity/connection"
-
-module Rity
-  class Server
-    def self.start(address, port, app)
-      EM.synchrony do
-        trap("INT") { EM.stop }
-        trap("TERM") { EM.stop }
-        
-        EM.epoll
-        
-        puts "Binding to #{address}:#{port}"
-        EM.start_server address, port, Connection do |conn|
-          conn.app = app
-          conn.log = Logger.new(STDERR)
-          conn.log.formatter = proc do |severity, time, progname, message|
-            "[#{time}] #{severity}: #{message}\n"
-          end
-        end
-      end
-    end
-  end
-end