rao-resources_controller 0.0.20.pre → 0.0.21.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b24e64f50651b8f40503a327de474ae205eecd5dde8022023b4d0444f3572a
-  data.tar.gz: c038ab4f63071bbce826fdbcf74e5dc66d387c63e250c84159dc6ed241d7787e
+  metadata.gz: 4fff12e71b5abd4c04de6759e3ca9d0ce5784ae2388b57729ffa1a4c356f075c
+  data.tar.gz: d0a06e05b176b0f90ad9ed86fdf0532c7d48ad1e40e4622659bf3ac93b66ecac
 SHA512:
-  metadata.gz: fffbb39a441f766179e1f6f8bd4ea08761d2883fb00fbb7b556ed0978dfc0e76a2ad0725b68cbdd7cb24de2838c0d5b348a82b0547b79f98a69e8506840e7d3e
-  data.tar.gz: bee3484473909a8953ed7c14fb42966239551382d4982b34dc32cc10146e62587c1fe673d23b54be56c802e631b40095abed01206b48eaadd49881034130c0bb
+  metadata.gz: 16995d2c6e3fda2857fbd91952121bde6cf9a1a41da5216df92935a3e93a8baebdd69b335f47d7358b1fcf6d04f66046263e992bb0fb63209706a680df41eb9f
+  data.tar.gz: 5d6a6dfc118a14b62e040d16d3767d72480fe01cda552cc68964399af26a915a186e085622745e17fbd4200ed4157fc34914ba5a6b8c333cda8178cfe9e84814

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

@@ -13,7 +13,15 @@ module Rao
     private
 
     def load_collection
-      @collection = load_collection_scope.page(params[:page])
+      @collection = load_collection_scope.page(params[:page]).per(per_page)
+    end
+
+    def per_page
+      if [nil, 'all'].include?(params[:per_page])
+        nil
+      else
+        Rao::ResourcesController::Configuration.pagination_per_page_default
+      end
     end
   end
 end

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

@@ -1,16 +1,4 @@
 module Rao
-  # Setting the pagination size in the controller:
-  #
-  #     # app/controllers/posts_controller.rb
-  #     class PostsController < ApplicationController
-  #       # ...
-  #       private
-  #
-  #       def per_page
-  #         15
-  #       end
-  #     end
-  #
   module ResourcesController::WillPaginateConcern
     extend ActiveSupport::Concern
 
@@ -26,8 +14,16 @@ module Rao
 
     def load_collection
       options = { page: params[:page] }
-      options[:per_page] = per_page if respond_to?(:per_page, true)
+      options[:per_page] = per_page unless per_page.nil?
       @collection = load_collection_scope.paginate(options)
     end
+
+    def per_page
+      if [nil, 'all'].include?(params[:per_page])
+        nil
+      else
+        Rao::ResourcesController::Configuration.pagination_per_page_default
+      end
+    end
   end
 end

data/lib/generators/rao/resources_controller/templates/initializer.rb

@@ -4,4 +4,12 @@ Rao::ResourcesController.configure do |config|
   # default: config.resources_controller_base_class_name = '::ApplicationController'
   #
   config.resources_controller_base_class_name = '::ApplicationController'
+
+  # Set the pagination item count per page.
+  #
+  # Works for kaminari and will_paginate.
+  #
+  # default: config.pagination_per_page_default = 25
+  #
+  config.pagination_per_page_default = 25
 end

data/lib/rao/resources_controller/configuration.rb

@@ -6,6 +6,7 @@ module Rao
       end
 
       mattr_accessor(:resources_controller_base_class_name) { "::ApplicationController" }
+      mattr_accessor(:pagination_per_page_default) { 25 }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-resources_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.20.pre
+  version: 0.0.21.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails