Test against both the will_paginate and the kaminari logic

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

Author: davidcelis

.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 1.9.3
   - 2.0.0
 script: bundle exec rspec
+env:
+  - PAGINATOR=kaminari
+  - PAGINATOR=will_paginate

Gemfile

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in api_pagination.gemspec
 gemspec
-gem 'pry'

README.md

@@ -83,15 +83,14 @@ Link: <http://localhost:3000/movies?page=1>; rel="first">,
 # ...
 ```
 
-While the above examples use [Kaminari][kaminari], api-pagination is also compatible with [will_paginate][will_paginate]. See either gem's README for more info on their respective usages.
-
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+3. Commit your changes and tests (`git commit -am 'Add some feature'`)
+4. Run the tests (`KAMINARI=true bundle exec rspec; WILL_PAGINATE=true bundle exec rspec`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request
 
 [kaminari]: https://github.com/amatsuda/kaminari
 [will_paginate]: https://github.com/mislav/will_paginate

lib/rails/pagination.rb

@@ -1,4 +1,3 @@
-require 'pry'
 module Rails
   module Pagination
     protected

spec/spec_helper.rb

@@ -1,9 +1,6 @@
-require 'rspec/autorun'
 require 'support/numbers_controller'
-require 'api-pagination'
 require 'support/numbers_api'
-
-ApiPagination.kaminari = true
+require 'api-pagination'
 
 # Quacks like Kaminari and will_paginate
 PaginatedSet = Struct.new(:current_page, :per_page, :total_count) do
@@ -29,6 +26,9 @@ def paginate(options = {})
   end
 end
 
+ApiPagination.kaminari      = ENV['PAGINATOR'] == 'kaminari'
+ApiPagination.will_paginate = ENV['PAGINATOR'] == 'will_paginate'
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include ControllerExampleGroup, :type => :controller

spec/support/numbers_api.rb

@@ -1,3 +1,6 @@
+require 'grape'
+require 'api-pagination'
+
 class NumbersAPI < Grape::API
   format :json