From 595e03336f7366b5143a8af295b4e0fefbb8f294 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 17 Apr 2009 21:53:17 -0700
Subject: Remove rarely-used DRb cache store

---
 activesupport/lib/active_support/cache.rb           |  7 +++----
 activesupport/lib/active_support/cache/drb_store.rb | 14 --------------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 activesupport/lib/active_support/cache/drb_store.rb

(limited to 'activesupport/lib/active_support')

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
-- 
cgit v1.2.3