wrapper_class: false

.rubocop.yml

@@ -39,9 +39,7 @@ Layout/SpaceAroundEqualsInParameterDefault:
 
 Metrics/AbcSize:
   Max: 18
-  Exclude:
-    - "demo/test/**/*"
-    - "test/**/*"
+  Enabled: false
 
 Metrics/BlockLength:
   Exclude:

demo/app/models/user.rb

@@ -3,7 +3,7 @@ class User < ApplicationRecord
 
   serialize :preferences, coder: JSON
 
-  validates :email, presence: true, length: { minimum: 5 }, if: :always
+  validates :email, presence: true, length: { minimum: 5 }, if: :always?
   validates :terms, acceptance: { accept: true }
 
   # Conditional (always disabled) validators used in tests
@@ -15,7 +15,7 @@ class User < ApplicationRecord
 
   has_rich_text(:life_story)
 
-  def always # rubocop:disable Naming/PredicateMethod
+  def always?
     true
   end
 

gemfiles/8.0.gemfile

@@ -4,6 +4,6 @@ eval File.read(gems), binding, gems # rubocop: disable Security/Eval
 gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
 gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
 gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "rails", "~> 8.0.1"
 gem "propshaft"
+gem "rails", "~> 8.0.1"
 gem "sqlite3"

gemfiles/edge.gemfile

@@ -4,6 +4,6 @@ eval File.read(gems), binding, gems # rubocop: disable Security/Eval
 gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
 gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
 gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
 gem "propshaft"
+gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
 gem "sqlite3"

lib/bootstrap_form/components/validation.rb

@@ -71,7 +71,6 @@ def generate_error(name)
         content_tag(help_tag, help_text, class: help_klass)
       end
 
-      # rubocop:disable Metrics/AbcSize
       def get_error_messages(name)
         object.class.try(:reflections)&.each do |association_name, a|
           next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)

lib/bootstrap_form/form_group.rb

@@ -29,7 +29,7 @@ def form_group_content_tag(name, field_name, without_field_name, options, html_o
       end
     end
 
-    def form_group_content(label, help_text, options, &) # rubocop:disable Metrics/AbcSize
+    def form_group_content(label, help_text, options, &)
       label ||= ActiveSupport::SafeBuffer.new
       if group_layout_horizontal?(options[:layout])
         label + tag.div(capture(&) + help_text, class: form_group_control_class(options))

lib/bootstrap_form/inputs/check_box.rb

@@ -84,7 +84,10 @@ def check_box_label_class(options)
       def check_box_wrapper_class(options)
         classes = ["form-check"]
         classes << "form-check-inline" if layout_inline?(options[:inline])
-        classes << "mb-3" unless options[:multiple] || %i[horizontal inline].include?(layout)
+        classes << "mb-3" unless options[:multiple] ||
+                                 %i[horizontal inline].include?(layout) ||
+                                 options[:wrapper_class] == false ||
+                                 options.dig(:wrapper, :class) == false
         classes << "form-switch" if options[:switch]
         classes << options.dig(:wrapper, :class).presence
         classes << options[:wrapper_class].presence

test/bootstrap_checkbox_test.rb

@@ -623,6 +623,20 @@ class BootstrapCheckboxTest < ActionView::TestCase
     assert_equivalent_html expected, @builder.check_box(:terms, label: "I agree to the terms", wrapper_class: "custom-class")
   end
 
+  test "check box with custom wrapper class false" do
+    expected = <<~HTML
+      <div class="form-check">
+        <input #{autocomplete_attr} name="user[terms]" type="hidden" value="0" />
+        <input class="form-check-input" id="user_terms" name="user[terms]" type="checkbox" value="1" />
+        <label class="form-check-label" for="user_terms">
+          I agree to the terms
+        </label>
+      </div>
+    HTML
+    assert_equivalent_html expected, @builder.check_box(:terms, label: "I agree to the terms", wrapper_class: false)
+    assert_equivalent_html expected, @builder.check_box(:terms, label: "I agree to the terms", wrapper: { class: false })
+  end
+
   test "inline check box with custom wrapper class" do
     expected = <<~HTML
       <div class="form-check form-check-inline mb-3 custom-class">

test/bootstrap_fields_test.rb

@@ -233,6 +233,28 @@ class BootstrapFieldsTest < ActionView::TestCase
     assert_equivalent_html expected, @builder.text_field(:email)
   end
 
+  test "text fields are wrapped correctly with wrapper_class and wrapper: { class: 'custom-class' }" do
+    expected = <<~HTML
+      <div class="custom-class">
+        <label class="form-label required" for="user_email">Email</label>
+        <input required="required" class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" />
+      </div>
+    HTML
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper_class: "custom-class")
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper: { class: "custom-class" })
+  end
+
+  test "text fields are wrapped correctly with wrapper_class false" do
+    expected = <<~HTML
+      <div>
+        <label class="form-label required" for="user_email">Email</label>
+        <input required="required" class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" />
+      </div>
+    HTML
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper_class: false)
+    assert_equivalent_html expected, @builder.text_field(:email, wrapper: { class: false })
+  end
+
   test "text fields are wrapped correctly when horizontal and gutter classes are given" do
     expected = <<~HTML
       <div class="mb-3 g-3">

test/bootstrap_radio_button_test.rb

@@ -423,6 +423,21 @@ class BootstrapRadioButtonTest < ActionView::TestCase
                            @builder.radio_button(:misc, "1", label: "This is a radio button", wrapper_class: "custom-class")
   end
 
+  test "radio button with wrapper class false" do
+    expected = <<~HTML
+      <div class="form-check">
+        <input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
+        <label class="form-check-label" for="user_misc_1">
+          This is a radio button
+        </label>
+      </div>
+    HTML
+    assert_equivalent_html expected,
+                           @builder.radio_button(:misc, "1", label: "This is a radio button", wrapper_class: false)
+    assert_equivalent_html expected,
+                           @builder.radio_button(:misc, "1", label: "This is a radio button", wrapper: { class: false })
+  end
+
   test "inline radio button with custom wrapper class" do
     expected = <<~HTML
       <div class="form-check form-check-inline custom-class">