bootstrap_form 2.1.1 → 2.2.0

data/lib/bootstrap_form/form_builder.rb

@@ -26,53 +26,79 @@ module BootstrapForm
     end
 
     FIELD_HELPERS.each do |method_name|
-      define_method(method_name) do |name, options = {}|
+      with_method_name = "#{method_name}_with_bootstrap"
+      without_method_name = "#{method_name}_without_bootstrap"
+
+      define_method(with_method_name) do |name, options = {}|
         form_group_builder(name, options) do
           prepend_and_append_input(options) do
-            super(name, options)
+            send(without_method_name, name, options)
           end
         end
       end
+
+      alias_method_chain method_name, :bootstrap
     end
 
     DATE_SELECT_HELPERS.each do |method_name|
-      define_method(method_name) do |name, options = {}, html_options = {}|
+      with_method_name = "#{method_name}_with_bootstrap"
+      without_method_name = "#{method_name}_without_bootstrap"
+
+      define_method(with_method_name) do |name, options = {}, html_options = {}|
         form_group_builder(name, options, html_options) do
-          content_tag(:div, super(name, options, html_options), class: control_specific_class(method_name))
+          content_tag(:div, send(without_method_name, name, options, html_options), class: control_specific_class(method_name))
         end
       end
+
+      alias_method_chain method_name, :bootstrap
     end
 
-    def file_field(name, options = {})
+    def file_field_with_bootstrap(name, options = {})
       form_group_builder(name, options.reverse_merge(control_class: nil)) do
-        super(name, options)
+        file_field_without_bootstrap(name, options)
       end
     end
 
-    def select(method, choices, options = {}, html_options = {})
+    alias_method_chain :file_field, :bootstrap
+
+    def select_with_bootstrap(method, choices, options = {}, html_options = {})
       form_group_builder(method, options, html_options) do
-        super(method, choices, options, html_options)
+        select_without_bootstrap(method, choices, options, html_options)
       end
     end
 
-    def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
+    alias_method_chain :select, :bootstrap
+
+    def collection_select_with_bootstrap(method, collection, value_method, text_method, options = {}, html_options = {})
       form_group_builder(method, options, html_options) do
-        super(method, collection, value_method, text_method, options, html_options)
+        collection_select_without_bootstrap(method, collection, value_method, text_method, options, html_options)
       end
     end
 
-    def grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+    alias_method_chain :collection_select, :bootstrap
+
+    def grouped_collection_select_with_bootstrap(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
       form_group_builder(method, options, html_options) do
-        super(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+        grouped_collection_select_without_bootstrap(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
       end
     end
 
-    def check_box(name, options = {}, checked_value = "1", unchecked_value = "0", &block)
+    alias_method_chain :grouped_collection_select, :bootstrap
+
+    def time_zone_select_with_bootstrap(method, priority_zones = nil, options = {}, html_options = {})
+      form_group_builder(method, options, html_options) do
+        time_zone_select_without_bootstrap(method, priority_zones, options, html_options)
+      end
+    end
+
+    alias_method_chain :time_zone_select, :bootstrap
+
+    def check_box_with_bootstrap(name, options = {}, checked_value = "1", unchecked_value = "0", &block)
       options = options.symbolize_keys!
 
-      html = super(name, options.except(:label, :help, :inline), checked_value, unchecked_value)
+      html = check_box_without_bootstrap(name, options.except(:label, :help, :inline), checked_value, unchecked_value)
       label_content = block_given? ? capture(&block) : options[:label]
-      html.concat(" ").concat(label_content || object.class.human_attribute_name(name) || name.to_s.humanize)
+      html.concat(" ").concat(label_content || (object && object.class.human_attribute_name(name)) || name.to_s.humanize)
 
       label_name = name
       label_name = "#{name}_#{checked_value}" if options[:multiple]
@@ -86,22 +112,31 @@ module BootstrapForm
       end
     end
 
-    def radio_button(name, value, *args)
+    alias_method_chain :check_box, :bootstrap
+
+    def radio_button_with_bootstrap(name, value, *args)
       options = args.extract_options!.symbolize_keys!
       args << options.except(:label, :help, :inline)
 
-      html = super(name, value, *args) + " " + options[:label]
+      html = radio_button_without_bootstrap(name, value, *args) + " " + options[:label]
 
-      css = "radio"
-      css << "-inline" if options[:inline]
-      label(name, html, class: css, for: nil)
+      if options[:inline]
+        label(name, html, class: "radio-inline", value: value)
+      else
+        content_tag(:div, class: "radio") do
+          label(name, html, value: value)
+        end
+      end
     end
 
+    alias_method_chain :radio_button, :bootstrap
+
     def collection_check_boxes(*args)
-      inputs_collection(*args) do |name, value, options|
+      html = inputs_collection(*args) do |name, value, options|
         options[:multiple] = true
         check_box(name, options, value, nil)
       end
+      hidden_field(args.first,{value: "", multiple: true}).concat(html)
     end
 
     def collection_radio_buttons(*args)
@@ -122,29 +157,42 @@ module BootstrapForm
 
     def form_group(*args, &block)
       options = args.extract_options!
-      name    = args.first
-      
+      name = args.first
+
       options[:class] = ["form-group", options[:class]].compact.join(' ')
       options[:class] << " #{error_class}" if has_error?(name)
+      options[:class] << " #{feedback_class}" if options[:icon]
+
+      content_tag(:div, options.except(:id, :label, :help, :icon, :label_col, :control_col, :layout)) do
+        label   = generate_label(options[:id], name, options[:label], options[:label_col], options[:layout]) if options[:label]
+        control = capture(&block).to_s
+        control.concat(generate_help(name, options[:help]).to_s)
+        control.concat(generate_icon(options[:icon])) if options[:icon]
 
-      content_tag(:div, options.except(:id, :label, :help, :label_col, :control_col, :layout)) do
-        label = generate_label(options[:id], name, options[:label], options[:label_col], options[:layout])
-        control_and_help = capture(&block).concat(generate_help(name, options[:help]))
         if get_group_layout(options[:layout]) == :horizontal
-          control_and_help = content_tag(:div, control_and_help, class: (options[:control_col] || control_col))
+          control_class = (options[:control_col] || control_col.clone)
+
+          unless options[:label]
+            control_offset = offset_col(/([0-9]+)$/.match(options[:label_col] || default_label_col))
+            control_class.concat(" #{control_offset}")
+          end
+          control = content_tag(:div, control, class: control_class)
         end
-        concat(label).concat(control_and_help)
+
+        concat(label).concat(control)
       end
     end
 
-    def fields_for(record_name, record_object = nil, fields_options = {}, &block)
+    def fields_for_with_bootstrap(record_name, record_object = nil, fields_options = {}, &block)
       fields_options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
       fields_options[:layout] ||= options[:layout]
       fields_options[:label_col] = fields_options[:label_col].present? ? "#{fields_options[:label_col]} #{label_class}" : options[:label_col]
       fields_options[:control_col] ||= options[:control_col]
-      super(record_name, record_object, fields_options, &block)
+      fields_for_without_bootstrap(record_name, record_object, fields_options, &block)
     end
 
+    alias_method_chain :fields_for, :bootstrap
+
     private
 
     def horizontal?
@@ -159,6 +207,10 @@ module BootstrapForm
       "col-sm-2"
     end
 
+    def offset_col(offset)
+      "col-sm-offset-#{offset}"
+    end
+
     def default_control_col
       "col-sm-10"
     end
@@ -179,6 +231,10 @@ module BootstrapForm
       "has-error"
     end
 
+    def feedback_class
+      "has-feedback"
+    end
+
     def control_specific_class(method)
       "rails-bootstrap-forms-#{method.gsub(/_/, "-")}"
     end
@@ -200,12 +256,32 @@ module BootstrapForm
 
       label = options.delete(:label)
       label_class = hide_class if options.delete(:hide_label)
+      wrapper_class = options.delete(:wrapper_class)
+      wrapper_options = options.delete(:wrapper)
       help = options.delete(:help)
+      icon = options.delete(:icon)
       label_col = options.delete(:label_col)
       control_col = options.delete(:control_col)
       layout = get_group_layout(options.delete(:layout))
+      form_group_options = {
+        id: options[:id],
+        label: {
+          text: label,
+          class: label_class
+        },
+        help: help,
+        icon: icon,
+        label_col: label_col,
+        control_col: control_col,
+        layout: layout,
+        class: wrapper_class
+      }
+
+      if wrapper_options.is_a?(Hash)
+        form_group_options.reverse_merge!(wrapper_options)
+      end
 
-      form_group(method, id: options[:id], label: { text: label, class: label_class }, help: help, label_col: label_col, control_col: control_col, layout: layout) do
+      form_group(method, form_group_options) do
         yield
       end
     end
@@ -217,22 +293,24 @@ module BootstrapForm
     end
 
     def generate_label(id, name, options, custom_label_col, group_layout)
-      if options
-        options[:for] = id if acts_like_form_tag
-        classes = [options[:class], label_class]
-        classes << (custom_label_col || label_col) if get_group_layout(group_layout) == :horizontal
-        options[:class] = classes.compact.join(" ")
-
-        label(name, options[:text], options.except(:text))
-      elsif get_group_layout(group_layout) == :horizontal
-        # no label. create an empty one to keep proper form alignment.
-        content_tag(:label, "", class: "#{label_class} #{label_col}")
-      end
+      options[:for] = id if acts_like_form_tag
+      classes = [options[:class], label_class]
+      classes << (custom_label_col || label_col) if get_group_layout(group_layout) == :horizontal
+      options[:class] = classes.compact.join(" ")
+
+      label(name, options[:text], options.except(:text))
     end
 
     def generate_help(name, help_text)
       help_text = object.errors[name].join(", ") if has_error?(name) && inline_errors
-      content_tag(:span, help_text, class: "help-block") if help_text
+      return if help_text === false
+
+      help_text ||= I18n.t(name, scope: "activerecord.help.#{object.class.to_s.downcase}", default: '')
+      content_tag(:span, help_text, class: 'help-block') if help_text.present?
+    end
+
+    def generate_icon(icon)
+      content_tag(:span, "", class: "glyphicon glyphicon-#{icon} form-control-feedback")
     end
 
     def inputs_collection(name, collection, value, text, options = {}, &block)
@@ -241,7 +319,13 @@ module BootstrapForm
 
         collection.each do |obj|
           input_options = options.merge(label: obj.send(text))
-          input_options[:checked] = input_options[:checked] == obj.send(value) if input_options[:checked]
+
+          if checked = input_options[:checked]
+            input_options[:checked] = checked == obj.send(value)              ||
+                                      checked.try(:include?, obj.send(value)) ||
+                                      checked == obj                          ||
+                                      checked.try(:include?, obj)
+          end
 
           input_options.delete(:class)
           inputs << block.call(name, obj.send(value), input_options)

data/lib/bootstrap_form/helper.rb

@@ -7,6 +7,9 @@ module BootstrapForm
     def bootstrap_form_for(object, options = {}, &block)
       options.reverse_merge!({builder: BootstrapForm::FormBuilder})
 
+      options[:html] ||= {}
+      options[:html][:role] ||= 'form'
+
       layout = case options[:layout]
         when :inline
           "form-inline"
@@ -15,7 +18,6 @@ module BootstrapForm
       end
 
       if layout
-        options[:html] ||= {}
         options[:html][:class] = [options[:html][:class], layout].compact.join(" ")
       end
 

data/lib/bootstrap_form/helpers/bootstrap.rb

@@ -17,7 +17,7 @@ module BootstrapForm
         if object.respond_to?(:errors) && object.errors.full_messages.any?
           content_tag :div, class: css do
             concat content_tag :p, title
-            concat error_summary unless inline_errors || options[:error_summary] == false
+            concat error_summary unless options[:error_summary] == false
           end
         end
       end
@@ -30,15 +30,24 @@ module BootstrapForm
         end
       end
 
-      def errors_on(name)
+      def errors_on(name, options = {})
         if has_error?(name)
+          hide_attribute_name = options[:hide_attribute_name] || false
+
           content_tag :div, class: "alert alert-danger" do
-            object.errors.full_messages_for(name).join(", ")
+            if hide_attribute_name
+              object.errors[name].join(", ")
+            else
+              object.errors.full_messages_for(name).join(", ")
+            end
           end
         end
       end
 
-      def static_control(name, options = {}, &block)
+      def static_control(*args, &block)
+        options = args.extract_options!
+        name = args.first
+
         html = if block_given?
           capture(&block)
         else
@@ -54,12 +63,20 @@ module BootstrapForm
         options = options.extract!(:prepend, :append)
         input = capture(&block)
 
-        input = content_tag(:span, options[:prepend], class: 'input-group-addon') + input if options[:prepend]
-        input << content_tag(:span, options[:append], class: 'input-group-addon') if options[:append]
-        input = content_tag(:div, input, class: 'input-group') if options[:prepend] || options[:append]
+        input = content_tag(:span, options[:prepend], class: input_group_class(options[:prepend])) + input if options[:prepend]
+        input << content_tag(:span, options[:append], class: input_group_class(options[:append])) if options[:append]
+        input = content_tag(:div, input, class: "input-group") unless options.empty?
         input
       end
 
+      def input_group_class(add_on_content)
+        if add_on_content.match /btn/
+          'input-group-btn'
+        else
+          'input-group-addon'
+        end
+      end
+
       def static_class
         "form-control-static"
       end

data/lib/bootstrap_form/version.rb

@@ -1,3 +1,3 @@
 module BootstrapForm
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/test/bootstrap_checkbox_test.rb

@@ -0,0 +1,71 @@
+require 'test_helper'
+
+class BootstrapCheckboxTest < ActionView::TestCase
+  include BootstrapForm::Helper
+
+  def setup
+    setup_test_fixture
+  end
+
+  test "check_box is wrapped correctly" do
+    expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label></div>}
+    assert_equal expected, @builder.check_box(:terms, label: 'I agree to the terms')
+  end
+
+  test "check_box label allows html" do
+    expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the <a href="#">terms</a></label></div>}
+    assert_equal expected, @builder.check_box(:terms, label: %{I agree to the <a href="#">terms</a>}.html_safe)
+  end
+
+  test "check_box accepts a block to define the label" do
+    expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label></div>}
+    assert_equal expected, @builder.check_box(:terms) { "I agree to the terms" }
+  end
+
+  test "check_box responds to checked_value and unchecked_value arguments" do
+    expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="no" /><input id="user_terms" name="user[terms]" type="checkbox" value="yes" /> I agree to the terms</label></div>}
+    assert_equal expected, @builder.check_box(:terms, {label: 'I agree to the terms'}, 'yes', 'no')
+  end
+
+  test "inline checkboxes" do
+    expected = %{<label class="checkbox-inline" for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label>}
+    assert_equal expected, @builder.check_box(:terms, label: 'I agree to the terms', inline: true)
+  end
+
+  test 'collection_check_boxes renders the form_group correctly' do
+    collection = [Address.new(id: 1, street: 'Foobar')]
+    expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">This is a checkbox collection</label><div class="checkbox"><label for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foobar</label></div><span class="help-block">With a help!</span></div>}
+
+    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, label: 'This is a checkbox collection', help: 'With a help!')
+  end
+
+  test 'collection_check_boxes renders multiple checkboxes correctly' do
+    collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
+    expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label></div><div class="checkbox"><label for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div></div>}
+
+    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street)
+  end
+
+  test 'collection_check_boxes renders inline checkboxes correctly' do
+    collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
+    expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><label class="checkbox-inline" for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label><label class="checkbox-inline" for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div>}
+
+    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, inline: true)
+  end
+
+  test 'collection_check_boxes renders with checked option correctly' do
+    collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
+    expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input checked="checked" id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label></div><div class="checkbox"><label for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div></div>}
+
+    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: 1)
+    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: collection.first)
+  end
+
+  test 'collection_check_boxes renders with multiple checked options correctly' do
+    collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
+    expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input checked="checked" id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label></div><div class="checkbox"><label for="user_misc_2"><input checked="checked" id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div></div>}
+
+    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: [1, 2])
+    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: collection)
+  end
+end

data/test/bootstrap_fields_test.rb

@@ -0,0 +1,152 @@
+require 'test_helper'
+
+class BootstrapFieldsTest < ActionView::TestCase
+  include BootstrapForm::Helper
+
+  def setup
+    setup_test_fixture
+  end
+
+  test "color fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="color" value="#000000" /></div>}
+    assert_equal expected, @builder.color_field(:misc)
+  end
+
+  test "date fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="date" /></div>}
+    assert_equal expected, @builder.date_field(:misc)
+  end
+
+  test "date time fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="datetime" /></div>}
+    assert_equal expected, @builder.datetime_field(:misc)
+  end
+
+  test "date time local fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="datetime-local" /></div>}
+    assert_equal expected, @builder.datetime_local_field(:misc)
+  end
+
+  test "email fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="email" /></div>}
+    assert_equal expected, @builder.email_field(:misc)
+  end
+
+  test "file fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input id="user_misc" name="user[misc]" type="file" /></div>}
+    assert_equal expected, @builder.file_field(:misc)
+  end
+
+  test "hidden fields are supported" do
+    expected = %{<input id="user_misc" name="user[misc]" type="hidden" />}
+    assert_equal expected, @builder.hidden_field(:misc)
+  end
+
+  test "month local fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="month" /></div>}
+    assert_equal expected, @builder.month_field(:misc)
+  end
+
+  test "number fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="number" /></div>}
+    assert_equal expected, @builder.number_field(:misc)
+  end
+
+  test "password fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_password">Password</label><input class="form-control" id="user_password" name="user[password]" type="password" /><span class="help-block">A good password should be at least six characters long</span></div>}
+    assert_equal expected, @builder.password_field(:password)
+  end
+
+  test "phone/telephone fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="tel" /></div>}
+    assert_equal expected, @builder.phone_field(:misc)
+    assert_equal expected, @builder.telephone_field(:misc)
+  end
+
+  test "range fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="range" /></div>}
+    assert_equal expected, @builder.range_field(:misc)
+  end
+
+  test "search fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="search" /></div>}
+    assert_equal expected, @builder.search_field(:misc)
+  end
+
+  test "text areas are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_comments">Comments</label><textarea class="form-control" id="user_comments" name="user[comments]">\nmy comment</textarea></div>}
+    assert_equal expected, @builder.text_area(:comments)
+  end
+
+  test "text fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
+    assert_equal expected, @builder.text_field(:email)
+  end
+
+  test "time fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="time" /></div>}
+    assert_equal expected, @builder.time_field(:misc)
+  end
+
+  test "url fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="url" /></div>}
+    assert_equal expected, @builder.url_field(:misc)
+  end
+
+  test "week fields are wrapped correctly" do
+    expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="week" /></div>}
+    assert_equal expected, @builder.week_field(:misc)
+  end
+
+  test "bootstrap_form_for helper works for associations" do
+    @user.address = Address.new(street: '123 Main Street')
+
+    output = bootstrap_form_for(@user) do |f|
+      f.fields_for :address do |af|
+        af.text_field(:street)
+      end
+    end
+
+    expected = %{<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label" for="user_address_attributes_street">Street</label><input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" /></div></form>}
+    assert_equal expected, output
+  end
+
+  test "bootstrap_form_for helper works for serialized hash attributes" do
+    @user.preferences = { favorite_color: "cerulean" }
+
+    output = bootstrap_form_for(@user) do |f|
+      f.fields_for :preferences do |builder|
+        builder.text_field :favorite_color, value: @user.preferences[:favorite_color]
+      end
+    end
+
+    expected = %{<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label" for="user_preferences_favorite_color">Favorite color</label><input class="form-control" id="user_preferences_favorite_color" name="user[preferences][favorite_color]" type="text" value="cerulean" /></div></form>}
+    assert_equal expected, output
+  end
+
+  test "fields_for correctly passes horizontal style from parent builder" do
+    @user.address = Address.new(street: '123 Main Street')
+
+    output = bootstrap_form_for(@user, layout: :horizontal, label_col: 'col-sm-2', control_col: 'col-sm-10') do |f|
+      f.fields_for :address do |af|
+        af.text_field(:street)
+      end
+    end
+
+    expected = %{<form accept-charset="UTF-8" action="/users" class="form-horizontal" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label col-sm-2" for="user_address_attributes_street">Street</label><div class="col-sm-10"><input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" /></div></div></form>}
+    assert_equal expected, output
+  end
+
+  test "fields_for correctly passes inline style from parent builder" do
+    @user.address = Address.new(street: '123 Main Street')
+
+    output = bootstrap_form_for(@user, layout: :inline) do |f|
+      f.fields_for :address do |af|
+        af.text_field(:street)
+      end
+    end
+
+    expected = %{<form accept-charset="UTF-8" action="/users" class="form-inline" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label" for="user_address_attributes_street">Street</label><input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" /></div></form>}
+    assert_equal expected, output
+  end
+end