From 9435f79ce66e335b22af1b033fe072bb5bf27691 Mon Sep 17 00:00:00 2001
From: Yuki Nishijima <mail@yukinishijima.net>
Date: Tue, 3 Dec 2013 11:29:29 +0900
Subject: [PATCH] Remove unneeded dependencies and fix sinatra specs for Ruby
 1.8

---
 gemfiles/mongoid_30.gemfile | 3 ---
 gemfiles/mongoid_31.gemfile | 3 ---
 gemfiles/sinatra_13.gemfile | 9 ++++++---
 gemfiles/sinatra_14.gemfile | 9 ++++++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gemfiles/mongoid_30.gemfile b/gemfiles/mongoid_30.gemfile
index eb620d2..de99236 100644
--- a/gemfiles/mongoid_30.gemfile
+++ b/gemfiles/mongoid_30.gemfile
@@ -5,8 +5,5 @@ gem 'mongoid', '~> 3.0.0'
 gem 'rspec-rails', '>= 2.0'
 gem 'origin'
 gem 'moped'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
 
 gemspec :path => '../'
diff --git a/gemfiles/mongoid_31.gemfile b/gemfiles/mongoid_31.gemfile
index a08b304..e4f594a 100644
--- a/gemfiles/mongoid_31.gemfile
+++ b/gemfiles/mongoid_31.gemfile
@@ -5,8 +5,5 @@ gem 'mongoid', '~> 3.1.0'
 gem 'rspec-rails', '>= 2.0'
 gem 'origin'
 gem 'moped'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
 
 gemspec :path => '../'
diff --git a/gemfiles/sinatra_13.gemfile b/gemfiles/sinatra_13.gemfile
index 1921823..5c5105d 100644
--- a/gemfiles/sinatra_13.gemfile
+++ b/gemfiles/sinatra_13.gemfile
@@ -8,9 +8,12 @@ gem 'tilt', '~> 1.3.0'
 gem 'padrino-helpers', '~> 0.10.6'
 gem 'rack-test', '>= 0'
 gem 'sinatra-contrib', '~> 1.3.0'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+# stick to versions that work under Ruby 1.8 for now
+gem 'mime-types', '< 2.0'
+gem 'nokogiri', '< 1.6'
+gem 'capybara', '< 2.1'
+gem 'rubyzip', '< 1'
 
 platforms :ruby, :rbx do
   gem 'sqlite3'
diff --git a/gemfiles/sinatra_14.gemfile b/gemfiles/sinatra_14.gemfile
index 4b572d3..ff87ed9 100644
--- a/gemfiles/sinatra_14.gemfile
+++ b/gemfiles/sinatra_14.gemfile
@@ -8,9 +8,12 @@ gem 'tilt', '~> 1.3.0'
 gem 'padrino-helpers', '~> 0.11.3'
 gem 'rack-test', '>= 0'
 gem 'sinatra-contrib', '~> 1.4.0'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
+
+# stick to versions that work under Ruby 1.8 for now
+gem 'mime-types', '< 2.0'
+gem 'nokogiri', '< 1.6'
+gem 'capybara', '< 2.1'
+gem 'rubyzip', '< 1'
 
 platforms :ruby, :rbx do
   gem 'sqlite3'