thin 0.8.2 → 1.0.0

data/spec/server/stopping_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Server, "stopping" do
   before do
     start_server do |env|
-      [200, { 'Content-Type' => 'text/html', 'Content-Length' => '2' }, ['ok']]
+      [200, { 'Content-Type' => 'text/html' }, ['ok']]
     end
   end
   

data/spec/server/swiftiply_spec.rb

@@ -12,7 +12,7 @@ else
       sleep 2 # HACK ooh boy, I wish I knew how to make those specs more stable...
       start_server('0.0.0.0', 5555, :backend => Backends::SwiftiplyClient, :wait_for_socket => false) do |env|
         body = env.inspect + env['rack.input'].read
-        [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+        [200, { 'Content-Type' => 'text/html' }, body]
       end
     end
     

data/spec/server/tcp_spec.rb

@@ -4,19 +4,30 @@ describe Server, 'on TCP socket' do
   before do
     start_server do |env|
       body = env.inspect + env['rack.input'].read
-      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+      [200, { 'Content-Type' => 'text/html' }, body]
     end
   end
-    
+  
   it 'should GET from Net::HTTP' do
     get('/?cthis').should include('cthis')
   end
   
   it 'should GET from TCPSocket' do
-    send_data("GET /?this HTTP/1.1\r\nConnection: close\r\n\r\n").
-      should include("HTTP/1.1 200 OK",
-                     "Content-Type: text/html", "Content-Length: ",
-                     "Connection: close", "this")
+    status, headers, body = parse_response(send_data("GET /?this HTTP/1.0\r\nConnection: close\r\n\r\n"))
+    status.should == 200
+    headers['Content-Type'].should == 'text/html'
+    headers['Connection'].should == 'close'
+    body.should include('this')
+  end
+  
+  it "should add the Content-Length to the response when not present" do
+    status, headers, body = parse_response(send_data("GET / HTTP/1.0\r\nConnection: close\r\n\r\n"))
+    headers.should have_key('Content-Length')
+  end
+  
+  it 'should set the Content-Length to equal the body size in bytes' do
+    status, headers, body = parse_response(send_data("GET / HTTP/1.0\r\nConnection: close\r\n\r\n"))
+    headers['Content-Length'].should == (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
   end
   
   it 'should return empty string on incomplete headers' do
@@ -35,7 +46,7 @@ describe Server, 'on TCP socket' do
     big = 'X' * (20 * 1024)
     post('/', :big => big).should include(big)
   end
-    
+  
   it "should retreive remote address" do
     get('/').should include('"REMOTE_ADDR"=>"127.0.0.1"')
   end

data/spec/server/threaded_spec.rb

@@ -6,7 +6,7 @@ describe Server, 'with threads' do
     start_server DEFAULT_TEST_ADDRESS, DEFAULT_TEST_PORT, :threaded => true do |env|
       sleep env['PATH_INFO'].delete('/').to_i
       @requests += 1
-      [200, { 'Content-Type' => 'text/html', 'Content-Length' => '2' }, 'hi']
+      [200, { 'Content-Type' => 'text/html' }, 'hi']
     end
   end
   

data/spec/server/unix_socket_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Server, "on UNIX domain socket" do
   before do
     start_server('/tmp/thin_test.sock') do |env|
-      [200, { 'Content-Type' => 'text/html', 'Content-Length' => env.inspect.size.to_s }, [env.inspect]]
+      [200, { 'Content-Type' => 'text/html' }, [env.inspect]]
     end
   end
   

data/spec/spec_helper.rb

@@ -190,6 +190,16 @@ module Helpers
     out
   end
   
+  def parse_response(response)
+    raw_headers, body = response.split("\r\n\r\n", 2)
+    raw_status, raw_headers = raw_headers.split("\r\n", 2)
+
+    status  = raw_status.match(%r{\AHTTP/1.1\s+(\d+)\b}).captures.first.to_i
+    headers = Hash[ *raw_headers.split("\r\n").map { |h| h.split(/:\s+/, 2) }.flatten ]
+
+    [ status, headers, body ]
+  end
+  
   def get(url)
     if @server.backend.class == Backends::UnixServer
       send_data("GET #{url} HTTP/1.1\r\nConnection: close\r\n\r\n")

data/tasks/announce.rake

@@ -1,7 +1,7 @@
 require 'erb'
 
 MSG_TEMPLATE = File.dirname(__FILE__) + '/email.erb'
-SEND_TO      = %w(thin-ruby@googlegroups.com eventmachine-talk@rubyforge.org ruby-talk@ruby-lang.org montreal-on-rails@googlegroups.com)
+SEND_TO      = %w(thin-ruby@googlegroups.com ruby-talk@ruby-lang.org)
 
 desc 'Generate a template for the new version annoucement'
 task :ann do

data/tasks/deploy.rake

@@ -11,6 +11,6 @@ desc 'Deploy on all servers'
 task :deploy => %w(deploy:alpha deploy:public)
 
 def upload(file, to, options={})
-  sh %{ssh macournoyer@macournoyer.com "rm -rf code.macournoyer.com/#{to}"} if options[:replace]
-  sh %{scp -rq #{file} macournoyer@macournoyer.com:code.macournoyer.com/#{to}}
+  sh %{ssh macournoyer@code.macournoyer.com "rm -rf code.macournoyer.com/#{to}"} if options[:replace]
+  sh %{scp -rq #{file} macournoyer@code.macournoyer.com:code.macournoyer.com/#{to}}
 end

data/tasks/email.erb

@@ -15,10 +15,6 @@ Install Thin from RubyForge:
 Or using my mirror:
 
  gem install thin --source http://code.macournoyer.com
- 
-To use Thin with UNIX domain sockets you need EventMachine 0.11.0 from my gem server:
-
- gem install eventmachine --source http://code.macournoyer.com
 
 == Contribute
 

data/tasks/gem.rake

@@ -61,14 +61,14 @@ namespace :gem do
   desc 'Upload gem to code.macournoyer.com'
   task :upload => :gem do
     upload "pkg/#{spec.full_name}.gem", 'gems'
-    system 'ssh macournoyer@macournoyer.com "cd code.macournoyer.com && gem generate_index"'
+    system 'ssh macournoyer@code.macournoyer.com "cd code.macournoyer.com && gem generate_index"'
   end
   
   namespace :upload do
     desc 'Upload the precompiled win32 gem to code.macournoyer.com'
     task :win do
       upload "pkg/#{spec.full_name}-#{WIN_SUFFIX}.gem", 'gems'
-      system 'ssh macournoyer@macournoyer.com "cd code.macournoyer.com && gem generate_index"'
+      system 'ssh macournoyer@code.macournoyer.com "cd code.macournoyer.com && gem generate_index"'
     end    
 
     desc 'Upload gems (ruby & win32) to rubyforge.org'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-24 00:00:00 -04:00
+date: 2008-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -98,7 +101,6 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
-- lib/thin_parser.bundle
 - spec/backends
 - spec/backends/swiftiply_client_spec.rb
 - spec/backends/tcp_server_spec.rb
@@ -238,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thin
-rubygems_version: 1.1.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A thin and fast web server