Merge pull request #19 from Swapt/feature/fix_will_paginate_specs

Fix will_paginate specs

Author: davidcelis

lib/api-pagination.rb

@@ -1,4 +1,3 @@
-require 'api-pagination/hooks'
 require 'api-pagination/version'
 
 module ApiPagination
@@ -19,6 +18,8 @@ def paginate(collection, options = {})
         else
           collection.paginate(:page => options[:page], :per_page => options[:per_page])
         end
+      else
+        fail StandardError, "Unknown paginator: #{ApiPagination.paginator}"
       end
     end
 
@@ -44,3 +45,5 @@ def total_from(collection)
     end
   end
 end
+
+require 'api-pagination/hooks'

lib/api-pagination/hooks.rb

@@ -18,20 +18,26 @@ 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)
+      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.
+EOC
+        return
+      elsif defined?(Kaminari)
         initialize_kaminari! and return
       elsif defined?(WillPaginate::CollectionMethods)
         initialize_will_paginate! and return
       end
-
       # If neither is loaded, we can safely attempt these requires.
-      begin
-        require 'kaminari'
-        initialize_kaminari! and return
-      rescue LoadError
+      unless ApiPagination.paginator == :will_paginate
+        begin
+          require 'kaminari'
+          initialize_kaminari! and return
+        rescue LoadError
+        end
       end
 
       begin
@@ -65,4 +71,8 @@ def last_page?() !next_page end
   end
 end
 
+if ENV['PAGINATOR']
+  ApiPagination.instance_variable_set(:@paginator, ENV['PAGINATOR'].to_sym)
+end
+
 ApiPagination::Hooks.init!