rao-resources_controller 0.0.22.pre → 0.0.23.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 809a6b4b2493009c0e2cf5d3a120c6bd4e1afd8f2139af0e61f44125d57cf28a
-  data.tar.gz: 80504d7afed80dde55addda08776731a2e55293f4991c246ec9e28aa3290d901
+  metadata.gz: 412f93abb3a7cbe7ac330669de53922a68af511670f948d04e9f31c6e9ff2570
+  data.tar.gz: d4f22d1f199829d1ade3a72493743a6d00a48025c0ac9b6dcc5e7638a5f54b17
 SHA512:
-  metadata.gz: 2a4c5a31b95c384ce4e9205c382e939a7f71b82117bb7c8ae567de1244defafa4323f94b8db54f486b51c28f8e2d2916f8532387ab6480ebae55fef4d7fa8511
-  data.tar.gz: 736a7c62941b1da53def3c5e749c711ebf046a625d6d1fe6eab322c452f9630952b8e7f53164a9ddaae3a219efd39c024d2d6393377da786711a513f840dcec0
+  metadata.gz: 80593943db9b36a0e1d2455bb83cab1f74c7aa0360f2d99bd4c54416fdca5bd0888c7e17e9bd683b63a38f7654d7c0b9671612e281a958539dabc910de7e0ed3
+  data.tar.gz: d6016ff1546ba449c51b5b375d760ac43ba569ff2d3cc06ef0117d6e97bd956851af6fc506e09308b54a667730360047e8dbe7c67206bc8fc6c341be0b5b441b

data/app/concerns/rao/resources_controller/kaminari_concern.rb

@@ -17,10 +17,18 @@ module Rao
     end
 
     def per_page
-      if [nil, 'all'].include?(params[:per_page])
-        load_collection_scope.count
+      # Return page size from configuration if per_page is not present in params
+      unless params.has_key?(:per_page)
+        return Rao::ResourcesController::Configuration.pagination_per_page_default
+      end
+
+      # Return count of all records or nil if no records present if
+      # params[:per_page] equals 'all'. Otherwise return params[:per_page]
+      if params[:per_page] == 'all'
+        count = load_collection_scope.count
+        count > 0 ? count : nil
       else
-        Rao::ResourcesController::Configuration.pagination_per_page_default
+        params[:per_page]
       end
     end
   end

data/app/concerns/rao/resources_controller/will_paginate_concern.rb

@@ -19,11 +19,19 @@ module Rao
     end
 
     def per_page
-      if [nil, 'all'].include?(params[:per_page])
-        load_collection_scope.count
-      else
+      # Return page size from configuration if per_page is not present in params
+      unless params.has_key?(:per_page)
         Rao::ResourcesController::Configuration.pagination_per_page_default
       end
+
+      # Return count of all records or nil if no records present if
+      # params[:per_page] equals 'all'. Otherwise return params[:per_page]
+      if params[:per_page] == 'all'
+        count = load_collection_scope.count
+        count > 0 ? count : nil
+      else
+        params[:per_page]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rao-resources_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.22.pre
+  version: 0.0.23.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel