bootstrap_form 4.2.0 → 5.0.0

data/docker-compose.yml

@@ -0,0 +1,70 @@
+version: '2.4'
+
+services:
+  app: &app
+    build:
+      context: .
+      args:
+        RUBY_VERSION: '2.7.1'
+        NODE_MAJOR: '12'
+        YARN_VERSION: '1.22.4'
+        BUNDLER_VERSION: '2.1.4'
+    image: bootstrap-form:0.0.1
+    tmpfs:
+      - /tmp
+
+  backend: &backend
+    <<: *app
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app:cached
+      - rails_cache:/app/tmp/cache
+      - bundle:/usr/local/bundle
+      - node_modules:/app/node_modules
+      - packs:/app/public/packs
+    environment:
+      - NODE_ENV=development
+      - RAILS_ENV=${RAILS_ENV:-development}
+      - BOOTSNAP_CACHE_DIR=/usr/local/bundle/_bootsnap
+      - WEBPACKER_DEV_SERVER_HOST=webpacker
+      - WEB_CONCURRENCY=1
+      - HISTFILE=/app/.bash_history
+      - EDITOR=vi
+
+  shell:
+    <<: *backend
+    command: /bin/bash
+    ports:
+      - '3000:3000'
+
+  server:
+    <<: *backend
+    command: sh -c "cd demo/app && bundle exec rails server -b 0.0.0.0"
+    ports:
+      - '3000:3000'
+
+  test:
+    <<: *backend
+    command: rake test
+
+  webpacker:
+    <<: *app
+    command: ./bin/webpack-dev-server
+    ports:
+      - '3035:3035'
+    volumes:
+      - .:/app:cached
+      - bundle:/usr/local/bundle
+      - node_modules:/app/node_modules
+      - packs:/app/public/packs
+    environment:
+      - NODE_ENV=${NODE_ENV:-development}
+      - RAILS_ENV=${RAILS_ENV:-development}
+      - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
+
+volumes:
+  bundle:
+  node_modules:
+  rails_cache:
+  packs:

data/gemfiles/5.2.gemfile

@@ -0,0 +1,4 @@
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
+
+gem "rails", "~> 5.2.0"

data/gemfiles/6.0.gemfile

@@ -0,0 +1,4 @@
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
+
+gem "rails", "~> 6.0.0"

data/gemfiles/6.1.gemfile

@@ -0,0 +1,4 @@
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
+
+gem "rails", "~> 6.1.0"

data/gemfiles/edge.gemfile

@@ -0,0 +1,4 @@
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
+
+gem "rails", git: "https://github.com/rails/rails.git"

data/lib/bootstrap_form/action_view_extensions/form_helper.rb

@@ -20,8 +20,6 @@ module BootstrapForm
       def bootstrap_form_for(record, options={}, &block)
         options.reverse_merge!(builder: BootstrapForm::FormBuilder)
 
-        options = process_options(options)
-
         with_bootstrap_form_field_error_proc do
           form_for(record, options, &block)
         end
@@ -30,10 +28,8 @@ module BootstrapForm
       def bootstrap_form_with(options={}, &block)
         options.reverse_merge!(builder: BootstrapForm::FormBuilder)
 
-        options = process_options(options)
-
         with_bootstrap_form_field_error_proc do
-          form_with(options, &block)
+          form_with(**options, &block)
         end
       end
 
@@ -45,16 +41,6 @@ module BootstrapForm
 
       private
 
-      def process_options(options)
-        options[:html] ||= {}
-        options[:html][:role] ||= "form"
-
-        options[:layout] == :inline &&
-          options[:html][:class] = [options[:html][:class], "form-inline"].compact.join(" ")
-
-        options
-      end
-
       def with_bootstrap_form_field_error_proc
         original_proc = ActionView::Base.field_error_proc
         ActionView::Base.field_error_proc = BootstrapForm.field_error_proc

data/lib/bootstrap_form/components/labels.rb

@@ -23,7 +23,7 @@ module BootstrapForm
       end
 
       def label_classes(name, options, custom_label_col, group_layout)
-        classes = [options[:class], label_layout_classes(custom_label_col, group_layout)]
+        classes = ["form-label", options[:class], label_layout_classes(custom_label_col, group_layout)]
 
         case options.delete(:required)
         when true

data/lib/bootstrap_form/components/layout.rb

@@ -8,7 +8,7 @@ module BootstrapForm
       private
 
       def layout_default?(field_layout=nil)
-        [:default, nil].include? layout_in_effect(field_layout)
+        layout_in_effect(field_layout) == :default
       end
 
       def layout_horizontal?(field_layout=nil)

data/lib/bootstrap_form/components/validation.rb

@@ -14,7 +14,7 @@ module BootstrapForm
       def required_attribute?(obj, attribute)
         return false unless obj && attribute
 
-        target = obj.class == Class ? obj : obj.class
+        target = obj.instance_of?(Class) ? obj : obj.class
 
         target_validators = if target.respond_to? :validators_on
                               target.validators_on(attribute).map(&:class)

data/lib/bootstrap_form/configuration.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module BootstrapForm
+  class Configuration
+    def default_form_attributes=(attributes)
+      case attributes
+      when nil
+        @default_form_attributes = {}
+      when Hash
+        @default_form_attributes = attributes
+      else
+        raise ArgumentError, "Unsupported default_form_attributes #{attributes.inspect}"
+      end
+    end
+
+    def default_form_attributes
+      return @default_form_attributes if defined? @default_form_attributes
+
+      {}
+    end
+  end
+end

data/lib/bootstrap_form/form_builder.rb

@@ -43,10 +43,10 @@ module BootstrapForm
     include BootstrapForm::Inputs::UrlField
     include BootstrapForm::Inputs::WeekField
 
-    delegate :content_tag, :capture, :concat, to: :@template
+    delegate :content_tag, :capture, :concat, :tag, to: :@template
 
     def initialize(object_name, object, template, options)
-      @layout = options[:layout]
+      @layout = options[:layout] || default_layout
       @label_col = options[:label_col] || default_label_col
       @control_col = options[:control_col] || default_control_col
       @label_errors = options[:label_errors] || false
@@ -57,9 +57,19 @@ module BootstrapForm
                          options[:inline_errors] != false
                        end
       @acts_like_form_tag = options[:acts_like_form_tag]
+      add_default_form_attributes_and_form_inline options
       super
     end
 
+    def add_default_form_attributes_and_form_inline(options)
+      options[:html] ||= {}
+      options[:html].reverse_merge!(BootstrapForm.config.default_form_attributes)
+
+      return unless options[:layout] == :inline
+
+      options[:html][:class] = [options[:html][:class], "col-auto", "g-3"].compact.join(" ")
+    end
+
     def fields_for_with_bootstrap(record_name, record_object=nil, fields_options={}, &block)
       fields_options = fields_for_options(record_object, fields_options)
       record_object.is_a?(Hash) && record_object.extractable_options? &&
@@ -86,6 +96,11 @@ module BootstrapForm
       field_options
     end
 
+    def default_layout
+      # :default, :horizontal or :inline
+      :default
+    end
+
     def default_label_col
       "col-sm-2"
     end

data/lib/bootstrap_form/form_group.rb

@@ -10,9 +10,9 @@ module BootstrapForm
 
       options[:class] = form_group_classes(options)
 
-      content_tag(:div, options.except(:append, :id, :label, :help, :icon,
-                                       :input_group_class, :label_col, :control_col,
-                                       :add_control_col_class, :layout, :prepend)) do
+      tag.div(**options.except(:append, :id, :label, :help, :icon,
+                               :input_group_class, :label_col, :control_col,
+                               :add_control_col_class, :layout, :prepend, :floating)) do
         form_group_content(
           generate_label(options[:id], name, options[:label], options[:label_col], options[:layout]),
           generate_help(name, options[:help]), options, &block
@@ -24,8 +24,8 @@ module BootstrapForm
 
     def form_group_content_tag(name, field_name, without_field_name, options, html_options)
       html_class = control_specific_class(field_name)
-      html_class = "#{html_class} form-inline" if @layout == :horizontal && options[:skip_inline].blank?
-      content_tag(:div, class: html_class) do
+      html_class = "#{html_class} col-auto g-3" if @layout == :horizontal && options[:skip_inline].blank?
+      tag.div(class: html_class) do
         input_with_error(name) do
           send(without_field_name, name, options, html_options)
         end
@@ -34,10 +34,12 @@ module BootstrapForm
 
     def form_group_content(label, help_text, options, &block)
       if group_layout_horizontal?(options[:layout])
-        concat(label).concat(content_tag(:div, capture(&block) + help_text, class: form_group_control_class(options)))
+        concat(label).concat(tag.div(capture(&block) + help_text, class: form_group_control_class(options)))
       else
-        concat(label)
+        # Floating labels need to be rendered after the field
+        concat(label) unless options[:floating]
         concat(capture(&block))
+        concat(label) if options[:floating]
         concat(help_text) if help_text
       end
     end
@@ -50,15 +52,24 @@ module BootstrapForm
     end
 
     def form_group_classes(options)
-      classes = ["form-group", options[:class].try(:split)].flatten.compact
-      classes << "row" if group_layout_horizontal?(options[:layout]) && classes.exclude?("form-row")
-      classes << "form-inline" if field_inline_override?(options[:layout])
+      classes = ["mb-3", options[:class].try(:split)].flatten.compact
+      classes << "row" if horizontal_group_with_gutters?(options[:layout], classes)
+      classes << "col-auto g-3" if field_inline_override?(options[:layout])
       classes << feedback_class if options[:icon]
+      classes << "form-floating" if options[:floating]
       classes
     end
 
+    def horizontal_group_with_gutters?(layout, classes)
+      group_layout_horizontal?(layout) && !classes_include_gutters?(classes)
+    end
+
     def group_layout_horizontal?(layout)
       get_group_layout(layout) == :horizontal
     end
+
+    def classes_include_gutters?(classes)
+      classes.any? { |c| c =~ /^g-\d+$/ }
+    end
   end
 end

data/lib/bootstrap_form/form_group_builder.rb

@@ -6,7 +6,7 @@ module BootstrapForm
 
     private
 
-    def form_group_builder(method, options, html_options=nil)
+    def form_group_builder(method, options, html_options=nil, &block)
       no_wrapper = options[:wrapper] == false
 
       options = form_group_builder_options(options, method)
@@ -21,16 +21,14 @@ module BootstrapForm
       if no_wrapper
         yield
       else
-        form_group(method, form_group_options) { yield }
+        form_group(method, form_group_options, &block)
       end
     end
 
     def form_group_builder_options(options, method)
       options.symbolize_keys!
       options = convert_form_tag_options(method, options) if acts_like_form_tag
-      unless options[:skip_label]
-        options[:required] = form_group_required(options) if options.key?(:skip_required)
-      end
+      options[:required] = form_group_required(options) if !options[:skip_label] && options.key?(:skip_required)
       options
     end
 
@@ -48,7 +46,8 @@ module BootstrapForm
         id: options[:id], help: options[:help], icon: options[:icon],
         label_col: options[:label_col], control_col: options[:control_col],
         add_control_col_class: options[:add_control_col_class],
-        layout: get_group_layout(options[:layout]), class: options[:wrapper_class]
+        layout: get_group_layout(options[:layout]), class: options[:wrapper_class],
+        floating: options[:floating]
       }
 
       form_group_options.merge!(wrapper_options) if wrapper_options.is_a?(Hash)
@@ -57,12 +56,11 @@ module BootstrapForm
     end
 
     def form_group_label(options, css_options)
-      hash = {
+      {
         text: form_group_label_text(options[:label]),
         class: form_group_label_class(options),
         required: options[:required]
       }.merge(css_options[:id].present? ? { for: css_options[:id] } : {})
-      hash
     end
 
     def form_group_label_text(label)

data/lib/bootstrap_form/helpers/bootstrap.rb

@@ -14,7 +14,7 @@ module BootstrapForm
       def primary(name=nil, options={}, &block)
         setup_css_class "btn btn-primary", options
 
-        if options[:render_as_button] || block_given?
+        if options[:render_as_button] || block
           options.except! :render_as_button
           button(name, options, &block)
         else
@@ -26,8 +26,8 @@ module BootstrapForm
         css = options[:class] || "alert alert-danger"
         return unless object.respond_to?(:errors) && object.errors.full_messages.any?
 
-        content_tag :div, class: css do
-          concat content_tag :p, title
+        tag.div class: css do
+          concat tag.p title
           concat error_summary unless options[:error_summary] == false
         end
       end
@@ -35,9 +35,9 @@ module BootstrapForm
       def error_summary
         return unless object.errors.any?
 
-        content_tag :ul, class: "rails-bootstrap-forms-error-summary" do
+        tag.ul class: "rails-bootstrap-forms-error-summary" do
           object.errors.full_messages.each do |error|
-            concat content_tag(:li, error)
+            concat tag.li(error)
           end
         end
       end
@@ -46,8 +46,9 @@ module BootstrapForm
         return unless error?(name)
 
         hide_attribute_name = options[:hide_attribute_name] || false
+        custom_class = options[:custom_class] || false
 
-        content_tag :div, class: "alert alert-danger" do
+        tag.div class: custom_class || "invalid-feedback" do
           if hide_attribute_name
             object.errors[name].join(", ")
           else
@@ -82,10 +83,10 @@ module BootstrapForm
 
         input = capture(&block) || ActiveSupport::SafeBuffer.new
 
-        input = prepend_input(options) + input + append_input(options)
+        input = attach_input(options, :prepend) + input + attach_input(options, :append)
         input += generate_error(name)
         options.present? &&
-          input = content_tag(:div, input, class: ["input-group", options[:input_group_class]].compact)
+          input = tag.div(input, class: ["input-group", options[:input_group_class]].compact)
         input
       end
 
@@ -95,9 +96,9 @@ module BootstrapForm
       end
 
       def input_group_content(content)
-        return content if content =~ /btn/
+        return content if /btn/.match?(content)
 
-        content_tag(:span, content, class: "input-group-text")
+        tag.span(content, class: "input-group-text")
       end
 
       def static_class
@@ -106,14 +107,11 @@ module BootstrapForm
 
       private
 
-      def append_input(options)
-        html = content_tag(:div, input_group_content(options[:append]), class: "input-group-append") if options[:append]
-        html || ActiveSupport::SafeBuffer.new
-      end
-
-      def prepend_input(options)
-        html = content_tag(:div, input_group_content(options[:prepend]), class: "input-group-prepend") if options[:prepend]
-        html || ActiveSupport::SafeBuffer.new
+      def attach_input(options, key)
+        tags = [*options[key]].map do |item|
+          input_group_content(item)
+        end
+        ActiveSupport::SafeBuffer.new(tags.join)
       end
 
       def setup_css_class(the_class, options={})

data/lib/bootstrap_form/inputs/base.rb

@@ -10,7 +10,8 @@ module BootstrapForm
           define_method "#{field_name}_with_bootstrap" do |name, options={}|
             form_group_builder(name, options) do
               prepend_and_append_input(name, options) do
-                send("#{field_name}_without_bootstrap".to_sym, name, options)
+                options[:placeholder] ||= name if options[:floating]
+                send("#{field_name}_without_bootstrap".to_sym, name, options.except(:floating))
               end
             end
           end
@@ -19,11 +20,10 @@ module BootstrapForm
         end
 
         def bootstrap_select_group(field_name)
-          with_field_name = "#{field_name}_with_bootstrap"
-          without_field_name = "#{field_name}_without_bootstrap"
-          define_method(with_field_name) do |name, options={}, html_options={}|
+          define_method("#{field_name}_with_bootstrap") do |name, options={}, html_options={}|
+            html_options = html_options.reverse_merge(control_class: "form-select")
             form_group_builder(name, options, html_options) do
-              form_group_content_tag(name, field_name, without_field_name, options, html_options)
+              form_group_content_tag(name, field_name, "#{field_name}_without_bootstrap", options, html_options)
             end
           end
 

data/lib/bootstrap_form/inputs/check_box.rb

@@ -10,10 +10,10 @@ module BootstrapForm
         def check_box_with_bootstrap(name, options={}, checked_value="1", unchecked_value="0", &block)
           options = options.symbolize_keys!
           check_box_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, :switch)
           check_box_options[:class] = check_box_classes(name, options)
 
-          content_tag(:div, class: check_box_wrapper_class(options)) do
+          tag.div(class: check_box_wrapper_class(options)) do
             html = check_box_without_bootstrap(name, check_box_options, checked_value, unchecked_value)
             html.concat(check_box_label(name, options, checked_value, &block)) unless options[:skip_label]
             html.concat(generate_error(name)) if options[:error_message]
@@ -38,8 +38,8 @@ module BootstrapForm
       end
 
       def check_box_description(name, options, &block)
-        content = block_given? ? capture(&block) : options[:label]
-        content || (object && object.class.human_attribute_name(name)) || name.to_s.humanize
+        content = block ? capture(&block) : options[:label]
+        content || object&.class&.human_attribute_name(name) || name.to_s.humanize
       end
 
       def check_box_value(name, value)
@@ -50,40 +50,26 @@ module BootstrapForm
       end
 
       def check_box_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 check_box_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 check_box_wrapper_class(options)
-        classes = []
-        if options[:custom]
-          classes << custom_check_box_wrapper_class(options)
-        else
-          classes << "form-check"
-          classes << "form-check-inline" if layout_inline?(options[:inline])
-        end
+        classes = ["form-check"]
+        classes << "form-check-inline" if layout_inline?(options[:inline])
+        classes << "form-switch" if options[:switch]
         classes << options[:wrapper_class] if options[:wrapper_class].present?
         classes.flatten.compact
       end
-
-      def custom_check_box_wrapper_class(options)
-        classes = []
-        classes << "custom-control"
-        classes << (options[:custom] == :switch ? "custom-switch" : "custom-checkbox")
-        classes << "custom-control-inline" if layout_inline?(options[:inline])
-        classes
-      end
     end
   end
 end

data/lib/bootstrap_form/inputs/collection_select.rb

@@ -10,6 +10,7 @@ module BootstrapForm
         # Disabling Metrics/ParameterLists because the upstream Rails method has the same parameters
         # rubocop:disable Metrics/ParameterLists
         def collection_select_with_bootstrap(method, collection, value_method, text_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
               collection_select_without_bootstrap(method, collection, value_method, text_method, options, html_options)

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 = ["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 = ["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)