thin 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,5 +1,12 @@
+== 0.8.1 Rebel Porpoise release
+ * [bug] Rescue all types of errors when processing request, fixes #62
+ * [bug] Use Swiftiply backend when -y option is specified, fixes #63 and #64
+ * Allow passing port as a string in Server.new
+ * Define deferred?(env) in your Rack application to set if a request is handled in a
+	 thread (return true) or not (return false).
+
 == 0.8.0 Dodgy Dentist release
- * Fix server crash when header too large.
+ * [bug] Fix server crash when header too large.
  * Add --require (-r) option to require a library, before executing your script.
  * Rename --rackup short option to -R, warn and load as rackup when file ends with .ru.
  * List supported adapters in command usage.
@@ -7,7 +14,7 @@
  * Allow disabling signal handling in Server with :signals => false
  * Make Server.new arguments more flexible, can now specify any of host, port, app or hash options.
  * Add --backend option to specified which backend to use, closes #55
- * Serve static file only on GET and HEAD requests in Rails adapter, fixes #58
+ * [bug] Serve static file only on GET and HEAD requests in Rails adapter, fixes #58
  * Add threaded option to run server in threaded mode, calling the application in a
    thread allowing for concurrency in the Rack adapter, closes #46
  * Guess which adapter to use from directory (chdir option)

data/lib/thin/connection.rb

@@ -21,14 +21,12 @@ module Thin
     
     # Calling the application in a threaded allowing
     # concurrent processing of requests.
-    attr_accessor :threaded
+    attr_writer :threaded
     
     # Get the connection ready to process a request.
     def post_init
       @request  = Request.new
       @response = Response.new
-      
-      @request.threaded = threaded      
     end
     
     # Called when data is received from the client.
@@ -44,9 +42,11 @@ module Thin
     # Called when all data was received and the request
     # is ready to be processed.
     def process
-      if @threaded
+      if threaded?
+        @request.threaded = true
         EventMachine.defer(method(:pre_process), method(:post_process))
       else
+        @request.threaded = false
         post_process(pre_process)
       end
     end
@@ -57,7 +57,7 @@ module Thin
       
       # Process the request calling the Rack adapter
       @app.call(@request.env)
-    rescue
+    rescue Object
       handle_error
       terminate_request
       nil # Signal to post_process that the request could not be processed
@@ -80,7 +80,7 @@ module Thin
       # If no more request on that same connection, we close it.
       close_connection_after_writing unless persistent?
       
-    rescue
+    rescue Object
       handle_error
     ensure
       terminate_request
@@ -121,12 +121,19 @@ module Thin
     # and ready to be reused for another request.
     def persistent?
       @can_persist && @response.persistent?
-    end    
+    end
+    
+    # +true+ if <tt>app.call</tt> will be called inside a thread.
+    # You can set all requests as threaded setting <tt>Connection#threaded=true</tt>
+    # or on a per-request case returning +true+ in <tt>app.deferred?</tt>.
+    def threaded?
+      @threaded || (@app.respond_to?(:deferred?) && @app.deferred?(@request.env))
+    end
     
     # IP Address of the remote client.
     def remote_address
       @request.forwarded_for || socket_address
-    rescue
+    rescue Object
       log_error
       nil
     end

data/lib/thin/controllers/controller.rb

@@ -35,15 +35,12 @@ module Thin
       end
     
       def start
-        # Select proper backend
-        server = case
-        when @options.has_key?(:backend)
-          Server.new(@options[:address], @options[:port], :backend => eval(@options[:backend], TOPLEVEL_BINDING))
-        when @options.has_key?(:socket)
-          Server.new(@options[:socket])
-        else
-          Server.new(@options[:address], @options[:port])
-        end
+        # Constantize backend class
+        @options[:backend] = eval(@options[:backend], TOPLEVEL_BINDING) if @options[:backend]
+        
+        server = Server.new(@options[:socket] || @options[:address], # Server detects kind of socket
+                            @options[:port],                         # Port ignored on UNIX socket
+                            @options)
         
         # Set options
         server.pid_file                       = @options[:pid]

data/lib/thin/server.rb

@@ -90,9 +90,9 @@ module Thin
       
       args.each do |arg|
         case arg
-        when String then host    = arg
-        when Fixnum then port    = arg
-        when Hash   then options = arg
+        when Fixnum, /^\d+$/ then port    = arg.to_i
+        when String          then host    = arg
+        when Hash            then options = arg
         else
           @app = arg if arg.respond_to?(:call)
         end

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 8
-    TINY     = 0
+    TINY     = 1
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Dodgy Dentist'
+    CODENAME = 'Rebel Porpoise'
     
     RACK     = [0, 3].freeze # Latest Rack version that was tested
   end

data/spec/connection_spec.rb

@@ -30,6 +30,16 @@ describe Connection do
     @connection.process
   end
   
+  it "should rescue error in process" do
+    @connection.app.should_receive(:call).and_raise(StandardError)
+    @connection.process
+  end
+  
+  it "should rescue Timeout error in process" do
+    @connection.app.should_receive(:call).and_raise(Timeout::Error.new("timeout error not rescued"))
+    @connection.process
+  end
+  
   it "should return HTTP_X_FORWARDED_FOR as remote_address" do
     @connection.request.env['HTTP_X_FORWARDED_FOR'] = '1.2.3.4'
     @connection.remote_address.should == '1.2.3.4'
@@ -71,9 +81,25 @@ describe Connection do
   end
   
   it "should set request env as rack.multithread" do
+    EventMachine.should_receive(:defer)
+    
     @connection.threaded = true
-    @connection.post_init
+    @connection.process
     
     @connection.request.env["rack.multithread"].should == true
   end
+  
+  it "should set as threaded when app.deferred? is true" do
+    @connection.app.should_receive(:deferred?).and_return(true)
+    @connection.should be_threaded
+  end
+  
+  it "should not set as threaded when app.deferred? is false" do
+    @connection.app.should_receive(:deferred?).and_return(false)
+    @connection.should_not be_threaded
+  end
+
+  it "should not set as threaded when app do not respond to deferred?" do
+    @connection.should_not be_threaded
+  end
 end

data/spec/controllers/controller_spec.rb

@@ -16,7 +16,7 @@ describe Controller, 'start' do
     @server = OpenStruct.new
     @adapter = OpenStruct.new
     
-    Server.should_receive(:new).with('0.0.0.0', 3000).and_return(@server)
+    Server.should_receive(:new).with('0.0.0.0', 3000, @controller.options).and_return(@server)
     @server.should_receive(:config)
     Rack::Adapter::Rails.stub!(:new).and_return(@adapter)
   end

data/spec/server_spec.rb

@@ -81,6 +81,14 @@ describe Server, "initialization" do
     server.backend.should be_kind_of(Thin::Backends::SwiftiplyClient)
   end
   
+  it "should set port as string" do
+    app = proc {}
+    server = Server.new('192.168.1.1', '8080')
+    
+    server.host.should == '192.168.1.1'
+    server.port.should == 8080
+  end
+  
   it "should not register signals w/ :signals => false" do
     Server.should_not_receive(:setup_signals)
     Server.new(:signals => false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-06 00:00:00 -04:00
+date: 2008-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,6 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
-- lib/thin_backend.bundle
 - lib/thin_parser.bundle
 - spec/backends
 - spec/backends/swiftiply_client_spec.rb