bootstrap_form 5.0.0 → 5.1.0

data/docker-compose.yml

@@ -1,70 +1,49 @@
-version: '2.4'
+version: '3.3'
 
 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
+  shell: &shell
     <<: *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
+      # - rails_cache:/app/tmp/cache
+      # - bundle:/app/vendor/bundle
+      # - node_modules:/app/node_modules
+      # - packs:/app/public/packs
+      - /etc/passwd:/etc/passwd:ro
+      # One or the other of the following lines might be redundant, or one might be
+      # better than the other.
+      - ~/.ssh:${HOME}/.ssh
+      - ${SSH_AUTH_SOCK}:/ssh-agent
     environment:
+      - SSH_AUTH_SOCK=/ssh-agent
       - 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
+  # server:
+  #   <<: *shell
+  #   command: sh -c "cd demo/app && bundle exec rails server -b 0.0.0.0"
+  #   ports:
+  #     - '3000:3000'
 
-volumes:
-  bundle:
-  node_modules:
-  rails_cache:
-  packs:
+# volumes:
+#   bundle:
+#   node_modules:
+#   rails_cache:
+#   packs:

data/gemfiles/7.0.gemfile

@@ -0,0 +1,6 @@
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
+
+# 7.0.0 has an issue with Ruby 3.1.
+# And a test case has an issue with 7.0.1
+gem "rails", "~> 7.0.2"

data/lib/bootstrap_form/components/hints.rb

@@ -8,7 +8,7 @@ module BootstrapForm
       private
 
       def generate_help(name, help_text)
-        return if help_text == false || inline_error?(name)
+        return if help_text == false
 
         help_klass ||= "form-text text-muted"
         help_text ||= get_help_text_by_i18n_key(name)
@@ -20,10 +20,10 @@ module BootstrapForm
       def get_help_text_by_i18n_key(name)
         return unless object
 
-        partial_scope = if object.class.respond_to?(:model_name)
-                          object.class.model_name.name
+        partial_scope = if object_class.respond_to?(:model_name)
+                          object_class.model_name.name
                         else
-                          object.class.name
+                          object_class.name
                         end
 
         # First check for a subkey :html, as it is also accepted by i18n, and the
@@ -38,6 +38,15 @@ module BootstrapForm
         help_text
       end
 
+      def object_class
+        if !object.class.is_a?(ActiveModel::Naming) &&
+           object.respond_to?(:klass) && object.klass.is_a?(ActiveModel::Naming)
+          object.klass
+        else
+          object.class
+        end
+      end
+
       def scoped_help_text(name, partial_scope)
         underscored_scope = "activerecord.help.#{partial_scope.underscore}"
         downcased_scope = "activerecord.help.#{partial_scope.downcase}"

data/lib/bootstrap_form/components/labels.rb

@@ -48,7 +48,7 @@ module BootstrapForm
         if label_errors && error?(name)
           (options[:text] || object.class.human_attribute_name(name)).to_s.concat(" #{get_error_messages(name)}")
         else
-          options[:text]
+          options[:text] || object&.class.try(:human_attribute_name, name)
         end
       end
     end

data/lib/bootstrap_form/form_builder.rb

@@ -67,13 +67,14 @@ module BootstrapForm
 
       return unless options[:layout] == :inline
 
-      options[:html][:class] = [options[:html][:class], "col-auto", "g-3"].compact.join(" ")
+      options[:html][:class] =
+        ([*options[:html][:class]&.split(/\s+/)] + %w[row row-cols-auto g-3 align-items-center])
+        .compact.uniq.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? &&
-        record_object = nil
+      record_object = nil if record_object.is_a?(Hash) && record_object.extractable_options?
       fields_for_without_bootstrap(record_name, record_object, fields_options, &block)
     end
 
@@ -87,8 +88,7 @@ module BootstrapForm
 
     def fields_for_options(record_object, fields_options)
       field_options = fields_options
-      record_object.is_a?(Hash) && record_object.extractable_options? &&
-        field_options = record_object
+      field_options = record_object if record_object.is_a?(Hash) && record_object.extractable_options?
       %i[layout control_col inline_errors label_errors].each do |option|
         field_options[option] ||= options[option]
       end
@@ -114,7 +114,7 @@ module BootstrapForm
     end
 
     def hide_class
-      "sr-only" # still accessible for screen readers
+      "visually-hidden" # still accessible for screen readers
     end
 
     def control_class

data/lib/bootstrap_form/form_group.rb

@@ -52,12 +52,16 @@ module BootstrapForm
     end
 
     def form_group_classes(options)
-      classes = ["mb-3", options[:class].try(:split)].flatten.compact
+      classes = options[:class] == false ? [] : (options[:class] || form_group_default_class).split
       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
+      classes.presence
+    end
+
+    def form_group_default_class
+      (layout == :inline ? "col" : "mb-3")
     end
 
     def horizontal_group_with_gutters?(layout, classes)

data/lib/bootstrap_form/helpers/bootstrap.rb

@@ -8,7 +8,7 @@ module BootstrapForm
 
       def submit(name=nil, options={})
         setup_css_class "btn btn-secondary", options
-        super
+        layout == :inline ? form_group { super } : super
       end
 
       def primary(name=nil, options={}, &block)
@@ -27,8 +27,12 @@ module BootstrapForm
         return unless object.respond_to?(:errors) && object.errors.full_messages.any?
 
         tag.div class: css do
-          concat tag.p title
-          concat error_summary unless options[:error_summary] == false
+          if options[:error_summary] == false
+            title
+          else
+            concat tag.p title
+            concat error_summary
+          end
         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, :hide_label, :skip_label, :wrapper_class, :switch)
+                                             :inline, :hide_label, :skip_label, :wrapper, :wrapper_class, :switch)
           check_box_options[:class] = check_box_classes(name, options)
 
-          tag.div(class: check_box_wrapper_class(options)) do
+          tag.div(class: check_box_wrapper_class(options), **options[:wrapper].to_h.except(:class)) 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]
@@ -66,8 +66,10 @@ module BootstrapForm
       def check_box_wrapper_class(options)
         classes = ["form-check"]
         classes << "form-check-inline" if layout_inline?(options[:inline])
+        classes << "mb-3" unless options[:multiple] || layout == :horizontal
         classes << "form-switch" if options[:switch]
-        classes << options[:wrapper_class] if options[:wrapper_class].present?
+        classes << options.dig(:wrapper, :class).presence
+        classes << options[:wrapper_class].presence
         classes.flatten.compact
       end
     end

data/lib/bootstrap_form/inputs/collection_check_boxes.rb

@@ -13,7 +13,11 @@ module BootstrapForm
             options[:multiple] = true
             check_box(name, options, value, nil)
           end
-          hidden_field(args.first, value: "", multiple: true).concat(html)
+
+          if args.extract_options!.symbolize_keys!.delete(:include_hidden) { true }
+            html.prepend hidden_field(args.first, value: "", multiple: true)
+          end
+          html
         end
 
         bootstrap_alias :collection_check_boxes

data/lib/bootstrap_form/inputs/collection_select.rb

@@ -12,7 +12,7 @@ module BootstrapForm
         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
+            prepend_and_append_input(method, options) do
               collection_select_without_bootstrap(method, collection, value_method, text_method, options, html_options)
             end
           end

data/lib/bootstrap_form/inputs/grouped_collection_select.rb

@@ -14,7 +14,7 @@ module BootstrapForm
                                                      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, :hide_label, :skip_label, :wrapper_class)
-
-          radio_button_options[:class] = radio_button_classes(name, options)
-
-          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?
@@ -51,7 +55,8 @@ module BootstrapForm
         classes = ["form-check"]
         classes << "form-check-inline" if layout_inline?(options[:inline])
         classes << "disabled" if options[:disabled]
-        classes << options[:wrapper_class] if options[:wrapper_class].present?
+        classes << options.dig(:wrapper, :class).presence
+        classes << options[:wrapper_class].presence
         classes.flatten.compact
       end
     end

data/lib/bootstrap_form/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Stephen Potenza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -39,20 +39,6 @@ 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 5
 email:
@@ -82,26 +68,38 @@ files:
 - 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
@@ -118,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
@@ -136,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
 - 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
@@ -197,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:
@@ -206,15 +268,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      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 5

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 )