aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-17 21:53:17 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-17 21:53:17 -0700
commit595e03336f7366b5143a8af295b4e0fefbb8f294 (patch)
tree5fd1def896a16653d7ffb5ebfe64c27638fda183 /activesupport/lib
parentbd84b820188daed991756531071137dc7e0876a0 (diff)
downloadrails-595e03336f7366b5143a8af295b4e0fefbb8f294.tar.gz
rails-595e03336f7366b5143a8af295b4e0fefbb8f294.tar.bz2
rails-595e03336f7366b5143a8af295b4e0fefbb8f294.zip
Remove rarely-used DRb cache store
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/cache.rb7
-rw-r--r--activesupport/lib/active_support/cache/drb_store.rb14
2 files changed, 3 insertions, 18 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index a048427d5b..4b2eebb007 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -9,7 +9,6 @@ module ActiveSupport
autoload :FileStore, 'active_support/cache/file_store'
autoload :MemoryStore, 'active_support/cache/memory_store'
autoload :SynchronizedMemoryStore, 'active_support/cache/synchronized_memory_store'
- autoload :DRbStore, 'active_support/cache/drb_store'
autoload :MemCacheStore, 'active_support/cache/mem_cache_store'
autoload :CompressedMemCacheStore, 'active_support/cache/compressed_mem_cache_store'
@@ -29,8 +28,8 @@ module ActiveSupport
# ActiveSupport::Cache.lookup_store(:memory_store)
# # => returns a new ActiveSupport::Cache::MemoryStore object
#
- # ActiveSupport::Cache.lookup_store(:drb_store)
- # # => returns a new ActiveSupport::Cache::DRbStore object
+ # ActiveSupport::Cache.lookup_store(:mem_cache_store)
+ # # => returns a new ActiveSupport::Cache::MemCacheStore object
#
# Any additional arguments will be passed to the corresponding cache store
# class's constructor:
@@ -47,7 +46,7 @@ module ActiveSupport
case store
when Symbol
- store_class_name = (store == :drb_store ? "DRbStore" : store.to_s.camelize)
+ store_class_name = store.to_s.camelize
store_class = ActiveSupport::Cache.const_get(store_class_name)
store_class.new(*parameters)
when nil
diff --git a/activesupport/lib/active_support/cache/drb_store.rb b/activesupport/lib/active_support/cache/drb_store.rb
deleted file mode 100644
index b16ed25aa3..0000000000
--- a/activesupport/lib/active_support/cache/drb_store.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module ActiveSupport
- module Cache
- class DRbStore < MemoryStore #:nodoc:
- attr_reader :address
-
- def initialize(address = 'druby://localhost:9192')
- require 'drb' unless defined?(DRbObject)
- super()
- @address = address
- @data = DRbObject.new(nil, address)
- end
- end
- end
-end