paginate-responder 1.2.0 → 1.3.0

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 rvm:
   - 2.0.0
-  - jruby
   - 1.9.3
+env:
+  - GEM=will_paginate
+  - GEM=kaminari

data/README.md

@@ -20,6 +20,8 @@ You will also need a pagination gem. `PaginateResponder` comes with adapters for
 * [will_paginate](https://github.com/mislav/will_paginate) and
 * [kaminari](https://github.com/amatsuda/kaminari).
 
+It is recommended to use only on pagination gem at once.
+
 ## Usage
 
 Add `Responders::PaginateResponder` to your responder chain:

data/lib/paginate-responder.rb

@@ -10,7 +10,6 @@ module PaginateResponder
 
   module Adapter
     autoload :Base, 'paginate-responder/adapter/base'
-    autoload :Internal, 'paginate-responder/adapter/internal'
   end
 end
 

data/lib/paginate-responder/adapter/kaminari_adapter.rb

@@ -5,7 +5,7 @@ module PaginateResponder::Adapter
   class KaminariAdapter < Base
 
     def suitable?
-      resource.respond_to?(:page)
+      defined?(:Kaminari) and resource.respond_to?(:page) and not resource.respond_to?(:paginate)
     end
 
     def paginate(opts)

data/lib/paginate-responder/adapter/paginate_adapter.rb

@@ -5,7 +5,7 @@ module PaginateResponder::Adapter
   class PaginateAdapter < Base
 
     def suitable?
-      resource.respond_to?(:paginate)
+      defined?(:WillPaginate) and resource.respond_to?(:paginate)
     end
 
     def paginate(opts)

data/lib/paginate-responder/version.rb

@@ -1,7 +1,7 @@
 module PaginateResponder
   module VERSION
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     STAGE = nil
 

data/paginate-responder.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'actionpack', '>= 3.2.0'
+  gem.add_development_dependency 'activerecord', '>= 3.2.0'
+  gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'minitest-reporters', '>= 0.8.0'
   gem.add_development_dependency 'will_paginate'

data/test/paginate_responder_test.rb

@@ -1,14 +1,214 @@
 require 'test_helper.rb'
-require 'pagination_tests'
 
-require 'will_paginate/array'
+GEM = ENV['GEM'].to_s.split ','
+GEM = [ 'will_paginate' ] if GEM.empty?
+puts "[INFO] Running tests with #{GEM.join(' and ')}."
 
 class PaginateResponderTest < ActionController::TestCase
   tests PaginateController
 
+  def array_resource
+    ('AA'..'zz').to_a
+  end
+
+  GEM.each do |gem|
+    case gem
+      when 'will_paginate'
+        require 'will_paginate/array'
+        require 'will_paginate/active_record'
+      when 'kaminari'
+        require 'kaminari'
+        require 'kaminari/models/array_extension'
+        Kaminari::Hooks.init
+
+        Kaminari.configure do |config|
+          config.default_per_page = 50
+          config.max_per_page = 50
+        end
+
+        def array_resource
+          Kaminari.paginate_array ('AA'..'zz').to_a
+        end
+      else
+    end
+  end
+
   def setup
-    @controller.resource = resource
+    @controller.resource = ArModel.scoped
+  end
+  def json; JSON[@response.body] end
+
+  def test_pagination
+    get :index, :format => :json
+
+    assert_equal 50, json.size
+    assert_equal (1..50).to_a, json
+  end
+
+  def test_pagination_arr
+    @controller.resource = array_resource
+    get :index, :format => :json
+
+    assert_equal 50, json.size
+    assert_equal ('AA'..'zz').to_a[0..49], json
+  end
+
+  def test_pagination_assoc
+    @controller.resource = ArModel.find(1).ar_assoc_models
+    get :index, :format => :json
+
+    assert_equal 5, json.size
+    assert_equal (1..5).to_a, json
+  end
+
+  def test_pagination_page_2
+    get :index, :format => :json, :page => 2
+
+    assert_equal 50, json.size
+    assert_equal (51..100).to_a, json
+  end
+
+  def test_pagination_arr_page_2
+    @controller.resource = array_resource
+    get :index, :format => :json, :page => 2
+
+    assert_equal 50, json.size
+    assert_equal ('AA'..'zz').to_a[50..99], json
+  end
+
+  def test_pagination_per_page
+    get :index, :format => :json, :page => 1, :per_page => 10
+
+    assert_equal 10, json.size
+    assert_equal (1..10).to_a, json
   end
 
-  include PaginationTests
+
+  def test_pagination_arr_per_page
+    @controller.resource = array_resource
+    get :index, :format => :json, :page => 1, :per_page => 10
+
+    assert_equal 10, json.size
+    assert_equal ('AA'..'zz').to_a[0..9], json
+  end
+
+  def test_pagination_per_page_2
+    get :index, :format => :json, :page => 2, :per_page => 10
+
+    assert_equal 10, json.size
+    assert_equal (11..20).to_a, json
+  end
+
+  def test_pagination_arr_per_page_2
+    @controller.resource = array_resource
+    get :index, :format => :json, :page => 2, :per_page => 10
+
+    assert_equal 10, json.size
+    assert_equal ('AA'..'zz').to_a[10..19], json
+  end
+
+  def test_headers
+    get :index, :format => :json
+
+    assert_equal 3, response.links.size
+
+    assert_equal "first", response.links[0][:params][:rel]
+    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
+
+    assert_equal "next", response.links[1][:params][:rel]
+    assert_equal "http://test.host/index.json?page=2", response.links[1][:url]
+
+    assert_equal "last", response.links[2][:params][:rel]
+    assert_equal "http://test.host/index.json?page=14", response.links[2][:url]
+  end
+
+  def test_headers_page_2
+    get :index, :format => :json, :page => 2
+
+    assert_equal 4, response.links.size
+
+    assert_equal "first", response.links[0][:params][:rel]
+    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
+
+    assert_equal "prev", response.links[1][:params][:rel]
+    assert_equal "http://test.host/index.json?page=1", response.links[1][:url]
+
+    assert_equal "next", response.links[2][:params][:rel]
+    assert_equal "http://test.host/index.json?page=3", response.links[2][:url]
+
+    assert_equal "last", response.links[3][:params][:rel]
+    assert_equal "http://test.host/index.json?page=14", response.links[3][:url]
+  end
+
+  def test_headers_page_5
+    get :index, :format => :json, :page => 5
+
+    assert_equal 4, response.links.size
+
+    assert_equal "first", response.links[0][:params][:rel]
+    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
+
+    assert_equal "prev", response.links[1][:params][:rel]
+    assert_equal "http://test.host/index.json?page=4", response.links[1][:url]
+
+    assert_equal "next", response.links[2][:params][:rel]
+    assert_equal "http://test.host/index.json?page=6", response.links[2][:url]
+
+    assert_equal "last", response.links[3][:params][:rel]
+    assert_equal "http://test.host/index.json?page=14", response.links[3][:url]
+  end
+
+  def test_headers_last_page
+    get :index, :format => :json, :page => 14
+
+    assert_equal 3, response.links.size
+
+    assert_equal "first", response.links[0][:params][:rel]
+    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
+
+    assert_equal "prev", response.links[1][:params][:rel]
+    assert_equal "http://test.host/index.json?page=13", response.links[1][:url]
+
+    assert_equal "last", response.links[2][:params][:rel]
+    assert_equal "http://test.host/index.json?page=14", response.links[2][:url]
+  end
+
+  def test_headers_page_before_last_page
+    get :index, :format => :json, :page => 13
+
+    assert_equal 4, response.links.size
+
+    assert_equal "first", response.links[0][:params][:rel]
+    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
+
+    assert_equal "prev", response.links[1][:params][:rel]
+    assert_equal "http://test.host/index.json?page=12", response.links[1][:url]
+
+    assert_equal "next", response.links[2][:params][:rel]
+    assert_equal "http://test.host/index.json?page=14", response.links[2][:url]
+
+    assert_equal "last", response.links[3][:params][:rel]
+    assert_equal "http://test.host/index.json?page=14", response.links[3][:url]
+  end
+
+  def test_headers_per_page
+    get :index, :format => :json, :page => 1, :per_page => 10
+
+    assert_equal 3, response.links.size
+
+    assert_equal "first", response.links[0][:params][:rel]
+    assert_equal "http://test.host/index.json?page=1&per_page=10", response.links[0][:url]
+
+    assert_equal "next", response.links[1][:params][:rel]
+    assert_equal "http://test.host/index.json?page=2&per_page=10", response.links[1][:url]
+
+    assert_equal "last", response.links[2][:params][:rel]
+    assert_equal "http://test.host/index.json?page=68&per_page=10", response.links[2][:url]
+  end
+
+  def test_headers_total_pages
+    get :index, :format => :json
+
+    assert_equal "14", response.headers["X-Total-Pages"]
+  end
 end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ ENV["RAILS_ENV"] = "test"
 
 require 'active_support'
 require 'action_controller'
+require 'active_record'
 require 'minitest/reporters'
 MiniTest::Reporters.use!
 
@@ -24,6 +25,31 @@ class ActiveSupport::TestCase
   end
 end
 
+class ArModel < ActiveRecord::Base
+  has_many :ar_assoc_models
+  def as_json(opts = {}); self.id end
+end
+
+class ArAssocModel < ActiveRecord::Base
+  def as_json(opts = {}); self.id end
+end
+
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database  => ':memory:'
+)
+ActiveRecord::Base.connection.execute(
+    'CREATE TABLE ar_models (id INTEGER PRIMARY KEY AUTOINCREMENT);')
+ActiveRecord::Base.connection.execute(
+    'CREATE TABLE ar_assoc_models (id INTEGER PRIMARY KEY AUTOINCREMENT, ar_model_id INTEGER);')
+676.times do
+  ArModel.create!.tap do |ar_model|
+    5.times do
+      ar_model.ar_assoc_models.create!
+    end
+  end
+end
+
 class TestResponder < ActionController::Responder
   include Responders::PaginateResponder
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paginate-responder
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-link_headers
@@ -59,6 +59,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -144,9 +176,7 @@ files:
 - lib/paginate-responder/version.rb
 - lib/responders/paginate_responder.rb
 - paginate-responder.gemspec
-- test/kaminari_responder_test.rb
 - test/paginate_responder_test.rb
-- test/pagination_tests.rb
 - test/test_helper.rb
 homepage: ''
 licenses: []
@@ -173,7 +203,5 @@ signing_key:
 specification_version: 3
 summary: A Rails pagination responder with link header support.
 test_files:
-- test/kaminari_responder_test.rb
 - test/paginate_responder_test.rb
-- test/pagination_tests.rb
 - test/test_helper.rb

data/test/kaminari_responder_test.rb

@@ -1,23 +0,0 @@
-require 'test_helper.rb'
-require 'pagination_tests'
-
-require 'kaminari/config'
-require 'kaminari/helpers/paginator'
-require 'kaminari/models/page_scope_methods'
-require 'kaminari/models/configuration_methods'
-require 'kaminari/models/array_extension'
-
-Kaminari.configure do |config|
-  config.default_per_page = 50
-  config.max_per_page = 50
-end
-
-class KaminariResponderTest < ActionController::TestCase
-  tests PaginateController
-
-  def setup
-    @controller.resource = Kaminari.paginate_array(resource)
-  end
-
-  include PaginationTests
-end

data/test/pagination_tests.rb

@@ -1,137 +0,0 @@
-module PaginationTests
-  def json; JSON[@response.body] end
-  def resource; ('AA'..'zz').to_a end
-
-  def test_pagination
-    get :index, :format => :json
-
-    assert_equal 50, json.size
-    assert_equal ('AA'..'zz').to_a[0..49], json
-  end
-
-  def test_pagination_page_2
-    get :index, :format => :json, :page => 2
-
-    assert_equal 50, json.size
-    assert_equal ('AA'..'zz').to_a[50..99], json
-  end
-
-  def test_pagination_per_page
-    get :index, :format => :json, :page => 1, :per_page => 10
-
-    assert_equal 10, json.size
-    assert_equal ('AA'..'zz').to_a[0..9], json
-  end
-
-  def test_pagination_per_page_2
-    get :index, :format => :json, :page => 2, :per_page => 10
-
-    assert_equal 10, json.size
-    assert_equal ('AA'..'zz').to_a[10..19], json
-  end
-
-  def test_headers
-    get :index, :format => :json
-
-    assert_equal 3, response.links.size
-
-    assert_equal "first", response.links[0][:params][:rel]
-    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
-
-    assert_equal "next", response.links[1][:params][:rel]
-    assert_equal "http://test.host/index.json?page=2", response.links[1][:url]
-
-    assert_equal "last", response.links[2][:params][:rel]
-    assert_equal "http://test.host/index.json?page=14", response.links[2][:url]
-  end
-
-  def test_headers_page_2
-    get :index, :format => :json, :page => 2
-
-    assert_equal 4, response.links.size
-
-    assert_equal "first", response.links[0][:params][:rel]
-    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
-
-    assert_equal "prev", response.links[1][:params][:rel]
-    assert_equal "http://test.host/index.json?page=1", response.links[1][:url]
-
-    assert_equal "next", response.links[2][:params][:rel]
-    assert_equal "http://test.host/index.json?page=3", response.links[2][:url]
-
-    assert_equal "last", response.links[3][:params][:rel]
-    assert_equal "http://test.host/index.json?page=14", response.links[3][:url]
-  end
-
-  def test_headers_page_5
-    get :index, :format => :json, :page => 5
-
-    assert_equal 4, response.links.size
-
-    assert_equal "first", response.links[0][:params][:rel]
-    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
-
-    assert_equal "prev", response.links[1][:params][:rel]
-    assert_equal "http://test.host/index.json?page=4", response.links[1][:url]
-
-    assert_equal "next", response.links[2][:params][:rel]
-    assert_equal "http://test.host/index.json?page=6", response.links[2][:url]
-
-    assert_equal "last", response.links[3][:params][:rel]
-    assert_equal "http://test.host/index.json?page=14", response.links[3][:url]
-  end
-
-  def test_headers_last_page
-    get :index, :format => :json, :page => 14
-
-    assert_equal 3, response.links.size
-
-    assert_equal "first", response.links[0][:params][:rel]
-    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
-
-    assert_equal "prev", response.links[1][:params][:rel]
-    assert_equal "http://test.host/index.json?page=13", response.links[1][:url]
-
-    assert_equal "last", response.links[2][:params][:rel]
-    assert_equal "http://test.host/index.json?page=14", response.links[2][:url]
-  end
-
-  def test_headers_page_before_last_page
-    get :index, :format => :json, :page => 13
-
-    assert_equal 4, response.links.size
-
-    assert_equal "first", response.links[0][:params][:rel]
-    assert_equal "http://test.host/index.json?page=1", response.links[0][:url]
-
-    assert_equal "prev", response.links[1][:params][:rel]
-    assert_equal "http://test.host/index.json?page=12", response.links[1][:url]
-
-    assert_equal "next", response.links[2][:params][:rel]
-    assert_equal "http://test.host/index.json?page=14", response.links[2][:url]
-
-    assert_equal "last", response.links[3][:params][:rel]
-    assert_equal "http://test.host/index.json?page=14", response.links[3][:url]
-  end
-
-  def test_headers_per_page
-    get :index, :format => :json, :page => 1, :per_page => 10
-
-    assert_equal 3, response.links.size
-
-    assert_equal "first", response.links[0][:params][:rel]
-    assert_equal "http://test.host/index.json?page=1&per_page=10", response.links[0][:url]
-
-    assert_equal "next", response.links[1][:params][:rel]
-    assert_equal "http://test.host/index.json?page=2&per_page=10", response.links[1][:url]
-
-    assert_equal "last", response.links[2][:params][:rel]
-    assert_equal "http://test.host/index.json?page=68&per_page=10", response.links[2][:url]
-  end
-
-  def test_headers_total_pages
-    get :index, :format => :json
-
-    assert_equal "14", response.headers["X-Total-Pages"]
-  end
-end