diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-09-30 00:26:45 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-10-01 21:38:52 -0500 |
| commit | cbd26a803b78f7309d101fc112e40254f60262a5 (patch) | |
| tree | efae2ad2c307d86ff8510178b6b79cf2efb65f86 | |
| parent | f655108c260ccd334e494b7d6da8822b31cc2156 (diff) | |
| download | rails-cbd26a803b78f7309d101fc112e40254f60262a5.tar.gz rails-cbd26a803b78f7309d101fc112e40254f60262a5.tar.bz2 rails-cbd26a803b78f7309d101fc112e40254f60262a5.zip | |
Use Rack::Cache middleware only if is in Gemfile
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | actionpack/actionpack.gemspec | 1 | ||||
| -rw-r--r-- | railties/lib/rails/application.rb | 6 |
3 files changed, 7 insertions, 1 deletions
@@ -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 |