From 07e898f26b7423a787cde00bf930295dde4c990c Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Fri, 29 Oct 2010 13:20:37 -0700
Subject: [PATCH] Update sinatra dependency; loosen rack version constraint

---
 Gemfile         |  2 +-
 Gemfile.lock    | 12 +++++++-----
 faraday.gemspec |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2bc23791..a1c3bf6a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source "http://rubygems.org"
 # and rake tasks are available in development mode:
 group :development, :test do
   gem 'patron', '~> 0.4'
-  gem 'sinatra', '~> 1.0'
+  gem 'sinatra', '~> 1.1'
   gem 'typhoeus', '~> 0.1'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4f5adfe0..3f019e6f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,7 +4,7 @@ PATH
     faraday (0.5.1)
       addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
-      rack (~> 1.2.1)
+      rack (>= 1.1.0, < 2)
 
 GEM
   remote: http://rubygems.org/
@@ -14,8 +14,10 @@ GEM
     patron (0.4.9)
     rack (1.2.1)
     rake (0.8.7)
-    sinatra (1.0)
-      rack (>= 1.0)
+    sinatra (1.1.0)
+      rack (~> 1.1)
+      tilt (~> 1.1)
+    tilt (1.1)
     typhoeus (0.1.31)
       rack
 
@@ -27,7 +29,7 @@ DEPENDENCIES
   faraday!
   multipart-post (~> 1.0.1)
   patron (~> 0.4)
-  rack (~> 1.2.1)
+  rack (>= 1.1.0, < 2)
   rake (~> 0.8)
-  sinatra (~> 1.0)
+  sinatra (~> 1.1)
   typhoeus (~> 0.1)
diff --git a/faraday.gemspec b/faraday.gemspec
index 7456bfff..0af25b14 100644
--- a/faraday.gemspec
+++ b/faraday.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', '~> 0.8')
   s.add_runtime_dependency('addressable', '~> 2.2.2')
   s.add_runtime_dependency('multipart-post', '~> 1.0.1')
-  s.add_runtime_dependency('rack', '~> 1.2.1')
+  s.add_runtime_dependency('rack', ['>= 1.1.0', "< 2"])
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE