grape-pagination 0.0.2 → 0.0.3

data/lib/grape/pagination.rb

@@ -8,7 +8,7 @@ module Grape
     autoload :Extensions,    'grape/pagination/extensions'
     autoload :Helpers,       'grape/pagination/helpers'
     autoload :Paginator,     'grape/pagination/paginator'
-    autoload :Link,          'grape/pagination/link'
+    autoload :LinkHeader,    'grape/pagination/link_header'
 
     def self.configuration
       @configuration ||= Configuration.new

data/lib/grape/pagination/link_header.rb

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

data/lib/grape/pagination/paginator.rb

@@ -21,7 +21,7 @@ module Grape::Pagination
 
     def paginate
       header TOTAL_HEADER, total
-      header LINK_HEADER, Link.new(request.url).to_rfc5988
+      header LINK_HEADER, LinkHeader.new(request.url, page_params).to_rfc5988
       collection.paginate(page_params)
     end
   

data/lib/grape/pagination/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-pagination
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -110,7 +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/link_header.rb
 - lib/grape/pagination/paginator.rb
 - lib/grape/pagination/version.rb
 - spec/grape/pagination/paginator_spec.rb
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2464773533401309584
+      hash: -558737369971045906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2464773533401309584
+      hash: -558737369971045906
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/grape/pagination/link.rb

@@ -1,29 +0,0 @@
-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