lib/redis-store.rb in redis-store-1.0.0.beta3 vs lib/redis-store.rb in redis-store-1.0.0.beta4

@@ -14,10 +14,12 @@
   require "cache/sinatra/redis_store"
 elsif defined?(Merb)
   # HACK for cyclic dependency: redis-store is required before merb-cache
   module Merb; module Cache; class AbstractStore; end end end
   require "cache/merb/redis_store"
+elsif defined?(ActiveSupport)
+  require "active_support/cache/redis_store"
 end
 
 # Rack::Session
 if defined?(Rack::Session)
   require "rack/session/abstract/id"
@@ -25,11 +27,10 @@
   if defined?(Merb)
     require "rack/session/merb"
   end
 end
 
-# ActionDispatch::Session
-if ::Redis::Store.rails3?
+if defined?(Rails)
   require "action_controller/session/redis_session_store"
 end
 
 # Rack::Cache
 if defined?(Rack::Cache)