From a01bf41c61077a7b08371dec4206c84c05110f28 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 13 Sep 2009 15:30:55 -0500
Subject: Lazy require memcache for session middleware

---
 .../middleware/session/mem_cache_store.rb          | 75 ++++++++++------------
 1 file changed, 35 insertions(+), 40 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
index 1d9efc2b36..be1d5a43a2 100644
--- a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
@@ -1,52 +1,47 @@
-require "active_support/core_ext/kernel/requires"
-begin
-  require_library_or_gem 'memcache'
+module ActionDispatch
+  module Session
+    class MemCacheStore < AbstractStore
+      def initialize(app, options = {})
+        require 'memcache'
 
-  module ActionDispatch
-    module Session
-      class MemCacheStore < AbstractStore
-        def initialize(app, options = {})
-          # Support old :expires option
-          options[:expire_after] ||= options[:expires]
+        # Support old :expires option
+        options[:expire_after] ||= options[:expires]
 
-          super
+        super
 
-          @default_options = {
-            :namespace => 'rack:session',
-            :memcache_server => 'localhost:11211'
-          }.merge(@default_options)
+        @default_options = {
+          :namespace => 'rack:session',
+          :memcache_server => 'localhost:11211'
+        }.merge(@default_options)
 
-          @pool = options[:cache] || MemCache.new(@default_options[:memcache_server], @default_options)
-          unless @pool.servers.any? { |s| s.alive? }
-            raise "#{self} unable to find server during initialization."
-          end
-          @mutex = Mutex.new
-
-          super
+        @pool = options[:cache] || MemCache.new(@default_options[:memcache_server], @default_options)
+        unless @pool.servers.any? { |s| s.alive? }
+          raise "#{self} unable to find server during initialization."
         end
+        @mutex = Mutex.new
 
-        private
-          def get_session(env, sid)
-            sid ||= generate_sid
-            begin
-              session = @pool.get(sid) || {}
-            rescue MemCache::MemCacheError, Errno::ECONNREFUSED
-              session = {}
-            end
-            [sid, session]
-          end
+        super
+      end
 
-          def set_session(env, sid, session_data)
-            options = env['rack.session.options']
-            expiry  = options[:expire_after] || 0
-            @pool.set(sid, session_data, expiry)
-            return true
+      private
+        def get_session(env, sid)
+          sid ||= generate_sid
+          begin
+            session = @pool.get(sid) || {}
           rescue MemCache::MemCacheError, Errno::ECONNREFUSED
-            return false
+            session = {}
           end
-      end
+          [sid, session]
+        end
+
+        def set_session(env, sid, session_data)
+          options = env['rack.session.options']
+          expiry  = options[:expire_after] || 0
+          @pool.set(sid, session_data, expiry)
+          return true
+        rescue MemCache::MemCacheError, Errno::ECONNREFUSED
+          return false
+        end
     end
   end
-rescue LoadError
-  # MemCache wasn't available so neither can the store be
 end
-- 
cgit v1.2.3