api-pagination 4.6.3 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 46d7226c8a328bfa01b1f5c22dff277ff8dcbe53
-  data.tar.gz: d1220245784cab438b6826a0ee86521fb6f03b3d
+SHA256:
+  metadata.gz: cc970990a6d83c6df9816d8deb22656f16f227c0c125e4824a102b49b3df25a8
+  data.tar.gz: 692ec9b45e7e26140541de25bed1b4a4be625b675967d4155cef94f6ae637dd0
 SHA512:
-  metadata.gz: d9d73a37c44ec2401e465ed190e9ba012203d6385d7077730434ed8447193ec365bf8320f08f74ae85df01260fed6d031ec7187d7e44adae18cffb7311372a0c
-  data.tar.gz: 98e2ba7d85a402962a110acc82fc684f25f028c0804a30ed185509eeeb33cff53ab13512bc5f32684bacb5611fc0f87763e6164fd4322c6f5329a1a959bd371d
+  metadata.gz: a421c4df55bcaec8e6f42b76a4e719b83a2d10c9727b9dcd143f4a90072bc46062fea5313b18e10e57b7691b2d3853c72096a0ee2f41f999f77981ad1e798122
+  data.tar.gz: 9a54546062c9a98e2d5f602cc3145b50f2fe20dbbe7be623e42d22ae1c07e200ea257d6da82fe992af1ef48c98331a308304456dcb5dc86b96eb69f29a3ec91a

data/lib/api-pagination/configuration.rb

@@ -8,6 +8,8 @@ module ApiPagination
 
     attr_accessor :include_total
 
+    attr_accessor :base_url
+
     def configure(&block)
       yield self
     end
@@ -17,6 +19,7 @@ module ApiPagination
       @per_page_header = 'Per-Page'
       @page_header     = nil
       @include_total   = true
+      @base_url   = nil
     end
 
     ['page', 'per_page'].each do |param_name|

data/lib/api-pagination/version.rb

@@ -1,8 +1,8 @@
 module ApiPagination
   class Version
     MAJOR = 4
-    MINOR = 6
-    PATCH = 3
+    MINOR = 7
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/lib/rails/pagination.rb

@@ -29,8 +29,8 @@ module Rails
 
       collection = ApiPagination.paginate(collection, options)
 
-      links = (headers['Link'] || "").split(',').map(&:strip)
-      url   = request.original_url.sub(/\?.*$/, '')
+      links = (headers['Link'] || '').split(',').map(&:strip)
+      url   = base_url + request.path_info
       pages = ApiPagination.pages_from(collection)
 
       pages.each do |k, v|
@@ -58,5 +58,10 @@ module Rails
       end
       total_count || ApiPagination.total_from(collection)
     end
+
+    def base_url
+      ApiPagination.config.base_url || request.base_url
+    end
+
   end
 end

data/spec/rails_spec.rb

@@ -74,19 +74,23 @@ describe NumbersController, :type => :controller do
         ApiPagination.config.total_header    = 'X-Total-Count'
         ApiPagination.config.per_page_header = 'X-Per-Page'
         ApiPagination.config.page_header     = 'X-Page'
+        ApiPagination.config.base_url        = 'http://guybrush:3000'
 
-        get :index, params: {count: 10}
+        get :index, params: params
       end
 
       after do
         ApiPagination.config.total_header    = 'Total'
         ApiPagination.config.per_page_header = 'Per-Page'
         ApiPagination.config.page_header     = nil
+        ApiPagination.config.base_url        = nil
       end
 
+      let(:params) { { count: 10 } }
       let(:total) { response.header['X-Total-Count'].to_i }
       let(:per_page) { response.header['X-Per-Page'].to_i }
       let(:page) { response.header['X-Page'].to_i }
+      let(:link) { response.header['Link'] }
 
       it 'should give a X-Total-Count header' do
         headers_keys = response.headers.keys
@@ -110,6 +114,15 @@ describe NumbersController, :type => :controller do
         expect(headers_keys).to include('X-Page')
         expect(page).to eq(1)
       end
+
+      context 'with paginated result' do
+        let(:params) { { count: 20 } }
+        it 'should use custom base_url in the Link header' do
+
+          expect(response.headers['Link']).to eq(
+            '<http://guybrush:3000/numbers?count=20&page=2>; rel="last", <http://guybrush:3000/numbers?count=20&page=2>; rel="next"')
+        end
+      end
     end
 
     context 'configured not to include the total' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-pagination
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.7.0
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -124,19 +124,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Link header pagination for Rails and Grape APIs. Don't use the request body.
 test_files:
+- spec/spec_helper.rb
 - spec/api-pagination_spec.rb
-- spec/grape_spec.rb
-- spec/rails_spec.rb
 - spec/sequel_spec.rb
-- spec/spec_helper.rb
 - spec/support/numbers_api.rb
 - spec/support/numbers_controller.rb
-- spec/support/shared_examples/existing_headers.rb
 - spec/support/shared_examples/first_page.rb
-- spec/support/shared_examples/last_page.rb
 - spec/support/shared_examples/middle_page.rb
+- spec/support/shared_examples/last_page.rb
+- spec/support/shared_examples/existing_headers.rb
+- spec/grape_spec.rb
+- spec/rails_spec.rb