comfy_bootstrap_form 4.0.0.beta1 → 4.0.0.beta2

data/lib/bootstrap_form/version.rb

@@ -1,3 +1,3 @@
 module BootstrapForm
-  VERSION = "4.0.0.beta1".freeze
+  VERSION = "4.0.0.beta2".freeze
 end

data/lib/bootstrap_form/view_helper.rb

@@ -0,0 +1,33 @@
+module BootstrapForm
+  module ViewHelper
+
+    # Wrapper for `form_with`. Passing in Bootstrap form builder.
+    def bootstrap_form_with(**options, &block)
+      supress_field_errors do
+        css_classes       = options.delete(:class) || ""
+        bootstrap_options = options[:bootstrap] || {}
+
+        if bootstrap_options[:layout].to_s == "inline"
+          css_classes << " form-inline"
+        end
+
+        form_options = options.reverse_merge(builder: BootstrapForm::FormBuilder)
+        form_options.merge!(class: css_classes) unless css_classes.blank?
+        form_with(**form_options, &block)
+      end
+    end
+
+  private
+
+    # By default, Rails will wrap form fields with extra html to indicate
+    # inputs with errors. We need to handle this in the builder to render
+    # Bootstrap specific markup. So we need to bypass this.
+    def supress_field_errors
+      original_proc = ActionView::Base.field_error_proc
+      ActionView::Base.field_error_proc = proc { |input, instance| input }
+      yield
+    ensure
+      ActionView::Base.field_error_proc = original_proc
+    end
+  end
+end

data/lib/comfy_bootstrap_form.rb

@@ -1 +1 @@
-require_relative "./bootstrap_form"
+require_relative "./bootstrap_form"

data/test/bootstrap_form/fields_test.rb

@@ -0,0 +1,304 @@
+require_relative "../test_helper"
+
+class FieldsTest < ActionView::TestCase
+
+  setup do
+    @user     = User.new
+    @builder  = BootstrapForm::FormBuilder.new(:user, @user, self, {})
+  end
+
+  def test_text_field
+    actual = @builder.text_field(:email)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_email">Email</label>
+        <input class="form-control" type="text" name="user[email]" id="user_email" />
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_text_field_label_text
+    actual = @builder.text_field(:email, bootstrap: {label: {text: "Custom Label"}})
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_email">Custom Label</label>
+        <input class="form-control" type="text" name="user[email]" id="user_email" />
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_text_field_label_css_class
+    actual = @builder.text_field(:email, bootstrap: {label: {class: "custom_class"}})
+    expected = <<-HTML
+      <div class="form-group">
+        <label class="custom_class" for="user_email">Email</label>
+        <input class="form-control" type="text" name="user[email]" id="user_email" />
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_text_field_label_hide
+    actual = @builder.text_field(:email, bootstrap: {label: {hide: true}})
+    expected = <<-HTML
+      <div class="form-group">
+        <label class="sr-only" for="user_email">Email</label>
+        <input class="form-control" type="text" name="user[email]" id="user_email" />
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_text_field_control_css_class
+    actual = @builder.text_field(:email, class: "custom-class")
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_email">Email</label>
+        <input class="custom-class form-control" type="text" name="user[email]" id="user_email" />
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_text_field_help_text
+    actual = @builder.text_field(:email, bootstrap: {help: "help text"})
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_email">Email</label>
+        <input class="form-control" type="text" name="user[email]" id="user_email" />
+        <small class="form-text text-muted">help text</small>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_select
+    actual = @builder.select(:test, %w[a b])
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <select class="form-control" id="user_test" name="user[test]">
+          <option value="a">a</option>
+          <option value="b">b</option>
+        </select>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_select_control_css_class
+    actual = @builder.select(:test, %w[a b], {}, class: "custom")
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <select class="custom form-control" id="user_test" name="user[test]">
+          <option value="a">a</option>
+          <option value="b">b</option>
+        </select>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_color_field
+    actual = @builder.color_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="color" name="user[test]" id="user_test" value="#000000"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_date_field
+    actual = @builder.date_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="date" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_datetime_field
+    actual = @builder.datetime_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="datetime-local" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_email_field
+    actual = @builder.email_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="email" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_file_field
+    actual = @builder.file_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="file" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_month_field
+    actual = @builder.month_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="month" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_number_field
+    actual = @builder.number_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="number" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_password_field
+    actual = @builder.password_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="password" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_phone_field
+    actual = @builder.phone_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="tel" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_range_field
+    actual = @builder.range_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="range" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_search_field
+    actual = @builder.search_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="search" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_text_area
+    actual = @builder.text_area(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <textarea class="form-control" name="user[test]" id="user_test"/></textarea>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_time_field
+    actual = @builder.time_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="time" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_url_field
+    actual = @builder.url_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="url" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_week_field
+    actual = @builder.week_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control" type="week" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_plaintext
+    actual = @builder.plaintext(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control-plaintext" readonly="readonly" type="text" name="user[test]" id="user_test"/>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_form_group
+    actual = @builder.form_group do
+      "test"
+    end
+    expected = <<-HTML
+      <div class="form-group">test</div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_form_group_with_label
+    actual = @builder.form_group(bootstrap: {label: {text: "Test"}}) do
+      "test"
+    end
+    expected = <<-HTML
+      <div class="form-group">
+        <label>Test</label>
+        test
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+end

data/test/bootstrap_form/fields_with_errors_test.rb

@@ -0,0 +1,109 @@
+require_relative "../test_helper"
+
+class FieldsWithErrorsTest < ActionView::TestCase
+
+  setup do
+    @user = User.new
+    @user.errors.add(:test, "invalid")
+
+    @builder  = BootstrapForm::FormBuilder.new(:user, @user, self, {})
+
+    @original_proc = ActionView::Base.field_error_proc
+    ActionView::Base.field_error_proc = proc { |input, instance| input }
+  end
+
+  teardown do
+    ActionView::Base.field_error_proc = @original_proc
+  end
+
+  def test_text_field_with_error
+    actual = @builder.text_field(:test)
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <input class="form-control is-invalid" id="user_test" name="user[test]" type="text"/>
+        <div class="invalid-feedback">invalid</div>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_check_box_with_error
+    actual = @builder.check_box(:test)
+    expected = <<-HTML
+      <fieldset class="form-group">
+        <div class="form-check">
+          <input name="user[test]" type="hidden" value="0"/>
+          <input class="form-check-input is-invalid" id="user_test" name="user[test]" type="checkbox" value="1"/>
+          <label class="form-check-label" for="user_test">Test</label>
+          <div class="invalid-feedback">invalid</div>
+        </div>
+      </fieldset>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_collection_radio_buttons_with_error_and_help
+    actual = @builder.collection_radio_buttons(:test, ["a", "b"], :to_s, :titleize, bootstrap: {help: "help text"})
+    expected = <<-HTML
+      <fieldset class="form-group">
+        <legend class="col-form-label pt-0">Test</legend>
+        <div class="form-check">
+          <input class="form-check-input is-invalid" id="user_test_a" name="user[test]" type="radio" value="a"/>
+          <label class="form-check-label" for="user_test_a">A</label>
+        </div>
+        <div class="form-check">
+          <input class="form-check-input is-invalid" id="user_test_b" name="user[test]" type="radio" value="b"/>
+          <label class="form-check-label" for="user_test_b">B</label>
+          <div class="invalid-feedback">invalid</div>
+          <small class="form-text text-muted">help text</small>
+        </div>
+      </fieldset>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_collection_radio_buttons_inline_with_error_and_help
+    actual = @builder.collection_radio_buttons(:test, ["a", "b"], :to_s, :titleize, bootstrap: {
+      inline: true,
+      help:   "help text"
+    })
+    expected = <<-HTML
+      <fieldset class="form-group">
+        <legend class="col-form-label pt-0">Test</legend>
+        <div class="form-check form-check-inline">
+          <input class="form-check-input is-invalid" id="user_test_a" name="user[test]" type="radio" value="a"/>
+          <label class="form-check-label" for="user_test_a">A</label>
+        </div>
+        <div class="form-check form-check-inline">
+          <input class="form-check-input is-invalid" id="user_test_b" name="user[test]" type="radio" value="b"/>
+          <label class="form-check-label" for="user_test_b">B</label>
+        </div>
+        <div class="invalid-feedback">invalid</div>
+        <small class="form-text text-muted">help text</small>
+      </fieldset>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_text_field_with_input_group_error
+    actual = @builder.text_field(:test, bootstrap: {prepend: "A", append: "Z"})
+    expected = <<-HTML
+      <div class="form-group">
+        <label for="user_test">Test</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text">A</span>
+          </div>
+          <input class="form-control is-invalid" id="user_test" name="user[test]" type="text"/>
+          <div class="input-group-append">
+            <span class="input-group-text">Z</span>
+          </div>
+          <div class="invalid-feedback">invalid</div>
+        </div>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+end