comfy_bootstrap_form 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1131134a470480c0db98c57088a09d3dc5875cdde69e2886c4ad58e56f85982
-  data.tar.gz: eb630d1a2474b38262f778ec6a77dcb6adcfb359f15ac11064e32aa164efbd26
+  metadata.gz: cf622e9dea142e6cd18d422f30446995fabff88afb88d60b92a5e1604d684f48
+  data.tar.gz: 5f9679e1bdd4605e79a4d59c374d45c8511bc700ee689fd7c0d3245f26ae01a2
 SHA512:
-  metadata.gz: 3159663372d2ce7266d3145ade1a927c7195e99df1954c4a535bfd402ffeaf2155df31277887d09dff6b561b3167226f7baab64605661e7d8a09950f12c65647
-  data.tar.gz: de46cca64ea6c26c322336d544a6d4ac0c719067ae64d0b5d3dcbd77acff0570a1aa2440d343b0f87ba38abf611e7ea98c7d14cc3aa442a09b2444e880ef9cdc
+  metadata.gz: 5f01ad97aa7ec33468d219cf2ff492aba96bb8ea7d65d4a177db7b9d31a0207dfe183bed2b67b4702a646b310b2c756098331667769e788455e763d906dd78fb
+  data.tar.gz: 7d7dac488acd94aae48fba8acbf7cab0be698211ac721896a9425fd92ffc51a59d89f4e594a56b1296e0ba9f522764a0f750b4d5eb5e1b36ff131faee660e74b

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 # Uncomment and change rails version for testing purposes
-# gem "rails", "~> 5.1.0"
+gem "rails", "~> 5.2.0.rc1"
 
 group :development do
   gem "rubocop", require: false
@@ -13,7 +13,6 @@ group :test do
   gem "coveralls", require: false
   gem "diffy"
   gem "equivalent-xml"
-  # gem "minitest", "~> 5.10.3"
   gem "minitest"
   gem "sqlite3"
 end

data/README.md

@@ -70,7 +70,7 @@ for all kinds of different form configurations you can have.
 
 ## Form helpers
 
-#### boostrap_form_with
+#### bootstrap_form_with
 
 Wrapper around `form_with` helper that's available in Rails 5.1 and above.
 Here's an example:
@@ -286,6 +286,16 @@ If you want to use something like a button, or other html content do this:
 <%= form.text_field :value, bootstrap: {append: {html: button_html}} %>
 ```
 
+#### Custom Forms
+
+Bootstrap can replace native browser form elements with custom ones for checkboxes,
+radio buttons and file input field. Example usage:
+
+```erb
+<%= form.file_field :photo, bootstrap: {custom_control: true} %>
+<%= form.collection_radio_buttons :choice, %w[yes no], :to_s, :to_s, bootstrap: {custom_control: true} %>
+```
+
 ### Gotchas
 
 - In Rails 5.1 `form_with` does not generate ids for inputs. If you want them
@@ -314,4 +324,4 @@ If you want to use something like a button, or other html content do this:
 
 ---
 
-Copyright 2018 Oleg Khabarov, Released under the [MIT License](LICENCE.md)
+Copyright 2018 Oleg Khabarov, Released under the [MIT License](LICENSE.md)

data/lib/bootstrap_form/bootstrap_options.rb

@@ -58,6 +58,12 @@ module BootstrapForm
     #
     attr_reader :check_inline
 
+    # Enables special input styling for file_field, radio and checkboxes. Example:
+    #
+    #   form.file_file :photo, bootstrap: {custom_control: true}
+    #
+    attr_reader :custom_control
+
     def initialize(options = {})
       set_defaults
       set_options(options)
@@ -109,6 +115,7 @@ module BootstrapForm
       @prepend              = nil
       @help                 = nil
       @check_inline         = false
+      @custom_control       = false
     end
 
   end

data/lib/bootstrap_form/form_builder.rb

@@ -4,7 +4,7 @@ module BootstrapForm
   class FormBuilder < ActionView::Helpers::FormBuilder
 
     FIELD_HELPERS = %w[
-      color_field date_field datetime_field email_field file_field month_field
+      color_field date_field datetime_field email_field month_field
       number_field password_field phone_field range_field search_field text_area
       text_field time_field url_field week_field
     ].freeze
@@ -49,6 +49,31 @@ module BootstrapForm
       end
     end
 
+    # Wrapper for file_field helper. It can accept `custom_control` option.
+    #
+    #   file_field :photo, bootstrap: {custom_control: true}
+    #
+    def file_field(method, options = {})
+      bootstrap = form_bootstrap.scoped(options.delete(:bootstrap))
+
+      draw_form_group(bootstrap, method, options) do
+        if bootstrap.custom_control
+          content_tag(:div, class: "custom-file") do
+            add_css_class!(options, "custom-file-input")
+            remove_css_class!(options, "form-control")
+            label_text = options.delete(:placeholder)
+            concat super(method, options)
+
+            label_options = { class: "custom-file-label" }
+            label_options[:for] = options[:id] if options[:id].present?
+            concat label(method, label_text, label_options)
+          end
+        else
+          super(method, options)
+        end
+      end
+    end
+
     # Wrapper around checkbox. Example usage:
     #
     #   checkbox :agree, bootstrap: {label: {text: "Do you agree?"}}
@@ -73,11 +98,22 @@ module BootstrapForm
 
       content_tag(:fieldset, class: fieldset_css_class) do
         draw_control_column(bootstrap, offset: true) do
-          content_tag(:div, class: "form-check") do
-            concat super(method, options, checked_value, unchecked_value)
-            concat label(method, label_text, class: "form-check-label")
-            concat errors     if errors.present?
-            concat help_text  if help_text.present?
+          if bootstrap.custom_control
+            content_tag(:div, class: "custom-control custom-checkbox") do
+              add_css_class!(options, "custom-control-input")
+              remove_css_class!(options, "form-check-input")
+              concat super(method, options, checked_value, unchecked_value)
+              concat label(method, label_text, 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, options, checked_value, unchecked_value)
+              concat label(method, label_text, class: "form-check-label")
+              concat errors     if errors.present?
+              concat help_text  if help_text.present?
+            end
           end
         end
       end
@@ -97,7 +133,7 @@ module BootstrapForm
     def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {})
       bootstrap = form_bootstrap.scoped(options.delete(:bootstrap))
 
-      args = [bootstrap, method, collection, value_method, text_method, options, html_options]
+      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)
       end
@@ -116,7 +152,7 @@ module BootstrapForm
         content << hidden_field(method, multiple: true, value: "")
       end
 
-      args = [bootstrap, method, collection, value_method, text_method, options, html_options]
+      args = [bootstrap, :check_box, method, collection, value_method, text_method, options, html_options]
       content << draw_choices(*args) do |m, v, opts|
         opts[:multiple]       = true
         opts[:include_hidden] = false
@@ -223,7 +259,7 @@ module BootstrapForm
 
     # form group wrapper for input fields
     def draw_form_group(bootstrap, method, options)
-      label  = draw_label(bootstrap, method)
+      label  = draw_label(bootstrap, method, for_attr: options[:id])
       errors = draw_errors(method)
 
       control = draw_control(bootstrap, errors, method, options) do
@@ -258,16 +294,13 @@ module BootstrapForm
     #
     #   text_field(:value, bootstrap: {label: {text: "Custom", class: "custom"}})
     #
-    def draw_label(bootstrap, method)
-      text    = nil
-      options = {}
+    def draw_label(bootstrap, method, for_attr: nil)
+      options = bootstrap.label.dup
+      text    = options.delete(:text)
 
-      if (custom_text = bootstrap.label[:text]).present?
-        text = custom_text
-      end
+      options[:for] = for_attr if for_attr.present?
 
-      add_css_class!(options, bootstrap.label[:class])
-      add_css_class!(options, "sr-only") if bootstrap.label[:hide]
+      add_css_class!(options, "sr-only") if options.delete(:hide)
       add_css_class!(options, bootstrap.inline_margin_class) if bootstrap.inline?
 
       if bootstrap.horizontal?
@@ -356,12 +389,30 @@ module BootstrapForm
     end
 
     # Rendering of choices for checkboxes and radio buttons
-    def draw_choices(bootstrap, method, collection, value_method, text_method, _options, html_options)
-      add_css_class!(html_options, "form-check-input")
+    def draw_choices(bootstrap, type, method, collection, value_method, text_method, _options, html_options)
+      draw_form_group_fieldset(bootstrap, method) do
+        if bootstrap.custom_control
+          label_css_class = "custom-control-label"
+
+          form_check_css_class = "custom-control"
+          form_check_css_class <<
+            case type
+            when :radio_button then " custom-radio"
+            when :check_box    then " custom-checkbox"
+            end
 
-      draw_form_group_fieldset(bootstrap, method, html_options) do
-        form_check_css_class = "form-check"
-        form_check_css_class << " form-check-inline" if bootstrap.check_inline
+          form_check_css_class << " custom-control-inline" if bootstrap.check_inline
+
+          add_css_class!(html_options, "custom-control-input")
+
+        else
+          label_css_class = "form-check-label"
+
+          form_check_css_class = "form-check"
+          form_check_css_class << " form-check-inline" if bootstrap.check_inline
+
+          add_css_class!(html_options, "form-check-input")
+        end
 
         errors    = draw_errors(method)
         help_text = draw_help(bootstrap.help)
@@ -369,13 +420,13 @@ module BootstrapForm
         add_css_class!(html_options, "is-invalid") if errors.present?
 
         content = "".html_safe
-        collection.each_with_index.map do |item, index|
+        collection.each_with_index do |item, index|
           item_value  = item.send(value_method)
           item_text   = item.send(text_method)
 
           content << content_tag(:div, class: form_check_css_class) do
             concat yield method, item_value, html_options
-            concat label(method, item_text, value: item_value, class: "form-check-label")
+            concat label(method, item_text, value: item_value, class: label_css_class)
             if ((collection.count - 1) == index) && !bootstrap.check_inline
               concat errors     if errors.present?
               concat help_text  if help_text.present?
@@ -393,7 +444,7 @@ module BootstrapForm
     end
 
     # Wrapper for collections of radio buttons and checkboxes
-    def draw_form_group_fieldset(bootstrap, method, _html_options)
+    def draw_form_group_fieldset(bootstrap, method)
       options = {}
 
       unless bootstrap.label[:hide]

data/lib/bootstrap_form/version.rb

@@ -1,5 +1,5 @@
 module BootstrapForm
 
-  VERSION = "4.0.1".freeze
+  VERSION = "4.0.2".freeze
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails