lib/will_paginate/railtie.rb in will_paginate-3.0.pre2 vs lib/will_paginate/railtie.rb in will_paginate-3.0.pre4

@@ -1,24 +1,22 @@
 require 'will_paginate'
 require 'will_paginate/collection'
 
 module WillPaginate
   class Railtie < Rails::Railtie
-    initializer "will_paginate.active_record" do |app|
-      if defined? ::ActiveRecord
+    initializer "will_paginate" do |app|
+      ActiveSupport.on_load :active_record do
         require 'will_paginate/finders/active_record'
         WillPaginate::Finders::ActiveRecord.enable!
       end
-    end
-    
-    initializer "will_paginate.action_dispatch" do |app|
-      if defined? ::ActionDispatch::ShowExceptions
+
+      ActiveSupport.on_load :action_controller do
         ActionDispatch::ShowExceptions.rescue_responses['WillPaginate::InvalidPage'] = :not_found
       end
-    end
-    
-    initializer "will_paginate.action_view" do |app|
-      require 'will_paginate/view_helpers/action_view'
-      ActionView::Base.send(:include, WillPaginate::ViewHelpers::ActionView)
+
+      ActiveSupport.on_load :action_view do
+        require 'will_paginate/view_helpers/action_view'
+        include WillPaginate::ViewHelpers::ActionView
+      end
     end
   end
 end