From cbd26a803b78f7309d101fc112e40254f60262a5 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sun, 30 Sep 2012 00:26:45 -0500
Subject: [PATCH] Use Rack::Cache middleware only if is in Gemfile

---
 Gemfile                           | 1 +
 actionpack/actionpack.gemspec     | 1 -
 railties/lib/rails/application.rb | 6 ++++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index d149ec6129..a2ebd579da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ gem 'arel', github: 'rails/arel', branch: 'master'
 
 gem 'mocha', '>= 0.11.2', :require => false
 gem 'rack-test', github: 'brynary/rack-test'
+gem 'rack-cache', "~> 1.2"
 gem 'bcrypt-ruby', '~> 3.0.0'
 gem 'jquery-rails'
 
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index fd09d3b55b..7d292ac17c 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency('activesupport', version)
-  s.add_dependency('rack-cache',    '~> 1.2')
   s.add_dependency('builder',       '~> 3.1.0')
   s.add_dependency('rack',          '~> 1.4.1')
   s.add_dependency('rack-test',     '~> 0.6.1')
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 050190cba6..0b9ed025db 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -282,6 +282,12 @@ module Rails
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
         app = self
         if rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
+          begin
+            require 'rack/cache'
+          rescue LoadError => error
+            error.message << ' Be sure to add rack-cache to your Gemfile'
+            raise
+          end
           require "action_dispatch/http/rack_cache"
           middleware.use ::Rack::Cache, rack_cache
         end