From 6cbd2d5645921efdb12e0d9711fc668a3237062f Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 29 Aug 2013 19:53:16 +0900
Subject: [PATCH] Revert "An Engine can include app/helpers, so let's move the
 helpers there"

This reverts commit 2ed8adfe378594ae1585ac4a457a6d01f04478eb.

reason: Because mounted engines on the app doesn't search the main_app's helpers, then throws "undefined method `paginate'" in the views
---
 app/helpers/kaminari_helper.rb | 5 -----
 lib/kaminari.rb                | 1 +
 lib/kaminari/hooks.rb          | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 app/helpers/kaminari_helper.rb

diff --git a/app/helpers/kaminari_helper.rb b/app/helpers/kaminari_helper.rb
deleted file mode 100644
index 5244db5..0000000
--- a/app/helpers/kaminari_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'kaminari/helpers/action_view_extension'
-
-module KaminariHelper
-  include Kaminari::ActionViewExtension
-end
diff --git a/lib/kaminari.rb b/lib/kaminari.rb
index 3028997..41304ff 100644
--- a/lib/kaminari.rb
+++ b/lib/kaminari.rb
@@ -26,6 +26,7 @@ EOC
 
 # load Kaminari components
 require 'kaminari/config'
+require 'kaminari/helpers/action_view_extension'
 require 'kaminari/helpers/paginator'
 require 'kaminari/models/page_scope_methods'
 require 'kaminari/models/configuration_methods'
diff --git a/lib/kaminari/hooks.rb b/lib/kaminari/hooks.rb
index 706d113..48d718a 100644
--- a/lib/kaminari/hooks.rb
+++ b/lib/kaminari/hooks.rb
@@ -28,6 +28,10 @@ module Kaminari
         ::Plucky::Query.send :include, Kaminari::PluckyCriteriaMethods
       end
       require 'kaminari/models/array_extension'
+
+      ActiveSupport.on_load(:action_view) do
+        ::ActionView::Base.send :include, Kaminari::ActionViewExtension
+      end
     end
   end
 end