grape-pagination 0.0.1 → 0.0.2

data/README.md

@@ -31,6 +31,7 @@ Which would result in a paginated collection and the following headers set:
 
 ```
 X-Total: 150
+Link: <http://localhost:5000/api/v1/tweets?page=2&per_page=30>; rel="next"
 ```
 
 ## Contributing

data/grape-pagination.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'grape', '~> 0.3'
+  spec.add_dependency 'addressable'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rspec'

data/lib/grape/pagination.rb

@@ -1,4 +1,5 @@
 require 'grape'
+
 require 'grape/pagination/version'
 
 module Grape
@@ -7,6 +8,7 @@ module Grape
     autoload :Extensions,    'grape/pagination/extensions'
     autoload :Helpers,       'grape/pagination/helpers'
     autoload :Paginator,     'grape/pagination/paginator'
+    autoload :Link,          'grape/pagination/link'
 
     def self.configuration
       @configuration ||= Configuration.new

data/lib/grape/pagination/link.rb

@@ -0,0 +1,29 @@
+require 'addressable/uri'
+
+module Grape::Pagination
+  class Link
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    def next
+      uri.dup.tap { |uri| uri.query_values = uri.query_values.merge('page' => uri.query_values['page'].to_i + 1) }
+    end
+
+    def to_rfc5988
+      %w[next].map { |link| [__send__(link), link] }
+        .compact
+        .map { |(link, rel)| %(<#{link}>; rel="#{rel}") }
+        .join(', ')
+    end
+
+  private
+
+    def uri
+      @uri ||= Addressable::URI.parse(url)
+    end
+
+  end
+end

data/lib/grape/pagination/paginator.rb

@@ -21,6 +21,7 @@ module Grape::Pagination
 
     def paginate
       header TOTAL_HEADER, total
+      header LINK_HEADER, Link.new(request.url).to_rfc5988
       collection.paginate(page_params)
     end
   
@@ -28,14 +29,6 @@ module Grape::Pagination
 
     def_delegators :endpoint, :header, :params, :request
 
-    def query_hash
-      @query_hash ||= Rack::Utils.parse_nested_query(uri.query)
-    end
-
-    def uri
-      @uri ||= URI.parse(request.url)
-    end
-
     def page_params
       @page_params ||= params.slice(:page, :per_page).to_h.symbolize_keys
     end

data/lib/grape/pagination/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Pagination
-    VERSION = "0.0.1"
+    VERSION = '0.0.2'
   end
 end

data/spec/grape/pagination/paginator_spec.rb

@@ -7,8 +7,9 @@ describe Grape::Pagination::Paginator do
   subject(:paginator) { described_class.new endpoint, collection }
 
   describe '.paginate' do
-    it 'sets the X-Total header' do
+    it 'sets the headers' do
       endpoint.should_receive(:header).with('X-Total', 4)
+      endpoint.should_receive(:header).with('Link', '<https://localhost:5000/api/v1/tweets?page=2&per_page=30>; rel="next"')
       paginator.paginate
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-pagination
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +110,7 @@ files:
 - lib/grape/pagination/configuration.rb
 - lib/grape/pagination/extensions.rb
 - lib/grape/pagination/helpers.rb
+- lib/grape/pagination/link.rb
 - lib/grape/pagination/paginator.rb
 - lib/grape/pagination/version.rb
 - spec/grape/pagination/paginator_spec.rb
@@ -113,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2291269891516805911
+      hash: -2464773533401309584
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2291269891516805911
+      hash: -2464773533401309584
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23