From 87d0dbacebcfd54b610c126a2d88d1997325af7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 26 Jul 2011 22:08:17 +0200 Subject: [PATCH] simplify railtie; remove unnecessary requires --- lib/will_paginate/railtie.rb | 10 +++------- lib/will_paginate/view_helpers/action_view.rb | 2 -- spec/finders/activerecord_test_connector.rb | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/will_paginate/railtie.rb b/lib/will_paginate/railtie.rb index a4261d4d8..b1c80ee13 100644 --- a/lib/will_paginate/railtie.rb +++ b/lib/will_paginate/railtie.rb @@ -3,20 +3,16 @@ module WillPaginate class Railtie < Rails::Railtie - initializer "will_paginate.active_record" do |app| + 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| + ActiveSupport.on_load :action_controller do ActionDispatch::ShowExceptions.rescue_responses['WillPaginate::InvalidPage'] = :not_found end - end - - initializer "will_paginate.action_view" do |app| + ActiveSupport.on_load :action_view do require 'will_paginate/view_helpers/action_view' include WillPaginate::ViewHelpers::ActionView diff --git a/lib/will_paginate/view_helpers/action_view.rb b/lib/will_paginate/view_helpers/action_view.rb index 6b8362773..45e43a67a 100644 --- a/lib/will_paginate/view_helpers/action_view.rb +++ b/lib/will_paginate/view_helpers/action_view.rb @@ -1,6 +1,4 @@ require 'will_paginate/view_helpers/base' -require 'action_view' -require 'action_pack/version' require 'will_paginate/view_helpers/link_renderer' module WillPaginate diff --git a/spec/finders/activerecord_test_connector.rb b/spec/finders/activerecord_test_connector.rb index f767a257f..b9e8f6f6d 100644 --- a/spec/finders/activerecord_test_connector.rb +++ b/spec/finders/activerecord_test_connector.rb @@ -1,5 +1,4 @@ require 'active_record' -require 'active_record/version' require 'active_record/fixtures' require 'active_support/multibyte' # needed for Ruby 1.9.1