diff --git a/lib/kaminari.rb b/lib/kaminari.rb index 0bdf6f7..9b56feb 100644 --- a/lib/kaminari.rb +++ b/lib/kaminari.rb @@ -31,7 +31,7 @@ require 'kaminari/models/page_scope_methods' require 'kaminari/models/configuration_methods' require 'kaminari/hooks' -# if not using Railtie, call `Kaminari::Hooks.init!` directly +# if not using Railtie, call `Kaminari::Hooks.init` directly if defined? Rails require 'kaminari/railtie' require 'kaminari/engine' diff --git a/lib/kaminari/grape.rb b/lib/kaminari/grape.rb index c8a45fa..84f1ec5 100644 --- a/lib/kaminari/grape.rb +++ b/lib/kaminari/grape.rb @@ -1,4 +1,4 @@ require 'grape' require 'kaminari' -Kaminari::Hooks.init! +Kaminari::Hooks.init diff --git a/lib/kaminari/hooks.rb b/lib/kaminari/hooks.rb index 1f1ba8b..514ae7f 100644 --- a/lib/kaminari/hooks.rb +++ b/lib/kaminari/hooks.rb @@ -1,6 +1,6 @@ module Kaminari class Hooks - def self.init! + def self.init ActiveSupport.on_load(:active_record) do require 'kaminari/models/active_record_extension' ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension diff --git a/lib/kaminari/railtie.rb b/lib/kaminari/railtie.rb index 5aee3f1..96a42bb 100644 --- a/lib/kaminari/railtie.rb +++ b/lib/kaminari/railtie.rb @@ -1,7 +1,7 @@ module Kaminari class Railtie < ::Rails::Railtie #:nodoc: initializer 'kaminari' do |_app| - Kaminari::Hooks.init! + Kaminari::Hooks.init end end end diff --git a/lib/kaminari/sinatra.rb b/lib/kaminari/sinatra.rb index 50b6a06..6b28024 100644 --- a/lib/kaminari/sinatra.rb +++ b/lib/kaminari/sinatra.rb @@ -2,4 +2,4 @@ require 'sinatra/base' require 'kaminari' require 'kaminari/helpers/sinatra_helpers' -Kaminari::Hooks.init! +Kaminari::Hooks.init