effective_resources 2.40.0 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40e6af3f4462f8e86aab9914919598680c3c0ac550bb3dfd5aa6d041602edef
-  data.tar.gz: 6a1f999236e9dcd9f633612f2f2fbdac0844430023adb021fc9f83aa1c58e727
+  metadata.gz: c322710a6dffa4c2e384fd31e06b0226826e3bc364277abdaac8a71e6d9adfc6
+  data.tar.gz: cbf12a724542c9148a8ce95a0dadf5f9e86748af998faded9f912839dba43a5f
 SHA512:
-  metadata.gz: 20dbbb02219d7e360cd7c0d1d859233089394f330931be722c3c5894ef9545237d0cdb3f997dc217e3f48941f754c72a107a3f3b5e7ae78c5e4401d418f300bb
-  data.tar.gz: f5bd1ce1b2006c2e32b8c23f0366f50a4378b3ac13ee8b9c8a00bfec111c2818942af591f01dce1e90128c61b54c60155ab75770a2d26ed9d022d638fb4270c7
+  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/effective_gem.rb

@@ -60,11 +60,11 @@ module EffectiveGem
       resolve_class_name(key, namespace: namespace)
     end
 
-    def klass(key, fallback: nil)
+    def klass(key, skip_fallback: false)
       raise('expected key to be a symbol') unless key.kind_of?(Symbol)
 
       namespace = Tenant.current if defined?(Tenant)
-      resolve_class_name(key, namespace: namespace, fallback: fallback).constantize
+      resolve_class_name(key, namespace: namespace, skip_fallback: skip_fallback)&.constantize
     end
 
     # Mailer Settings
@@ -121,7 +121,7 @@ module EffectiveGem
 
     private
 
-    def resolve_class_name(key, namespace:, fallback: nil)
+    def resolve_class_name(key, namespace:, skip_fallback: false)
       key = key.to_s.singularize
       configured = config(namespace)["#{key}_class_name".to_sym]
 
@@ -132,7 +132,9 @@ module EffectiveGem
         return tenant_class_name if tenant_class_name.safe_constantize
       end
 
-      fallback || "Effective::#{key.classify}"
+      return if skip_fallback
+
+      "Effective::#{key.classify}"
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.40.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.40.0
+  version: 2.42.0
 platform: ruby
 authors:
 - Code and Effect