comfy_bootstrap_form 4.0.8 → 4.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f5fa277272eb5da836a4e05b86c6d6ed5b8c83477503a03996b6a6816e62d87
-  data.tar.gz: dd88bf038a1ac1db7e084a263745a66a45d5bab772cc4eea8b6b897ef8b337b7
+  metadata.gz: 2199adf28ef935d5f2aabaac297c8e3efa9e064e6940a69c2ca47ca5048ce4f6
+  data.tar.gz: dd9e41ff96a4d230e40fbf1c7de45727303b092b57a8dfd2362d8105a00aa6a2
 SHA512:
-  metadata.gz: 396e6c5fb5dfe2568131ef03e2cdb8d994b40cb25e61b5aff2bc72d316ac5a7d7219de86cf4cbfa612b640de08651dabd4485f22ca48911850524e086ccfb976
-  data.tar.gz: 6052ea69accbea6fd3a9fc830894b7f92df80465d9e6cf8ead442853261d15727aa1d6a379196589397399a28c4ffa0c045e79b771d78613d973a1ab1b9a976f
+  metadata.gz: b6ca4fa7be726f57d96a37b72f1e679cce2a1b3720d2d355f7a9d61e9b7c7dba1294bcdd4be167ce00e2933578b4323d33f12dbc7a7d7ec84827cfd843fa8da5
+  data.tar.gz: 46018ae921efe5bf76a5233963c95ab27d8b3bc72ba924c233a5f9dfd9a155c6dc69ff473d526c4c08d38a4e27dcbdc315e5c8b5a61f6906cb83377d8e7cce49

data/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
@@ -314,7 +312,7 @@ Feel free to take a look at the [Demo App](/demo) to see how everything renders.
 Specifically see [form.html.erb](/demo/app/views/bootstrap/form.html.erb) template
 for all kinds of different form configurations you can have.
 
-![Demo Preview](/demo.png)
+![Demo Preview](/demo/preview.png)
 
 ---
 

data/lib/comfy_bootstrap_form/form_builder.rb

@@ -123,6 +123,52 @@ module ComfyBootstrapForm
       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 @@ module ComfyBootstrapForm
 
       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 @@ module ComfyBootstrapForm
       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
 

data/lib/comfy_bootstrap_form/version.rb

@@ -2,6 +2,6 @@
 
 module ComfyBootstrapForm
 
-  VERSION = "4.0.8"
+  VERSION = "4.0.9"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.0.9
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,7 +41,6 @@ files:
 - README.md
 - Rakefile
 - comfy_bootstrap_form.gemspec
-- demo.png
 - lib/comfy_bootstrap_form.rb
 - lib/comfy_bootstrap_form/bootstrap_options.rb
 - lib/comfy_bootstrap_form/form_builder.rb