bootstrap_form 4.4.0 → 5.1.0

data/lib/bootstrap_form/inputs/grouped_collection_select.rb

@@ -12,8 +12,9 @@ module BootstrapForm
         def grouped_collection_select_with_bootstrap(method, collection, group_method,
                                                      group_label_method, option_key_method,
                                                      option_value_method, options={}, html_options={})
+          html_options = html_options.reverse_merge(control_class: "form-select")
           form_group_builder(method, options, html_options) do
-            input_with_error(method) do
+            prepend_and_append_input(method, options) do
               grouped_collection_select_without_bootstrap(method, collection, group_method,
                                                           group_label_method, option_key_method,
                                                           option_value_method, options, html_options)

data/lib/bootstrap_form/inputs/radio_button.rb

@@ -9,13 +9,10 @@ module BootstrapForm
       included do
         def radio_button_with_bootstrap(name, value, *args)
           options = args.extract_options!.symbolize_keys!
-          radio_button_options = options.except(:class, :label, :label_class, :error_message, :help,
-                                                :inline, :custom, :hide_label, :skip_label, :wrapper_class)
-
-          radio_button_options[:class] = radio_button_classes(name, options)
-
-          content_tag(:div, class: radio_button_wrapper_class(options)) do
-            html = radio_button_without_bootstrap(name, value, radio_button_options)
+          wrapper_attributes = options[:wrapper] || {}
+          wrapper_attributes[:class] = radio_button_wrapper_class(options)
+          tag.div(**wrapper_attributes) do
+            html = radio_button_without_bootstrap(name, value, radio_button_options(name, options))
             html.concat(radio_button_label(name, value, options)) unless options[:skip_label]
             html.concat(generate_error(name)) if options[:error_message]
             html
@@ -27,6 +24,13 @@ module BootstrapForm
 
       private
 
+      def radio_button_options(name, options)
+        radio_button_options = options.except(:class, :label, :label_class, :error_message, :help,
+                                              :inline, :hide_label, :skip_label, :wrapper, :wrapper_class)
+        radio_button_options[:class] = radio_button_classes(name, options)
+        radio_button_options
+      end
+
       def radio_button_label(name, value, options)
         label_options = { value: value, class: radio_button_label_class(options) }
         label_options[:for] = options[:id] if options[:id].present?
@@ -34,43 +38,26 @@ module BootstrapForm
       end
 
       def radio_button_classes(name, options)
-        classes = [options[:class]]
-        classes << (options[:custom] ? "custom-control-input" : "form-check-input")
+        classes = Array(options[:class]) << "form-check-input"
         classes << "is-invalid" if error?(name)
         classes << "position-static" if options[:skip_label] || options[:hide_label]
         classes.flatten.compact
       end
 
       def radio_button_label_class(options)
-        classes = []
-        classes << (options[:custom] ? "custom-control-label" : "form-check-label")
+        classes = ["form-check-label"]
         classes << options[:label_class]
         classes << hide_class if options[:hide_label]
         classes.flatten.compact
       end
 
       def radio_button_wrapper_class(options)
-        classes = []
-        classes << if options[:custom]
-                     custom_radio_button_wrapper_class(options)
-                   else
-                     standard_radio_button_wrapper_class(options)
-                   end
-        classes << options[:wrapper_class] if options[:wrapper_class].present?
-        classes.flatten.compact
-      end
-
-      def standard_radio_button_wrapper_class(options)
-        classes = %w[form-check]
+        classes = ["form-check"]
         classes << "form-check-inline" if layout_inline?(options[:inline])
         classes << "disabled" if options[:disabled]
-        classes
-      end
-
-      def custom_radio_button_wrapper_class(options)
-        classes = %w[custom-control custom-radio]
-        classes << "custom-control-inline" if layout_inline?(options[:inline])
-        classes
+        classes << options.dig(:wrapper, :class).presence
+        classes << options[:wrapper_class].presence
+        classes.flatten.compact
       end
     end
   end

data/lib/bootstrap_form/inputs/select.rb

@@ -8,6 +8,7 @@ module BootstrapForm
 
       included do
         def select_with_bootstrap(method, choices=nil, options={}, html_options={}, &block)
+          html_options = html_options.reverse_merge(control_class: "form-select")
           form_group_builder(method, options, html_options) do
             prepend_and_append_input(method, options) do
               select_without_bootstrap(method, choices, options, html_options, &block)

data/lib/bootstrap_form/inputs/time_zone_select.rb

@@ -8,6 +8,7 @@ module BootstrapForm
 
       included do
         def time_zone_select_with_bootstrap(method, priority_zones=nil, options={}, html_options={})
+          html_options = html_options.reverse_merge(control_class: "form-select")
           form_group_builder(method, options, html_options) do
             input_with_error(method) do
               time_zone_select_without_bootstrap(method, priority_zones, options, html_options)

data/lib/bootstrap_form/version.rb

@@ -1,3 +1,3 @@
 module BootstrapForm
-  VERSION = "4.4.0".freeze
+  VERSION = "5.1.0".freeze
 end

data/lib/bootstrap_form.rb

@@ -2,8 +2,7 @@
 # name and not in the usual autoload-reachable way.
 # The following line is definitely need to make `bootstrap_form` work.
 if ::Rails::VERSION::STRING > "6"
-  require Gem::Specification.find_by_name("actiontext").gem_dir + # rubocop:disable Rails/DynamicFindBy
-          "/app/helpers/action_text/tag_helper"
+  require "#{Gem::Specification.find_by_name('actiontext').gem_dir}/app/helpers/action_text/tag_helper"
 end
 require "action_view"
 require "action_pack"
@@ -13,6 +12,7 @@ module BootstrapForm
   extend ActiveSupport::Autoload
 
   eager_autoload do
+    autoload :Configuration
     autoload :FormBuilder
     autoload :FormGroupBuilder
     autoload :FormGroup
@@ -21,11 +21,21 @@ module BootstrapForm
     autoload :Helpers
   end
 
-  def self.eager_load!
-    super
-    BootstrapForm::Components.eager_load!
-    BootstrapForm::Helpers.eager_load!
-    BootstrapForm::Inputs.eager_load!
+  class << self
+    def eager_load!
+      super
+      BootstrapForm::Components.eager_load!
+      BootstrapForm::Helpers.eager_load!
+      BootstrapForm::Inputs.eager_load!
+    end
+
+    def config
+      @config ||= BootstrapForm::Configuration.new
+    end
+
+    def configure
+      yield config
+    end
   end
 
   mattr_accessor :field_error_proc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Stephen Potenza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,30 +17,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 description: bootstrap_form is a rails form builder that makes it super easy to create
-  beautiful-looking forms using Bootstrap 4
+  beautiful-looking forms using Bootstrap 5
 email:
 - potenza@gmail.com
 - carlos.el.lopes@gmail.com
@@ -49,13 +49,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Dangerfile
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - OLD-README.md
@@ -63,29 +64,42 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADE-4.0.md
+- UPGRADE-5.0.md
 - app/assets/stylesheets/rails_bootstrap_forms.css
 - bootstrap_form.gemspec
 - demo/.postcssrc.yml
+- demo/.ruby-version
+- demo/Gemfile
+- demo/Gemfile.lock
+- demo/Procfile.dev
 - demo/README.md
 - demo/Rakefile
+- demo/app/assets/builds/.keep
+- demo/app/assets/builds/application.js.LICENSE.txt
 - demo/app/assets/config/manifest.js
+- demo/app/assets/stylesheets/actiontext.css
 - demo/app/assets/stylesheets/actiontext.scss
 - demo/app/assets/stylesheets/application.scss
 - demo/app/controllers/application_controller.rb
 - demo/app/controllers/bootstrap_controller.rb
+- demo/app/controllers/users_controller.rb
 - demo/app/helpers/bootstrap_helper.rb
+- demo/app/javascript/application.js
 - demo/app/javascript/channels/consumer.js
 - demo/app/javascript/channels/index.js
 - demo/app/javascript/packs/application.js
 - demo/app/models/address.rb
 - demo/app/models/application_record.rb
 - demo/app/models/faux_user.rb
+- demo/app/models/skill.rb
 - demo/app/models/super_user.rb
 - demo/app/models/user.rb
 - demo/app/views/active_storage/blobs/_blob.html.erb
 - demo/app/views/bootstrap/form.html.erb
+- demo/app/views/layouts/action_text/contents/_content.html.erb
 - demo/app/views/layouts/application.html.erb
 - demo/bin/bundle
+- demo/bin/dev
 - demo/bin/rails
 - demo/bin/rake
 - demo/bin/setup
@@ -102,7 +116,6 @@ files:
 - demo/config/environments/production.rb
 - demo/config/environments/test.rb
 - demo/config/initializers/application_controller_renderer.rb
-- demo/config/initializers/assets.rb
 - demo/config/initializers/backtrace_silencers.rb
 - demo/config/initializers/cookies_serializer.rb
 - demo/config/initializers/filter_parameter_logging.rb
@@ -120,15 +133,79 @@ files:
 - demo/config/webpack/test.js
 - demo/config/webpacker.yml
 - demo/db/schema.rb
+- demo/doc/screenshots/bootstrap/index/00_horizontal_form.png
+- demo/doc/screenshots/bootstrap/index/01_with_validation_error.png
+- demo/doc/screenshots/bootstrap/index/02_inline_form.png
+- demo/doc/screenshots/bootstrap/index/03_simple_action_text_example.png
+- demo/doc/screenshots/bootstrap/index/04_floating_labels.png
+- demo/doc/screenshots/bootstrap/readme/00_example.png
+- demo/doc/screenshots/bootstrap/readme/01_example.png
+- demo/doc/screenshots/bootstrap/readme/02_example.png
+- demo/doc/screenshots/bootstrap/readme/03_example.png
+- demo/doc/screenshots/bootstrap/readme/04_example.png
+- demo/doc/screenshots/bootstrap/readme/05_example.png
+- demo/doc/screenshots/bootstrap/readme/06_example.png
+- demo/doc/screenshots/bootstrap/readme/07_example.png
+- demo/doc/screenshots/bootstrap/readme/08_example.png
+- demo/doc/screenshots/bootstrap/readme/09_example.png
+- demo/doc/screenshots/bootstrap/readme/10_example.png
+- demo/doc/screenshots/bootstrap/readme/11_example.png
+- demo/doc/screenshots/bootstrap/readme/12_example.png
+- demo/doc/screenshots/bootstrap/readme/13_example.png
+- demo/doc/screenshots/bootstrap/readme/14_example.png
+- demo/doc/screenshots/bootstrap/readme/15_example.png
+- demo/doc/screenshots/bootstrap/readme/16_example.png
+- demo/doc/screenshots/bootstrap/readme/17_example.png
+- demo/doc/screenshots/bootstrap/readme/18_example.png
+- demo/doc/screenshots/bootstrap/readme/19_example.png
+- demo/doc/screenshots/bootstrap/readme/20_example.png
+- demo/doc/screenshots/bootstrap/readme/21_example.png
+- demo/doc/screenshots/bootstrap/readme/22_example.png
+- demo/doc/screenshots/bootstrap/readme/23_example.png
+- demo/doc/screenshots/bootstrap/readme/24_example.png
+- demo/doc/screenshots/bootstrap/readme/25_example.png
+- demo/doc/screenshots/bootstrap/readme/26_example.png
+- demo/doc/screenshots/bootstrap/readme/27_example.png
+- demo/doc/screenshots/bootstrap/readme/28_example.png
+- demo/doc/screenshots/bootstrap/readme/29_example.png
+- demo/doc/screenshots/bootstrap/readme/30_example.png
+- demo/doc/screenshots/bootstrap/readme/31_example.png
+- demo/doc/screenshots/bootstrap/readme/32_example.png
+- demo/doc/screenshots/bootstrap/readme/33_example.png
+- demo/doc/screenshots/bootstrap/readme/34_example.png
+- demo/doc/screenshots/bootstrap/readme/35_example.png
+- demo/doc/screenshots/bootstrap/readme/36_example.png
+- demo/doc/screenshots/bootstrap/readme/37_example.png
+- demo/doc/screenshots/bootstrap/readme/38_example.png
+- demo/doc/screenshots/bootstrap/readme/39_example.png
+- demo/doc/screenshots/bootstrap/readme/40_example.png
+- demo/doc/screenshots/bootstrap/readme/41_example.png
+- demo/doc/screenshots/bootstrap/readme/42_example.png
+- demo/doc/screenshots/bootstrap/readme/43_example.png
+- demo/doc/screenshots/bootstrap/readme/44_example.png
+- demo/doc/screenshots/bootstrap/readme/45_example.png
+- demo/doc/screenshots/bootstrap/readme/46_example.png
+- demo/doc/screenshots/bootstrap/readme/47_example.png
+- demo/doc/screenshots/bootstrap/readme/48_example.png
+- demo/doc/screenshots/bootstrap/readme/49_example.png
+- demo/doc/screenshots/bootstrap/readme/50_example.png
 - demo/log/.keep
 - demo/package.json
 - demo/public/favicon.ico
+- demo/test/application_system_test_case.rb
+- demo/test/controllers/bootstrap_controller_test.rb
+- demo/test/controllers/users_controller_test.rb
 - demo/test/fixtures/action_text/rich_texts.yml
+- demo/test/fixtures/users.yml
+- demo/test/system/bootstrap_test.rb
+- demo/test/test_helper.rb
+- demo/webpack.config.js
 - demo/yarn.lock
-- gemfiles/5.0.gemfile
-- gemfiles/5.1.gemfile
+- docker-compose.yml
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
 - gemfiles/edge.gemfile
 - lib/bootstrap_form.rb
 - lib/bootstrap_form/action_view_extensions/form_helper.rb
@@ -137,6 +214,7 @@ files:
 - lib/bootstrap_form/components/labels.rb
 - lib/bootstrap_form/components/layout.rb
 - lib/bootstrap_form/components/validation.rb
+- lib/bootstrap_form/configuration.rb
 - lib/bootstrap_form/engine.rb
 - lib/bootstrap_form/form_builder.rb
 - lib/bootstrap_form/form_group.rb
@@ -180,7 +258,8 @@ files:
 homepage: https://github.com/bootstrap-ruby/bootstrap_form
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -189,16 +268,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Rails form builder that makes it easy to style forms using Bootstrap 4
+summary: Rails form builder that makes it easy to style forms using Bootstrap 5
 test_files: []

data/.travis.yml

@@ -1,42 +0,0 @@
-language: ruby
-rvm:
-  - 2.7
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
-gemfile:
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.1.gemfile
-  - gemfiles/5.2.gemfile
-  - gemfiles/6.0.gemfile
-cache:
-  bundler: true
-script:
-  - bundle exec rake test
-
-matrix:
-  exclude:
-    - rvm: 2.4.9
-      gemfile: gemfiles/6.0.gemfile
-
-  include:
-    # Bleeding edge Ruby
-    - rvm: ruby-head
-      gemfile: gemfiles/6.0.gemfile
-
-    # Next version of Rails
-    - rvm: 2.5.7
-      gemfile: gemfiles/edge.gemfile
-
-    # Running one job to execute DANGER bot and linting
-    - rvm: 2.5.7
-      gemfile: gemfiles/6.0.gemfile
-      script:
-        - gem install danger
-        - danger
-        - bundle exec rake rubocop
-
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: 2.5.7
-      gemfile: gemfiles/edge.gemfile

data/demo/config/initializers/assets.rb

@@ -1,14 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = "1.0"
-
-# Add additional assets to the asset load path.
-# Rails.application.config.assets.paths << Emoji.images_path
-# Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join("node_modules")
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-# Rails.application.config.assets.precompile += %w( admin.js admin.css )

data/gemfiles/5.0.gemfile

@@ -1,18 +0,0 @@
-source "http://rubygems.org"
-
-gemspec path: "../"
-
-gem "rails", "~> 5.0.0"
-
-group :development do
-  gem "rubocop-rails", require: false
-end
-
-group :test do
-  gem "diffy"
-  gem "equivalent-xml"
-  gem "minitest", "~> 5.10.3"
-  gem "mocha"
-  gem "sqlite3", "~> 1.3.6"
-  gem "timecop", "~> 0.7.1"
-end

data/gemfiles/5.1.gemfile

@@ -1,17 +0,0 @@
-source "http://rubygems.org"
-
-gemspec path: "../"
-
-gem "rails", "~> 5.1.0"
-
-group :development do
-  gem "rubocop-rails", require: false
-end
-
-group :test do
-  gem "diffy"
-  gem "equivalent-xml"
-  gem "mocha"
-  gem "sqlite3", "~> 1.4"
-  gem "timecop", "~> 0.7.1"
-end