thin 0.7.0 → 0.7.1

data/tasks/gem.rake

@@ -1,5 +1,7 @@
 require 'rake/gempackagetask'
 
+WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'x86-mswin32-60'
+
 task :clean => :clobber_package
 
 spec = Gem::Specification.new do |s|
@@ -11,17 +13,21 @@ spec = Gem::Specification.new do |s|
   s.author                = "Marc-Andre Cournoyer"
   s.email                 = 'macournoyer@gmail.com'
   s.homepage              = 'http://code.macournoyer.com/thin/'
+  s.rubyforge_project     = 'thin'
+  s.has_rdoc              = true
   s.executables           = %w(thin)
 
-  s.required_ruby_version = '>= 1.8.6' # Makes sure the CGI eof fix is there
+  s.required_ruby_version = '>= 1.8.5'
   
   s.add_dependency        'rack',         '>= 0.2.0'
-  s.add_dependency        'eventmachine', '>= 0.8.1'
-  unless WIN
+  if WIN
+    s.add_dependency      'eventmachine', '>= 0.8.1'
+  else
     s.add_dependency      'daemons',      '>= 1.0.9'
+    s.add_dependency      'eventmachine', '>= 0.10.0' # TODO '>= 0.11.0' when it's released
   end
 
-  s.files                 = %w(COPYING CHANGELOG README Rakefile) +
+  s.files                 = %w(COPYING CHANGELOG COMMITTERS README Rakefile) +
                             Dir.glob("{benchmark,bin,doc,example,lib,spec,tasks}/**/*") + 
                             Dir.glob("ext/**/*.{h,c,rb,rl}")
   
@@ -63,7 +69,7 @@ namespace :gem do
   namespace :upload do
     desc 'Upload the precompiled win32 gem to code.macournoyer.com'
     task :win do
-      upload "pkg/#{spec.full_name}-x86-mswin32-60.gem", 'gems'
+      upload "pkg/#{spec.full_name}-#{WIN_SUFFIX}.gem", 'gems'
       system 'ssh macournoyer@macournoyer.com "cd code.macournoyer.com && gem generate_index"'
     end    
 
@@ -72,14 +78,14 @@ namespace :gem do
       sh 'rubyforge login'
       sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
       sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
-      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-x86-mswin32-60.gem"
+      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-#{WIN_SUFFIX}.gem"
     end
   end
   
   desc 'Download the Windows gem from Kevin repo'
   task 'download:win' => 'pkg' do
     cd 'pkg' do
-      `wget http://rubygems.bantamtech.com/ruby18/gems/#{spec.full_name}-x86-mswin32-60.gem`
+      `wget http://rubygems.bantamtech.com/ruby18/gems/#{spec.full_name}-#{WIN_SUFFIX}.gem`
     end
   end
 end

data/tasks/spec.rake

@@ -1,19 +1,19 @@
 CLEAN.include %w(coverage tmp log)
 
-if RUBY_1_9
+if RUBY_1_9 # RSpec not yet working w/ Ruby 1.9
   task :spec do
     warn 'RSpec not yet supporting Ruby 1.9, so cannot run the specs :('
   end
 else
-  # RSpec not yet working w/ Ruby 1.9
   require 'spec/rake/spectask'
   
   desc "Run all examples"
-  Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts = %w(-fs -c)
+    t.spec_files = FileList['spec/**/*_spec.rb'] - FileList['spec/perf/*_spec.rb']
     if WIN
       t.spec_files -= [
-          'spec/connectors/unix_server_spec.rb',
+          'spec/backends/unix_server_spec.rb',
           'spec/controllers/service_spec.rb',
           'spec/daemonizing_spec.rb',
           'spec/server/unix_socket_spec.rb',
@@ -21,15 +21,20 @@ else
           ]
     end
   end
+  task :spec => :compile
   
-  task :check_spec_gems do
+  desc "Run all performance examples"
+  Spec::Rake::SpecTask.new('spec:perf') do |t|
+    t.spec_files = FileList['spec/perf/*_spec.rb']
+  end
+  
+  task :check_benchmark_unit_gem do
     begin
-      require 'spec'
       require 'benchmark_unit'
     rescue LoadError
-      abort "To run specs, install rspec and benchmark_unit gems"
+      abort "To run specs, install benchmark_unit gem"
     end
   end
   
-  task :spec => [:check_spec_gems, :compile]
+  task 'spec:perf' => :check_benchmark_unit_gem
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-24 00:00:00 -05:00
+date: 2008-03-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,22 +22,22 @@ dependencies:
         version: 0.2.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: daemons
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 1.0.9
     version: 
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: eventmachine
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.9
+        version: 0.10.0
     version: 
 description: A thin and fast web server
 email: macournoyer@gmail.com
@@ -50,6 +50,7 @@ extra_rdoc_files: []
 files: 
 - COPYING
 - CHANGELOG
+- COMMITTERS
 - README
 - Rakefile
 - benchmark/abc
@@ -70,13 +71,13 @@ files:
 - lib/rack/handler
 - lib/rack/handler/thin.rb
 - lib/thin
+- lib/thin/backends
+- lib/thin/backends/base.rb
+- lib/thin/backends/swiftiply_client.rb
+- lib/thin/backends/tcp_server.rb
+- lib/thin/backends/unix_server.rb
 - lib/thin/command.rb
 - lib/thin/connection.rb
-- lib/thin/connectors
-- lib/thin/connectors/connector.rb
-- lib/thin/connectors/swiftiply_client.rb
-- lib/thin/connectors/tcp_server.rb
-- lib/thin/connectors/unix_server.rb
 - lib/thin/controllers
 - lib/thin/controllers/cluster.rb
 - lib/thin/controllers/controller.rb
@@ -94,15 +95,15 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
+- spec/backends
+- spec/backends/swiftiply_client_spec.rb
+- spec/backends/tcp_server_spec.rb
+- spec/backends/unix_server_spec.rb
 - spec/command_spec.rb
 - spec/configs
 - spec/configs/cluster.yml
 - spec/configs/single.yml
 - spec/connection_spec.rb
-- spec/connectors
-- spec/connectors/swiftiply_client_spec.rb
-- spec/connectors/tcp_server_spec.rb
-- spec/connectors/unix_server_spec.rb
 - spec/controllers
 - spec/controllers/cluster_spec.rb
 - spec/controllers/controller_spec.rb
@@ -110,6 +111,10 @@ files:
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
 - spec/logging_spec.rb
+- spec/perf
+- spec/perf/request_perf_spec.rb
+- spec/perf/response_perf_spec.rb
+- spec/perf/server_perf_spec.rb
 - spec/rack_rails_spec.rb
 - spec/rails_app
 - spec/rails_app/app
@@ -173,7 +178,6 @@ files:
 - spec/request
 - spec/request/mongrel_spec.rb
 - spec/request/parser_spec.rb
-- spec/request/perf_spec.rb
 - spec/request/persistent_spec.rb
 - spec/request/processing_spec.rb
 - spec/response_spec.rb
@@ -204,7 +208,7 @@ files:
 - ext/thin_parser/extconf.rb
 - ext/thin_parser/common.rl
 - ext/thin_parser/parser.rl
-has_rdoc: false
+has_rdoc: true
 homepage: http://code.macournoyer.com/thin/
 post_install_message: 
 rdoc_options: []
@@ -215,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
+      version: 1.8.5
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -225,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: thin
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2

data/lib/thin/connectors/connector.rb

@@ -1,73 +0,0 @@
-module Thin
-  module Connectors
-    # A Connector connect the server to the client. It handles:
-    # * connection/disconnection to the server
-    # * initialization of the connections
-    # * manitoring of the active connections.
-    class Connector      
-      # Server serving the connections throught the connector
-      attr_accessor :server
-      
-      # Maximum time for incoming data to arrive
-      attr_accessor :timeout
-      
-      # Maximum number of connections that can be persistent
-      attr_accessor :maximum_persistent_connections
-      
-      # Number of persistent connections currently opened
-      attr_accessor :persistent_connection_count
-      
-      def initialize
-        @connections                    = []
-        @timeout                        = Server::DEFAULT_TIMEOUT
-        @persistent_connection_count    = 0
-        @maximum_persistent_connections = Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
-      end
-            
-      # Free up resources used by the connector.
-      def close
-      end
-      
-      def running?
-        @server.running?
-      end
-            
-      # Initialize a new connection to a client.
-      def initialize_connection(connection)
-        connection.connector               = self
-        connection.app                     = @server.app
-        connection.comm_inactivity_timeout = @timeout
-        
-        # We control the number of persistent connections by keeping
-        # a count of the total one allowed yet.
-        if @persistent_connection_count < @maximum_persistent_connections
-          connection.can_persist!
-          @persistent_connection_count += 1
-        end
-
-        @connections << connection
-      end
-      
-      # Close all active connections.
-      def close_connections
-        @connections.each { |connection| connection.close_connection }
-      end
-      
-      # Called by a connection when it's unbinded.
-      def connection_finished(connection)
-        @persistent_connection_count -= 1 if connection.can_persist?
-        @connections.delete(connection)
-      end
-      
-      # Returns +true+ if no active connection.
-      def empty?
-        @connections.empty?
-      end
-      
-      # Number of active connections.
-      def size
-        @connections.size
-      end
-    end
-  end
-end

data/spec/connectors/unix_server_spec.rb

@@ -1,43 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Connectors::UnixServer do
-  before do
-    @connector = Connectors::UnixServer.new('/tmp/thin-test.sock')
-  end
-  
-  it "should connect" do
-    EventMachine.run do
-      @connector.connect
-      EventMachine.stop
-    end
-  end
-  
-  it "should disconnect" do
-    EventMachine.run do
-      @connector.connect
-      @connector.disconnect
-      EventMachine.stop
-    end
-  end
-  
-  it "should remove socket file on close" do
-    @connector.close
-    File.exist?('/tmp/thin-test.sock').should be_false
-  end
-end
-
-describe UnixConnection do
-  before do
-    @connection = UnixConnection.new(nil)
-  end
-  
-  it "should return nil on error retreiving remote_address" do
-    @connection.stub!(:get_peername).and_raise(RuntimeError)
-    @connection.remote_address.should be_nil
-  end
-  
-  it "should return remote_address" do
-    @connection.stub!(:get_peername).and_return("\000\001127.0.0.1\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000")
-    @connection.remote_address.should == '127.0.0.1'
-  end
-end