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