From 7be3682605913102b2503e184fb4e4eacb252bcd Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <rtomayko@gmail.com>
Date: Sun, 31 Aug 2008 00:35:35 -0700
Subject: [PATCH] Rack 0.4 (remove vendor submodule)

Use Rack gem instead of freezing.
---
 .gitmodules         |  3 ---
 lib/sinatra.rb      | 10 ++--------
 test/events_test.rb |  5 +----
 test/helper.rb      |  9 ++++++---
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 396824f0..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "vendor/rack"]
-	path = vendor/rack
-	url = git://github.com/chneukirchen/rack-mirror.git
diff --git a/lib/sinatra.rb b/lib/sinatra.rb
index f249be30..65a85c4c 100755
--- a/lib/sinatra.rb
+++ b/lib/sinatra.rb
@@ -1,13 +1,7 @@
-Dir[File.dirname(__FILE__) + "/../vendor/*"].each do |l|
-  $:.unshift "#{File.expand_path(l)}/lib"
-end
-
-require 'rack'
-
-require 'rubygems'
 require 'time'
 require 'ostruct'
-require "uri"
+require 'uri'
+require 'rack'
 
 if ENV['SWIFT']
  require 'swiftcore/swiftiplied_mongrel'
diff --git a/test/events_test.rb b/test/events_test.rb
index 1ae211e6..5c1c1021 100644
--- a/test/events_test.rb
+++ b/test/events_test.rb
@@ -1,7 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/sinatra'
-
-require 'rubygems'
-require 'test/spec'
+require File.dirname(__FILE__) + '/helper'
 
 context "Simple Events" do
 
diff --git a/test/helper.rb b/test/helper.rb
index d8c7ddb4..5e3c989c 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,4 +1,7 @@
-require File.dirname(__FILE__) + "/../lib/sinatra"
-require File.dirname(__FILE__) + "/../lib/sinatra/test/spec"
+require 'rubygems'
+require 'mocha'
 
-require "mocha"
+$:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"
+
+require 'sinatra'
+require 'sinatra/test/spec'