Move ENV check back into spec_helper.rb

Signed-off-by: David Celis <[email protected]>

Author: davidcelis

lib/api-pagination/hooks.rb

@@ -18,12 +18,14 @@ def self.init!
         require 'grape/pagination'
         Grape::API.send(:include, Grape::Pagination)
       end
+
       # Kaminari and will_paginate conflict with each other, so we should check
       # to see if either is already active before attempting to load them.
       if defined?(Kaminari) && defined?(WillPaginate::CollectionMethods)
         STDERR.puts <<-EOC
-  Warning: api-pagination relies on either Kaminari or WillPaginate, but these
-  gems conflict.  Please ensure only one of them is active at any given time.
+Warning: api-pagination relies on either Kaminari or WillPaginate, but these
+gems conflict.  Please ensure only one of them is active at any given time.
+
 EOC
         return
       elsif defined?(Kaminari)
@@ -57,6 +59,7 @@ def self.init!
     end
 
     def self.initialize_kaminari!
+      require 'kaminari/models/array_extension'
       ApiPagination.instance_variable_set(:@paginator, :kaminari)
     end
 
@@ -71,8 +74,4 @@ def last_page?() !next_page end
   end
 end
 
-if ENV['PAGINATOR']
-  ApiPagination.instance_variable_set(:@paginator, ENV['PAGINATOR'].to_sym)
-end
-
 ApiPagination::Hooks.init!

spec/spec_helper.rb

@@ -1,19 +1,15 @@
-require 'support/numbers_controller'
-require 'support/numbers_api'
-require 'api-pagination'
-
 if ENV['PAGINATOR']
   ApiPagination.instance_variable_set(:@paginator, ENV['PAGINATOR'].to_sym)
 else
   warn 'No PAGINATOR set. Defaulting to kaminari. To test against will_paginate, run `PAGINATOR=will_paginate bundle exec rspec`'
   ApiPagination.instance_variable_set(:@paginator, :kaminari)
 end
 
-if ApiPagination.paginator == :kaminari
-  Kaminari::Hooks.init
-elsif ApiPagination.paginator == :will_paginate
-  require 'will_paginate/array'
-end
+require 'support/numbers_controller'
+require 'support/numbers_api'
+require 'api-pagination'
+
+require 'will_paginate/array' if ApiPagination.paginator == :will_paginate
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods