adding support for radio_button

Author: GBH

README.md

@@ -98,13 +98,11 @@ date_field      month_field     range_field   time_field
 datetime_field  number_field    search_field  url_field
 email_field     password_field  text_area     week_field
 date_select     time_select     datetime_select
-collection_radio_buttons        collection_check_boxes
-rich_text_area
+check_box       radio_button    rich_text_area
+collection_check_boxes
+collection_radio_buttons
 ```
 
-Singular `radio_button` is not implemented as it doesn't make sense to wrap one
-radio button input in Bootstrap markup.
-
 #### Radio Buttons and Checkboxes
 
 To render collection of radio buttons or checkboxes we use the same helper that

demo/README.md

@@ -4,6 +4,7 @@
 
 - `bundle`
 - `cd demo/`
+- `./bin/rails db:schema:load`
 - `./bin/rails s`
 - Navigate to http://localhost:3000
 - Start changing stuff in [/demo/app/views/bootstrap/form.html.erb](/demo/app/views/bootstrap/form.html.erb)

demo/app/views/bootstrap/form.html.erb

@@ -89,6 +89,9 @@
     <h3>Checkboxes and Radio buttons</h3>
     <% @user.test = "b" %>
     <%= bootstrap_form_with model: @user, scope: "user_d", url: "/" do |form| %>
+      <%= form.check_box :test, bootstrap: { label: "Singular Checkbox"} %>
+      <%= form.radio_button :test, "value_a", bootstrap: { label: "Singular Radio A"} %>
+      <%= form.radio_button :test, "value_b", bootstrap: { label: "Singular Radio B"} %>
       <%= form.collection_radio_buttons :test, [["a", "Label A"], ["b", "Label B"]], :first, :second %>
       <%= form.collection_check_boxes :test, [["e", "Label E"], ["f", "Label F"]], :first, :second, bootstrap: {help: "help text"} %>
       <%= form.collection_radio_buttons :test, ["u", "v", "w"], :to_s, :to_s, bootstrap: {check_inline: true, label: {text: "Custom Label"}} %>
@@ -99,6 +102,9 @@
     <h3>With Errors</h3>
     <% @user_with_error.test = "b" %>
     <%= bootstrap_form_with model: @user_with_error, scope: "user_e", url: "/" do |form| %>
+      <%= form.check_box :test, bootstrap: { label: "Singular Checkbox"} %>
+      <%= form.radio_button :test, "value_a", bootstrap: { label: "Singular Radio A"} %>
+      <%= form.radio_button :test, "value_b", bootstrap: { label: "Singular Radio B"} %>
       <%= form.collection_radio_buttons :test, [["a", "Label A"], ["b", "Label B"]], :first, :second %>
       <%= form.collection_check_boxes :test, [["e", "Label E"], ["f", "Label F"]], :first, :second, bootstrap: {help: "help text"} %>
       <%= form.collection_radio_buttons :test, ["u", "v", "w"], :to_s, :to_s, bootstrap: {check_inline: true, label: {text: "Custom Label"}} %>

lib/comfy_bootstrap_form/form_builder.rb

@@ -123,6 +123,52 @@ def file_field(method, options = {})
       end
     end
 
+    # Wrapper around radio button. Example usage:
+    #
+    #   radio_button :choice, "value", bootstrap: {label: {text: "Do you agree?"}}
+    #
+    def radio_button(method, tag_value, options = {})
+      bootstrap = form_bootstrap.scoped(options.delete(:bootstrap))
+      return super if bootstrap.disabled
+
+      help_text = draw_help(bootstrap)
+      errors    = draw_errors(bootstrap, method)
+
+      add_css_class!(options, "form-check-input")
+      add_css_class!(options, "is-invalid") if errors.present?
+
+      label_text = nil
+      if (custom_text = bootstrap.label[:text]).present?
+        label_text = custom_text
+      end
+
+      fieldset_css_class = "form-group"
+      fieldset_css_class += " row" if bootstrap.horizontal?
+      fieldset_css_class += " #{bootstrap.inline_margin_class}" if bootstrap.inline?
+
+      content_tag(:fieldset, class: fieldset_css_class) do
+        draw_control_column(bootstrap, offset: true) do
+          if bootstrap.custom_control
+            content_tag(:div, class: "custom-control custom-radio") do
+              add_css_class!(options, "custom-control-input")
+              remove_css_class!(options, "form-check-input")
+              concat super(method, tag_value, options)
+              concat label(method, label_text, value: tag_value, class: "custom-control-label")
+              concat errors     if errors.present?
+              concat help_text  if help_text.present?
+            end
+          else
+            content_tag(:div, class: "form-check") do
+              concat super(method, tag_value, options)
+              concat label(method, label_text, value: tag_value, class: "form-check-label")
+              concat errors     if errors.present?
+              concat help_text  if help_text.present?
+            end
+          end
+        end
+      end
+    end
+
     # Wrapper around checkbox. Example usage:
     #
     #   checkbox :agree, bootstrap: {label: {text: "Do you agree?"}}
@@ -186,7 +232,7 @@ def collection_radio_buttons(method, collection, value_method, text_method, opti
 
       args = [bootstrap, :radio_button, method, collection, value_method, text_method, options, html_options]
       draw_choices(*args) do |m, v, opts|
-        radio_button(m, v, opts)
+        radio_button(m, v, opts.merge(bootstrap: { disabled: true }))
       end
     end
 
@@ -208,7 +254,7 @@ def collection_check_boxes(method, collection, value_method, text_method, option
       content << draw_choices(*args) do |m, v, opts|
         opts[:multiple]       = true
         opts[:include_hidden] = false
-        ActionView::Helpers::FormBuilder.instance_method(:check_box).bind(self).call(m, opts, v)
+        check_box(m, opts.merge(bootstrap: { disabled: true }), v)
       end
     end
 

test/comfy_bootstrap_form/custom_fields_test.rb

@@ -51,6 +51,19 @@ def test_file_field_with_custom_id
     assert_xml_equal expected, actual
   end
 
+  def test_radio_button
+    actual = @builder.radio_button(:test, "value", bootstrap: { custom_control: true })
+    expected = <<-HTML
+      <fieldset class="form-group">
+        <div class="custom-control custom-radio">
+          <input class="custom-control-input" id="user_test_value" name="user[test]" type="radio" value="value"/>
+          <label class="custom-control-label" for="user_test_value">Value</label>
+        </div>
+      </fieldset>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
   def test_check_box
     actual = @builder.check_box(:test, bootstrap: { custom_control: true })
     expected = <<-HTML

test/comfy_bootstrap_form/radios_and_checkboxes_test.rb

@@ -89,7 +89,20 @@ def test_collection_checkboxes_without_hidden_field
     assert_xml_equal expected, actual
   end
 
-  def test_radio_buttons
+  def test_radio_button
+    actual = @builder.radio_button(:test, "value")
+    expected = <<-HTML
+      <fieldset class="form-group">
+        <div class="form-check">
+          <input class="form-check-input" id="user_test_value" name="user[test]" type="radio" value="value"/>
+          <label class="form-check-label" for="user_test_value">Value</label>
+        </div>
+      </fieldset>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_collection_radio_buttons
     actual = @builder.collection_radio_buttons(:test, %w[a b], :to_s, :titleize)
     expected = <<-HTML
       <fieldset class="form-group">