fetcheable_on_api 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3f28d2fc702708ed0bec47b13b9d4573f0d817c5
-  data.tar.gz: 4a33d75b625c595516143e00088a6b5374cb1b85
+SHA256:
+  metadata.gz: 5eedb9e4ed066e00c70b68c6e40a66aab2908012657c2b290d717d5961fde978
+  data.tar.gz: fe9d93cdf84b2d40bcca56b079a59ce5df8ab0ad43adcf7ea38b611d7aba2bcc
 SHA512:
-  metadata.gz: 8b64b0d3dbc5cf98d933e4b4187c86ab91ed9e35fe06d13450973a364cb07ffbbffd4ec5d319713de04ffde8041ebcc0f5a7f71079b5df9174e251ca20040662
-  data.tar.gz: 73292fdb8271450c7bce3f67e4daa08d26c77e129e249e519e41fb7080831dda22ebaca12d7c3803b22c02799fd6145169091aa49b2a1fc8e25ad549a39fe559
+  metadata.gz: 22189018b1660c830d13e46ab1f83fcf3b2f8e9a7d5a6e2807758e19f336bf4c2f04e5ff3715ff8551d1681360c1d5abf2d1c9e1541ee52cc178fa1020f5d8fc
+  data.tar.gz: a265f51a961e07ec9ccedcbb51a22da4e2ffffd00a2aa056efbcf67f6c1357b95cfb3707b893b05c472c4092ee50529c392679afc0a55ae36f80f7b9a2b244a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fetcheable_on_api (0.1.1)
+    fetcheable_on_api (0.1.4)
       activesupport (>= 4.1)
 
 GEM
@@ -13,9 +13,9 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     ast (2.4.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     diff-lcs (1.3)
-    i18n (1.1.0)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     minitest (5.11.3)
@@ -63,4 +63,4 @@ DEPENDENCIES
   rubocop (~> 0.59.2)
 
 BUNDLED WITH
-   1.16.5
+   1.16.6

data/lib/fetcheable_on_api/pagineable.rb

@@ -28,6 +28,12 @@ module FetcheableOnApi
       ).to_i
 
       offset = (params[:page].fetch(:number, 1).to_i - 1) * limit
+      count  = collection.except(:offset, :limit, :order).count
+
+      response.headers['Pagination-Current-Page'] = params[:page].fetch(:number, 1)
+      response.headers['Pagination-Per']          = limit
+      response.headers['Pagination-Total-Pages']  = 1 + (count / limit).ceil
+      response.headers['Pagination-Total-Count']  = count
 
       collection.limit(limit).offset(offset)
     end

data/lib/fetcheable_on_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FetcheableOnApi
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/fetcheable_on_api.rb

@@ -48,9 +48,10 @@ module FetcheableOnApi
   protected
 
   def apply_fetcheable(collection)
+    collection = apply_filters(collection)
     collection = apply_sort(collection)
-    collection = apply_pagination(collection)
-    apply_filters(collection)
+
+    apply_pagination(collection)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcheable_on_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Fabien
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A controller filters engine gem based on jsonapi spec.