fetcheable_on_api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eedb9e4ed066e00c70b68c6e40a66aab2908012657c2b290d717d5961fde978
-  data.tar.gz: fe9d93cdf84b2d40bcca56b079a59ce5df8ab0ad43adcf7ea38b611d7aba2bcc
+  metadata.gz: fe1436fc856be39403a098964fd749c327d478b1cd4caa23776b030fa44dbb05
+  data.tar.gz: 382385b75448f082476ec23adfd4d360b5aa53b8a8cdfb072de4f1dcecf94d63
 SHA512:
-  metadata.gz: 22189018b1660c830d13e46ab1f83fcf3b2f8e9a7d5a6e2807758e19f336bf4c2f04e5ff3715ff8551d1681360c1d5abf2d1c9e1541ee52cc178fa1020f5d8fc
-  data.tar.gz: a265f51a961e07ec9ccedcbb51a22da4e2ffffd00a2aa056efbcf67f6c1357b95cfb3707b893b05c472c4092ee50529c392679afc0a55ae36f80f7b9a2b244a4
+  metadata.gz: 913c31f970e2a6592a0aeab78f4f2e64d37074c120782fff145a7766e1e62a1d6469cf3dc36ec20ff09ff06a98d9978ba035e6a63cebc8beccb71eb96e398e69
+  data.tar.gz: 9ea51948fc95741f8e751a1371de3f7cdee1ea725751cc814df1b5916ab7c9e09adbc096f84e23ef70e1a20ca3590ec3fa0f75b428a60704ef934ae3d14304b5

data/README.md

@@ -253,6 +253,13 @@ $ curl -X GET \
 ]
 ```
 
+When you use pagination, additional information is returned in the Header
+
+- `Pagination-Current-Page`: the current page number
+- `Pagination-Per`: the number of records per page
+- `Pagination-Total-Pages`: the total number of pages
+- `Pagination-Total-Count`: the total number of records
+
 ### Filtering
 
 The `filter` query parameter is reserved for filtering data and the controller must set the attributes allowed to be filtered.

data/lib/fetcheable_on_api/filtreable.rb

@@ -45,6 +45,9 @@ module FetcheableOnApi
     protected
 
     def apply_filters(collection)
+      return collection unless valid_parameters?(params)
+      return collection unless valid_parameters?(params[:filter])
+
       return collection if params[:filter].blank?
 
       filter_params = params.require(:filter)

data/lib/fetcheable_on_api/pagineable.rb

@@ -20,7 +20,9 @@ module FetcheableOnApi
     protected
 
     def apply_pagination(collection)
-      return collection if params[:page].blank?
+      return collection unless valid_parameters?(params)
+      return collection unless valid_parameters?(params[:page])
+      return collection unless params[:page].present?
 
       limit = params[:page].fetch(
         :size,

data/lib/fetcheable_on_api/sortable.rb

@@ -48,6 +48,9 @@ module FetcheableOnApi
     protected
 
     def apply_sort(collection)
+      return collection unless valid_parameters?(params)
+      return collection unless valid_parameters?(params[:sort])
+
       return collection if params[:sort].blank?
 
       ordering      = {}

data/lib/fetcheable_on_api/version.rb

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

data/lib/fetcheable_on_api.rb

@@ -53,6 +53,11 @@ module FetcheableOnApi
 
     apply_pagination(collection)
   end
+
+  def valid_parameters?(parameters)
+    parameters.is_a?(ActionController::Parameters) ||
+      parameters.is_a?(Hash)
+  end
 end
 
 ActiveSupport.on_load :action_controller do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcheable_on_api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Fabien
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport