effective_bootstrap 1.23.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8525fb430647548ed163f61aacb3d1a5a582cbb6e5bf7182d2c69374cd4e5082
-  data.tar.gz: b5ba63ca4c4162696b289599106c8476ac3d1eceb557eff451b707ac4b9aa608
+  metadata.gz: 7572ab1d47d1e96b9821418d4d2718f381157f03811e697226e2ebd0d7c3c02e
+  data.tar.gz: 81e074f7747ce04274991347bc47217c8dff89ff833332ee4b38c7eb08eed1c6
 SHA512:
-  metadata.gz: 9763f0b4a0e4a728d9601dcd9872fcd4ff921b7e6f55f31387a6a5be1c5fa2a0b6aac561c9b0d6203d83667455232804acb49342576cb1068e767d6c026ea598
-  data.tar.gz: 3dbec9987fc1bfaba4130ad9b4668cd5e1f462d0fd12ee5307d2a7dd4c2d45bf4ea4ee6faa9c21089fffb800428b52b526f6511b780ee3dff8ec4acb8050c9fc
+  metadata.gz: 8ea6f0ab85c69dbf20c420241b28f9620beacbdf78476185ca3b199a51a61167cd8f699cae1daccb32d9781171bbc451cb603dca00da408adae2d181c8406ea5
+  data.tar.gz: 7f26421b025f8a150c7ab016059729a52dff4fa3a25a19d366dbe53d0a98b662260cfbed638ca7e722d52b3b21d6fa7e4be6681dcc64351b862580497784cd6b

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/assets/javascripts/effective_bootstrap/base.js.coffee

@@ -17,7 +17,7 @@ this.EffectiveBootstrap ||= new class
       $element.addClass('initialized')
 
 $ -> EffectiveBootstrap.initialize()
-$(document).on 'turbolinks:load', -> EffectiveBootstrap.initialize()
+$(document).on 'turbolinks:load turbo:load', -> EffectiveBootstrap.initialize()
 $(document).on 'cocoon:after-insert', -> EffectiveBootstrap.initialize()
 $(document).on 'effective-bootstrap:initialize', (event) -> EffectiveBootstrap.initialize(event.currentTarget)
 

data/app/assets/javascripts/effective_clipboard/initialize.js.coffee

@@ -15,4 +15,5 @@ initialize = ->
   $buttons.addClass('initialized')
 
 $ -> initialize()
-$(document).on 'turbolinks:load', -> initialize()
+$(document).on 'turbolinks:load turbo:load', -> initialize()
+$(document).on 'turbolinks:before-cache turbo:before-cache', -> $('.btn-clipboard-copy.initialized').removeClass('initialized')

data/app/assets/javascripts/effective_date/input.js

@@ -1,5 +1,5 @@
 //= require ../moment/moment
 //= require ../effective_datetime/bootstrap-datetimepicker
 //= require ../effective_datetime/overrides
-//= require ../effective_datetime/turbolinks
+//= require ../effective_datetime/navigation
 //= require ./initialize

data/app/assets/javascripts/effective_datetime/input.js

@@ -1,5 +1,5 @@
 //= require ../moment/moment
 //= require ./bootstrap-datetimepicker
 //= require ./overrides
-//= require ./turbolinks
+//= require ./navigation
 //= require ./initialize

data/app/assets/javascripts/effective_datetime/{turbolinks.js.coffee → navigation.js.coffee}

@@ -1,4 +1,4 @@
-$(document).on 'turbolinks:before-cache', ->
+$(document).on 'turbolinks:before-cache turbo:before-cache', ->
   $('input.initialized.effective_date_time_picker').each (i, element) ->
     $input = $(element)
     $input.datetimepicker('destroy') if $input.data('datetimepicker')

data/app/assets/javascripts/effective_select/initialize.js.coffee

@@ -62,7 +62,7 @@ effectiveMatch = (params, data) ->
   $select.data('select2').$container.addClass(options['containerClass']) if options['containerClass']
   $select.data('select2').$dropdown.addClass(options['dropdownClass']) if options['dropdownClass']
 
-$(document).on 'turbolinks:before-cache', ->
+$(document).on 'turbolinks:before-cache turbo:before-cache', ->
   $('select.effective_select.initialized').each (i, element) ->
     $input = $(element)
     $input.select2('destroy') if $input.data('select2')

data/app/assets/javascripts/effective_time/input.js

@@ -1,5 +1,5 @@
 //= require ../moment/moment
 //= require ../effective_datetime/bootstrap-datetimepicker
 //= require ../effective_datetime/overrides
-//= require ../effective_datetime/turbolinks
+//= require ../effective_datetime/navigation
 //= require ./initialize

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/helpers/effective_form_builder_helper.rb

@@ -19,6 +19,7 @@ module EffectiveFormBuilderHelper
     end
 
     options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveForm.validate(this)')
+    options[:html]['data-turbo'] = false
     options[:local] = true unless options.key?(:local)
 
     if respond_to?(:inline_datatable?) && inline_datatable?

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.23.0'.freeze
+  VERSION = '1.25.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.25.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
@@ -459,8 +459,8 @@ files:
 - app/assets/javascripts/effective_datetime/bootstrap-datetimepicker.js
 - app/assets/javascripts/effective_datetime/initialize.js.coffee
 - app/assets/javascripts/effective_datetime/input.js
+- app/assets/javascripts/effective_datetime/navigation.js.coffee
 - app/assets/javascripts/effective_datetime/overrides.js.coffee
-- app/assets/javascripts/effective_datetime/turbolinks.js.coffee
 - app/assets/javascripts/effective_editor/image-drop-and-paste.js
 - app/assets/javascripts/effective_editor/image-resize.js
 - app/assets/javascripts/effective_editor/initialize.js.coffee