effective_resources 2.41.0 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4184ca5c72af38ffa3aa7ddcaa87c989b2a545960dc5bf2f5e243aa288ea2da0
-  data.tar.gz: d8f7e086a99114189c32d295737bfc6d0f5f53088b45ffcd507c410efce2fe15
+  metadata.gz: c322710a6dffa4c2e384fd31e06b0226826e3bc364277abdaac8a71e6d9adfc6
+  data.tar.gz: cbf12a724542c9148a8ce95a0dadf5f9e86748af998faded9f912839dba43a5f
 SHA512:
-  metadata.gz: f2c71a1a6aef72429c246f40988dba46db246292c20e08c2fdb6990d159e9b33e05ef2066dc4834509fdf0fd9e6e413f01a5b0042e90a3062d86bfaa7dcda4f9
-  data.tar.gz: ec22e366b5277b5e5a13bcde93b781b19a6b10e6482ebbd4126bb3657b32644dc3aef004aded68c04af363b570e7641f5907bf3865e3e1ca548a0f8a606fba30
+  metadata.gz: 7f601bd8c2e4efb5d74e92f701a3b5288b83ed5e38924cb8ef548c868f9c1ec19edec48adea1c8ce78cf6b9e9551a0eab958bf804f0781477e2fd1b887e3c128
+  data.tar.gz: 5e84dc97c1ced2733f1981e5a8a23c9e142d217d1b604d08ff3624483e6df8368c302d2f17a43e67af178a59f1241476c3ce8f4fbad1b3ec890246aa07c119cb

data/app/controllers/concerns/effective/select2_ajax_controller.rb

@@ -33,7 +33,7 @@ module Effective
       # Paginate
       if !skip_paginate
         per_page = 50
-        page = (params[:page] || 1).to_i
+        page = EffectiveResources.normalize_page(params[:page]) || 1
         last = (collection.reselect(:id).count.to_f / per_page).ceil
         more = page < last
   

data/app/models/concerns/acts_as_paginable.rb

@@ -27,7 +27,7 @@ module ActsAsPaginable
 
     scope :paginate, -> (page: nil, per_page: nil) {
       per_page = (per_page || default_per_page).to_i
-      page = (page || 1).to_i
+      page = EffectiveResources.normalize_page(page) || 1
       offset = [(page - 1), 0].max * (per_page).to_i
 
       all.limit(per_page).offset(offset)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.41.0'.freeze
+  VERSION = '2.42.0'.freeze
 end

data/lib/effective_resources.rb

@@ -87,6 +87,22 @@ module EffectiveResources
 
   # Utilities
 
+  def self.normalize_page(value)
+    return 1 if value.nil? || value == ''
+    return value if value.is_a?(Integer) && value.positive?
+    return value.to_i if value.is_a?(String) && value.match?(/\A[1-9]\d*\z/)
+  end
+
+  def self.validate_page!(value, collection_count:, per_page:)
+    page = normalize_page(value)
+    raise ActiveRecord::RecordNotFound, "Page #{value.inspect} is invalid" unless page
+
+    last = [(collection_count.to_f / per_page).ceil, 1].max
+    raise ActiveRecord::RecordNotFound, "Page #{page} does not exist" if page > last
+
+    page
+  end
+
   # This looks up the best class give the name
   # If the Tenant is present, use those classes first.
   def self.best(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.41.0
+  version: 2.42.0
 platform: ruby
 authors:
 - Code and Effect