lib/kasket.rb in kasket-0.5.5 vs lib/kasket.rb in kasket-0.6.0

@@ -7,10 +7,11 @@
 module Kasket
   autoload :Cache, 'kasket/cache'
   autoload :ConfigurationMixin, 'kasket/configuration_mixin'
   autoload :ReloadAssociationMixin, 'kasket/reload_association_mixin'
   autoload :RackMiddleware, 'kasket/rack_middleware'
+  autoload :Query, 'kasket/query'
 
   CONFIGURATION = {:max_collection_size => 100}
 
   module_function
 
@@ -24,23 +25,23 @@
     ActiveRecord::Base.extend(Kasket::ConfigurationMixin)
     ActiveRecord::Associations::BelongsToAssociation.send(:include, Kasket::ReloadAssociationMixin)
     ActiveRecord::Associations::BelongsToPolymorphicAssociation.send(:include, Kasket::ReloadAssociationMixin)
     ActiveRecord::Associations::HasOneThroughAssociation.send(:include, Kasket::ReloadAssociationMixin)
 
-    #sets up local cache clearing on rack
-    begin
-      ActionController::Dispatcher.middleware.use(Kasket::RackMiddleware)
-    rescue NameError => e
-      puts('WARNING: The kasket rack middleware is not in your rack stack')
-    end
-
     #sets up local cache clearing before each request.
     #this is done to make it work for non rack rails and for functional tests
     begin
       ApplicationController.before_filter do
         Kasket.cache.clear_local
       end
     rescue NameError => e
+    end
+
+    #sets up local cache clearing on rack
+    begin
+      ActionController::Dispatcher.middleware.use(Kasket::RackMiddleware)
+    rescue NameError => e
+      puts('WARNING: The kasket rack middleware is not in your rack stack')
     end
 
     #sets up local cache clearing after each test case
     begin
       ActiveSupport::TestCase.class_eval do