paginate-responder 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dbafc18cad6e10d1093d94960b14b8e1109c8b9
-  data.tar.gz: 66807f1315bf189315159ad269e646768fac021f
+  metadata.gz: 98521af773941c3f0a5b2eca08ec3658433e3d0b
+  data.tar.gz: 3d8cbe19193e14d23abaea15fa1a95b34fbd5274
 SHA512:
-  metadata.gz: 0af92d79ae09294eba20525e72802a42c4eb9d9a312d62da47046e3c56a656dc2d950d92fc9ef5d69a8fe5026b7da30a20edb13a0998b83ed1560a7dae8f11c2
-  data.tar.gz: 51f0cccacfba24fa06ef01eb1d3c031f12e4ed5cb76ee2ae44e40c64dabe6a1a8b2c882bfa938cab74d21e68773c3a15c9cf77f9958789df1461f8ae2e5463f6
+  metadata.gz: 6f43de22a9d8eabde4bab441f842d517f0b99c9c108a8895467674c89d2afea88c93d1e48102504b2740a84eaeb9186f6d2c06a26eb656c1dc10e9b48f8a0eb9
+  data.tar.gz: f3756e605e2036a5bd5513b69743b94c0ee41476b1b8a59e3e5a6ce08e3e18aa96d107521b147b738b523649818e92c823896f1f1fd982538e67293c45b38cd6

data/.travis.yml

@@ -1,16 +1,13 @@
 sudo: false
 language: ruby
 rvm:
+  - '2.3.0'
+  - '2.2'
   - '2.1'
-  - '2.0'
-  - 1.9.3
-  - rbx
 env:
   - GEM=will_paginate
   - GEM=kaminari
 gemfile:
-  - gemfiles/Gemfile.rails-3-2
-  - gemfiles/Gemfile.rails-4-0
   - gemfiles/Gemfile.rails-4-1
   - gemfiles/Gemfile.rails-4-2
   - gemfiles/Gemfile.rails-head

data/lib/paginate-responder/paginator.rb

@@ -42,10 +42,13 @@ module PaginateResponder
 
       response.headers["X-Total-Pages"] = total_pages.to_s if total_pages
       response.headers["X-Total-Count"] = total_count.to_s if total_count
+      response.headers["X-Per-Page"]    = per_page.to_s
     end
 
     def link!(rel, page)
-      response.link(controller.url_for(request.params.merge(:page => page)), :rel => rel)
+      pagination_params = { :page => page }
+      pagination_params[:per_page] = per_page if request.params.has_key?(:per_page)
+      response.link(controller.url_for(request.params.merge(pagination_params)), :rel => rel)
     end
 
     def resource!

data/lib/paginate-responder/version.rb

@@ -1,8 +1,8 @@
 module PaginateResponder
   module VERSION
     MAJOR = 1
-    MINOR = 4
-    PATCH = 2
+    MINOR = 5
+    PATCH = 0
     STAGE = nil
 
     def self.to_s

data/test/paginate_responder_test.rb

@@ -212,15 +212,36 @@ class PaginateResponderTest < ActionController::TestCase
     assert_equal 'http://test.host/index.json?page=68&per_page=10', response.links[2][:url]
   end
 
-  def test_headers_total_pages
+  def test_headers_per_page_maximum
+    get :index, format: :json, page: 1, per_page: 100
+
+    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=50', response.links[0][:url]
+
+    assert_equal 'next', response.links[1][:params][:rel]
+    assert_equal 'http://test.host/index.json?page=2&per_page=50', response.links[1][:url]
+
+    assert_equal 'last', response.links[2][:params][:rel]
+    assert_equal 'http://test.host/index.json?page=14&per_page=50', response.links[2][:url]
+  end
+
+  def test_custom_headers_total_pages
     get :index, format: :json
 
     assert_equal '14', response.headers['X-Total-Pages']
   end
 
-  def test_headers_total_count
+  def test_custom_headers_total_count
     get :index, format: :json
 
     assert_equal '676', response.headers['X-Total-Count']
   end
+
+  def test_custom_headers_per_page
+    get :index, format: :json
+
+    assert_equal '50', response.headers['X-Per-Page']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paginate-responder
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-link_headers
@@ -149,8 +149,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/Gemfile.rails-3-2
-- gemfiles/Gemfile.rails-4-0
 - gemfiles/Gemfile.rails-4-1
 - gemfiles/Gemfile.rails-4-2
 - gemfiles/Gemfile.rails-head

data/gemfiles/Gemfile.rails-3-2

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in acfs.gemspec
-gemspec path: '../'
-
-gem 'actionpack', '~> 3.2.0'
-gem 'activerecord', '~> 3.2.0'
-gem 'minitest', '< 5'

data/gemfiles/Gemfile.rails-4-0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in acfs.gemspec
-gemspec path: '../'
-
-gem 'actionpack', '~> 4.0.0'
-gem 'activerecord', '~> 4.0.0'