effective_bootstrap 1.22.2 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72dd156fce6da5b624d7ef6e666198def54c289676f1aaf024aea4c11eae7f8f
-  data.tar.gz: 3f6518cd35b2a1dd28159dcaad798631572b6fd4607e252d79990c468d693e7c
+  metadata.gz: f683af3488f235baae5f7eee5f403ade629da5b32763d0ab4c9c80f02cdf6112
+  data.tar.gz: 9750a978f0fac5b8f4992fd7cf8393092f3eee6dbf36c8e12d24157ca955696f
 SHA512:
-  metadata.gz: ba618d917a6a0a312b40bd93d86ebd28e9022adf7d1cd530a75e6956de1e2cd72010e2f1631654963f1b8675d7f144c574efbe062ad0ad1d239d8d7839262665
-  data.tar.gz: 32e42a810c099983bfc764bc3d25d94a9c6dfba62c4966d5eeef84140cb84c3a02bb8a2d4a1f1429d7f6faa585300ccba158437b2d6fa2be1f0fb122c935209d
+  metadata.gz: 52baeedf313df51b034f5f250ea1fbe637cd81525808473ec4cb515dff29f5545a28a44da823b2f6f1f0555fa9180bcee0064fc5bbd31d10981a5519eefa4bdf
+  data.tar.gz: bc935d0336edc537416f74e2d9361d1373c1d346fd69b4f2ba00e1ade6504605a66d41b5a1a9eae91fa8c3867af50b00fd11519efd972dcc536b51381293ec0d

data/README.md

@@ -1,6 +1,6 @@
 # Effective Bootstrap
 
-Everything your Ruby on Rails 5.1+ application needs to get working with [Twitter Bootstrap 4](https://getbootstrap.com/).
+Everything your Ruby on Rails 7.0+ application needs to get working with [Twitter Bootstrap 4](https://getbootstrap.com/).
 
 - Bootstrap4 component view helpers.
 - SVG icons based on [Inline SVG](https://github.com/jamesmartin/inline_svg), with [Feather Icons](https://feathericons.com) and [FontAwesome](https://fontawesome.com) svg icons to replace the old glyphicons.
@@ -124,6 +124,8 @@ Builds a pagination based on the given collection, current url and params[:page]
 
 The collection must be an ActiveRecord relation.
 
+Requests for an invalid page or a page beyond the collection raise `ActiveRecord::RecordNotFound` and return HTTP 404.
+
 ```haml
 = paginate(@posts, per_page: 10)
 ```
@@ -132,8 +134,8 @@ Add this to your model:
 
 ```ruby
 scope :paginate, -> (page: nil, per_page:) {
-  page = (page || 1).to_i
-  offset = [(page - 1), 0].max * per_page
+  page = EffectiveResources.normalize_page(page) || 1
+  offset = (page - 1) * per_page
 
   limit(per_page).offset(offset)
 }
@@ -623,7 +625,7 @@ class Select2AjaxController < ApplicationController
 
     # Paginate
     per_page = 20
-    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/helpers/effective_bootstrap_helper.rb

@@ -492,13 +492,14 @@ module EffectiveBootstrapHelper
   #
   # https://getbootstrap.com/docs/4.0/components/pagination/
   # Builds a pagination based on the given collection, current url and params[:page]
+  # Raises ActiveRecord::RecordNotFound when the requested page is invalid or exceeds the collection.
   #
   # = paginate(@posts, per_page: 10)
   #
   # Add this to your model
   # scope :paginate, -> (page: nil, per_page: 10) {
-  #   page = (page || 1).to_i
-  #   offset = [(page - 1), 0].max * per_page
+  #   page = EffectiveResources.normalize_page(page) || 1
+  #   offset = (page - 1) * per_page
 
   #   limit(per_page).offset(offset)
   # }
@@ -514,7 +515,11 @@ module EffectiveBootstrapHelper
 
     collection_count ||= collection.limit(nil).offset(nil).count # You can pass the total count, or not.
 
-    page = (params[:page] || 1).to_i
+    page = EffectiveResources.validate_page!(
+      params[:page],
+      collection_count: collection_count,
+      per_page: per_page
+    )
     last = (collection_count.to_f / per_page).ceil
 
     return unless (last > 1 || render_single_page) # If there's only 1 page, don't render a pagination at all.

data/app/models/effective/form_input.rb

@@ -226,6 +226,7 @@ module Effective
 
       obj = (object.class == Class) ? object : object.class
       return false unless obj.respond_to?(:validators_on)
+      return true if required_belongs_to?(obj, name)
 
       if name.to_s.ends_with?('_id')
         return required_presence?(obj, name) || required_presence?(obj, name[0...-3])
@@ -234,6 +235,20 @@ module Effective
       required_presence?(obj, name)
     end
 
+    def required_belongs_to?(obj, name)
+      return false unless obj.respond_to?(:reflect_on_all_associations)
+
+      reflection = obj.reflect_on_association(name.to_s.delete_suffix('_id'))
+      reflection ||= obj.reflect_on_all_associations(:belongs_to).find do |belongs_to|
+        Array(belongs_to.foreign_key).map(&:to_s).include?(name.to_s)
+      end
+
+      return false unless reflection&.macro == :belongs_to
+
+      optional = reflection.options[:optional]
+      optional.nil? ? obj.belongs_to_required_by_default : !optional
+    end
+
     def required_presence?(obj, name)
       obj.validators_on(name).any? do |v|
         (

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.22.2'.freeze
+  VERSION = '1.24.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.22.2
+  version: 1.24.0
 platform: ruby
 authors:
 - Code and Effect
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement