From 653143bbd885062a6bc2f3818616e2bbef88444c Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Tue, 11 Oct 2016 20:45:31 +0900 Subject: [PATCH] No need for Railtie => Hooks => ArrayExtension. Just directly load ArrayExtension when loading the gem --- kaminari-core/lib/kaminari/core.rb | 3 +-- kaminari-core/lib/kaminari/hooks.rb | 7 ------- kaminari-core/lib/kaminari/railtie.rb | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 kaminari-core/lib/kaminari/hooks.rb diff --git a/kaminari-core/lib/kaminari/core.rb b/kaminari-core/lib/kaminari/core.rb index fd34ceb..cbb39ec 100644 --- a/kaminari-core/lib/kaminari/core.rb +++ b/kaminari-core/lib/kaminari/core.rb @@ -14,9 +14,8 @@ require 'kaminari/exceptions' require 'kaminari/helpers/paginator' require 'kaminari/models/page_scope_methods' require 'kaminari/models/configuration_methods' -require 'kaminari/hooks' +require 'kaminari/models/array_extension' -# if not using Railtie, call `Kaminari::Hooks.init` directly if defined? ::Rails::Railtie require 'kaminari/railtie' require 'kaminari/engine' diff --git a/kaminari-core/lib/kaminari/hooks.rb b/kaminari-core/lib/kaminari/hooks.rb deleted file mode 100644 index 9526726..0000000 --- a/kaminari-core/lib/kaminari/hooks.rb +++ /dev/null @@ -1,7 +0,0 @@ -module Kaminari - class Hooks - def self.init - require 'kaminari/models/array_extension' - end - end -end diff --git a/kaminari-core/lib/kaminari/railtie.rb b/kaminari-core/lib/kaminari/railtie.rb index 0c6a647..447c778 100644 --- a/kaminari-core/lib/kaminari/railtie.rb +++ b/kaminari-core/lib/kaminari/railtie.rb @@ -1,7 +1,7 @@ module Kaminari class Railtie < ::Rails::Railtie #:nodoc: + # Doesn't actually do anything. Just keeping this hook point, mainly for compatibility initializer 'kaminari' do - Kaminari::Hooks.init end end end