diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-06-01 05:06:17 -0300 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-03 23:32:11 +1000 |
| commit | f50928db9cd11baf40a32e2d0ab51b2184ec3e4b (patch) | |
| tree | b7c5f3a7e97025ef943aaf77a8d3d31803d4e53c | |
| parent | 9a53e0202745d596867e9bc43219bc192269047e (diff) | |
| download | rails-f50928db9cd11baf40a32e2d0ab51b2184ec3e4b.tar.gz rails-f50928db9cd11baf40a32e2d0ab51b2184ec3e4b.tar.bz2 rails-f50928db9cd11baf40a32e2d0ab51b2184ec3e4b.zip | |
Unforce memcache from AS
Signed-off-by: José Valim <jose.valim@gmail.com>
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/cache/mem_cache_store.rb | 7 |
3 files changed, 9 insertions, 3 deletions
@@ -21,6 +21,9 @@ elsif RUBY_ENGINE == "jruby" gem "jruby-openssl" end +# AS +gem "memcache-client", ">= 1.7.5" + # AR if mri || RUBY_ENGINE == "rbx" gem "sqlite3-ruby", "= 1.3.0.beta.2", :require => 'sqlite3' diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index f2ee35ce75..8611a1e5fa 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -18,6 +18,4 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.has_rdoc = true - - s.add_dependency('memcache-client', '>= 1.7.5') end diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index d8377a208f..e3a2688e2f 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -1,4 +1,9 @@ -require 'memcache' +begin + require 'memcache' +rescue LoadError => e + $stderr.puts "You don't have memcache installed in your application. Please add it to your Gemfile and run bundle install" + raise e +end require 'digest/md5' module ActiveSupport |