api_helper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1895625d870d6629c579f3f165f1f37090dc4d12
-  data.tar.gz: b1fc9a045cebe92869ff7a4f666b3e813c5c7bb0
+  metadata.gz: 9efe86fda7179ba792ecf18057ebf0b1445d7f83
+  data.tar.gz: 9f17ca34299833efa46df0e68a1f75d1470d269b
 SHA512:
-  metadata.gz: c908f21b13a0f04dc0531cfe8fe97d2fd93182d1c119139caeb56387f6c905e4d516c40668ad5a1f2ba1ff05d580faa389eb1afa12a16774110136ef3b7478ac
-  data.tar.gz: 8800b5d99bd5e252474bdefb57792e6274eba29819da938c8931dde286e4ecea7a0fcd618c6af44f6f9ca60f658ea7f356fb6d8a38d27a26713491e188b30821
+  metadata.gz: fcfd8f2af69946d843ebfd2f0579ef44f8db74b816c9a6843df7fd5cdb95565b8f93a3f5767b195089cec00f5b0a9894f7cf69300c133fb1116da37a43f4118b
+  data.tar.gz: eb80f9bd80df82e8ae784b4b4a368c39c47d63ce16a910025d225d3197af26501d3e0e8bfff7be5cfe9ab002d62ba3c022fed09487dd4d1d10ae3671075ee5e6

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.2.0
+  - 2.3.0
 gemfile:
   - gemfiles/rails_4.1.0.gemfile
   - gemfiles/rails_4.2.0.gemfile

data/lib/api_helper/paginatable.rb

@@ -94,21 +94,34 @@ module APIHelper::Paginatable
     pages_count = (items_count.to_f / @pagination_per_page).ceil
     pages_count = 1 if pages_count < 1
 
+    @pagination_items_count = items_count
+    @pagination_pages_count = pages_count
+
     @pagination_page = (params[:page] || 1).to_i
     @pagination_page = pages_count if @pagination_page > pages_count
     @pagination_page = 1 if @pagination_page < 1
 
+    if current_page > 1
+      @pagination_first_page_url = add_or_replace_uri_param(request.url, :page, 1)
+      @pagination_prev_page_url = add_or_replace_uri_param(request.url, :page, (current_page > pages_count ? pages_count : current_page - 1))
+    end
+
+    if current_page < pages_count
+      @pagination_next_page_url = add_or_replace_uri_param(request.url, :page, current_page + 1)
+      @pagination_last_page_url = add_or_replace_uri_param(request.url, :page, pages_count)
+    end
+
     if set_header
       link_headers ||= []
 
       if current_page > 1
-        link_headers << "<#{add_or_replace_uri_param(request.url, :page, 1)}>; rel=\"first\""
-        link_headers << "<#{add_or_replace_uri_param(request.url, :page, (current_page > pages_count ? pages_count : current_page - 1))}>; rel=\"prev\""
+        link_headers << "<#{@pagination_first_page_url}>; rel=\"first\"" if @pagination_first_page_url
+        link_headers << "<#{@pagination_prev_page_url}>; rel=\"prev\"" if @pagination_prev_page_url
       end
 
       if current_page < pages_count
-        link_headers << "<#{add_or_replace_uri_param(request.url, :page, current_page + 1)}>; rel=\"next\""
-        link_headers << "<#{add_or_replace_uri_param(request.url, :page, pages_count)}>; rel=\"last\""
+        link_headers << "<#{@pagination_next_page_url}>; rel=\"next\"" if @pagination_next_page_url
+        link_headers << "<#{@pagination_last_page_url}>; rel=\"last\"" if @pagination_last_page_url
       end
 
       link_header = link_headers.join(', ')
@@ -139,6 +152,30 @@ module APIHelper::Paginatable
     @pagination_per_page
   end
 
+  def pagination_items_count
+    @pagination_items_count
+  end
+
+  def pagination_pages_count
+    @pagination_pages_count
+  end
+
+  def pagination_first_page_url
+    @pagination_first_page_url
+  end
+
+  def pagination_prev_page_url
+    @pagination_prev_page_url
+  end
+
+  def pagination_next_page_url
+    @pagination_next_page_url
+  end
+
+  def pagination_last_page_url
+    @pagination_last_page_url
+  end
+
   alias_method :paginate_with, :pagination_per_page
 
   def add_or_replace_uri_param(url, param_name, param_value) # :nodoc:

data/lib/api_helper/version.rb

@@ -1,3 +1,3 @@
 module APIHelper
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Neson