jsonapi.rb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2625c5af20d211c8e480235ec9587d648143eda2f76ffc2a5add9bdcc5d5e1d4
-  data.tar.gz: e685d519946126bd51b3741b0980edab95d7da4f3bbb9ceca8cb248142eedd65
+  metadata.gz: 7f77c3754e421d90a87ea1b4e29d0a93684491c7b856358544e7d284e016f1e2
+  data.tar.gz: b2fc4ffb3a75a0dde01133af68e2993cc96ee4404adc5d7ffae49c97d15b0532
 SHA512:
-  metadata.gz: fe25509464222844a3511f5cb768b85e3b078939822abe88889bf8f21df91fd8460d52b81d98dadd3e74ae831b7d0c66242353007a44f631560728029d6db231
-  data.tar.gz: 789b5919fcc2b8092e9db62ddad3fc420d152b6e9a5542f2daba561a7233d5320e4a672b85bb7640bce31408a2e60788ee1b3ca65e503b766e8d3bfe0b599ee5
+  metadata.gz: 36eaed17ff71ecb1dbf2d78cdf80cde3d3f310a1540c62972c675430a5800cc555fc6b2cc00bd83044b5734782e7c8dea94cd9f8dd50efe29d1abfed5cb6f6d1
+  data.tar.gz: 3f6cd094ffad9b139329da5628ff68e53bccef6eba51b73f720fba402dccd9f84eae8fa3a9572f78b50dd33ad1cbd49a1f2d5816450fe58855fa2cf2b509078b

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    jsonapi.rb (1.0.0)
+    jsonapi.rb (1.1.0)
       fast_jsonapi (~> 1.5)
       ransack (~> 2.1)
 

data/README.md

@@ -1,5 +1,7 @@
 # JSONAPI.rb :electric_plug:
 
+[![Build Status](https://travis-ci.org/stas/jsonapi.rb.svg?branch=master)](https://travis-ci.org/stas/jsonapi.rb)
+
 So you say you need [JSON:API](https://jsonapi.org/) support in your API...
 
 > - hey how did your hackathon go?

data/lib/jsonapi/pagination.rb

@@ -26,19 +26,34 @@ module JSONAPI::Pagination
   #
   # @return [Array]
   def jsonapi_pagination(resources)
-    links = {
-      self: request.base_url + request.original_fullpath
-    }
+    links = { self: request.base_url + request.original_fullpath }
+    pagination = jsonapi_pagination_meta(resources)
 
-    return links unless resources.respond_to?(:many?)
-
-    _, limit, page = jsonapi_pagination_params
+    return links if pagination.blank?
 
     original_params = params.except(
       *request.path_parameters.keys.map(&:to_s)).to_unsafe_h
     original_params[:page] ||= {}
     original_url = request.base_url + request.path + '?'
 
+    pagination.each do |page_name, number|
+      original_params[:page][:number] = number
+      links[page_name] = original_url + CGI.unescape(original_params.to_query)
+    end
+
+    links
+  end
+
+  # Generates pagination numbers
+  #
+  # @return [Hash] with the first, previous, next, current and last page number
+  def jsonapi_pagination_meta(resources)
+    return {} unless JSONAPI::Rails.is_collection?(resources)
+
+    _, limit, page = jsonapi_pagination_params
+
+    numbers = { current: page }
+
     if resources.respond_to?(:unscope)
       total = resources.unscope(:limit, :offset).count()
     else
@@ -48,20 +63,16 @@ module JSONAPI::Pagination
     last_page = [1, (total.to_f / limit).ceil].max
 
     if page > 1
-      original_params[:page][:number] = 1
-      links[:first] = original_url + CGI.unescape(original_params.to_query)
-      original_params[:page][:number] = page - 1
-      links[:prev] = original_url + CGI.unescape(original_params.to_query)
+      numbers[:first] = 1
+      numbers[:prev] = page - 1
     end
 
     if page < last_page
-      original_params[:page][:number] = page + 1
-      links[:next] = original_url + CGI.unescape(original_params.to_query)
-      original_params[:page][:number] = last_page
-      links[:last] = original_url + CGI.unescape(original_params.to_query)
+      numbers[:next] = page + 1
+      numbers[:last] = last_page
     end
 
-    links
+    numbers
   end
 
   # Extracts the pagination params

data/lib/jsonapi/version.rb

@@ -1,3 +1,3 @@
 module JSONAPI
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi.rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stas Suscov