load mongo_mapper via load_hook

Empact · Aug 20, 2011 · edd9be6 · edd9be6
1 parent 43e66e2
commit edd9be6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/kaminari/railtie.rb b/lib/kaminari/railtie.rb
@@ -1,7 +1,6 @@
 require 'rails'
 # ensure ORMs are loaded *before* initializing Kaminari
 begin; require 'mongoid'; rescue LoadError; end
-begin; require 'mongo_mapper'; rescue LoadError; end
 
 require 'kaminari/config'
 require 'kaminari/helpers/action_view_extension'
@@ -21,13 +20,16 @@ class Railtie < ::Rails::Railtie #:nodoc:
         ::Mongoid::Document.send :include, Kaminari::MongoidExtension::Document
         ::Mongoid::Criteria.send :include, Kaminari::MongoidExtension::Criteria
       end
-      if defined? ::MongoMapper
+
+      ActiveSupport.on_load(:mongo_mapper) do
         require 'kaminari/models/mongo_mapper_extension'
         ::MongoMapper::Document.send :include, Kaminari::MongoMapperExtension::Document
         ::Plucky::Query.send :include, Kaminari::PluckyCriteriaMethods
         ::Plucky::Query.send :include, Kaminari::PageScopeMethods
       end
+
       require 'kaminari/models/array_extension'
+
       ActiveSupport.on_load(:action_view) do
         ::ActionView::Base.send :include, Kaminari::ActionViewExtension
       end