bootstrap_form 4.5.0 → 5.0.0

data/lib/bootstrap_form/inputs/file_field.rb

@@ -8,28 +8,16 @@ module BootstrapForm
 
       included do
         def file_field_with_bootstrap(name, options={})
-          options = options.reverse_merge(control_class: "custom-file-input")
+          options = options.reverse_merge(control_class: "form-control")
           form_group_builder(name, options) do
-            content_tag(:div, class: "custom-file") do
-              input_with_error(name) do
-                file_field_input(name, options)
-              end
+            input_with_error(name) do
+              file_field_without_bootstrap(name, options)
             end
           end
         end
 
         bootstrap_alias :file_field
       end
-
-      private
-
-      def file_field_input(name, options)
-        placeholder = options.delete(:placeholder) || "Choose file"
-        placeholder_opts = { class: "custom-file-label" }
-        placeholder_opts[:for] = options[:id] if options[:id].present?
-
-        file_field_without_bootstrap(name, options) + label(name, placeholder, placeholder_opts)
-      end
     end
   end
 end

data/lib/bootstrap_form/inputs/grouped_collection_select.rb

@@ -12,6 +12,7 @@ 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
               grouped_collection_select_without_bootstrap(method, collection, group_method,

data/lib/bootstrap_form/inputs/radio_button.rb

@@ -10,11 +10,11 @@ module BootstrapForm
         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)
+                                                :inline, :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
+          tag.div(class: radio_button_wrapper_class(options)) do
             html = radio_button_without_bootstrap(name, value, radio_button_options)
             html.concat(radio_button_label(name, value, options)) unless options[:skip_label]
             html.concat(generate_error(name)) if options[:error_message]
@@ -34,43 +34,25 @@ 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[:wrapper_class] if options[:wrapper_class].present?
+        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.5.0".freeze
+  VERSION = "5.0.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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Stephen Potenza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -39,8 +39,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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 +63,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,6 +78,7 @@ 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
@@ -125,8 +141,10 @@ files:
 - demo/public/favicon.ico
 - demo/test/fixtures/action_text/rich_texts.yml
 - demo/yarn.lock
+- docker-compose.yml
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - gemfiles/edge.gemfile
 - lib/bootstrap_form.rb
 - lib/bootstrap_form/action_view_extensions/form_helper.rb
@@ -180,7 +198,7 @@ homepage: https://github.com/bootstrap-ruby/bootstrap_form
 licenses:
 - MIT
 metadata: {}
-post_install_message: Default form attribute role="form" will be dropped in 5.0.0
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -199,5 +217,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 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,35 +0,0 @@
-language: ruby
-rvm:
-  - 2.7.1
-  - 2.6.5
-  - 2.5.7
-gemfile:
-  - gemfiles/6.0.gemfile
-  - gemfiles/5.2.gemfile
-cache:
-  bundler: true
-script:
-  - bundle exec rake test
-
-matrix:
-  include:
-    # Bleeding edge Ruby
-    - rvm: ruby-head
-      gemfile: gemfiles/edge.gemfile
-
-    # Next version of Rails
-    - rvm: 2.7.1
-      gemfile: gemfiles/edge.gemfile
-
-    # Running one job to execute DANGER bot and linting
-    - rvm: 2.7.1
-      gemfile: gemfiles/6.0.gemfile
-      script:
-        - gem install danger
-        - danger
-        - bundle exec rake rubocop
-
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: 2.7.1
-      gemfile: gemfiles/edge.gemfile