bootstrap-form 0.0.1 → 0.0.2

data/lib/bootstrap-form.rb

@@ -1,8 +1,3 @@
 require "bootstrap-form/version"
 require "bootstrap-form/form_helper"
 
-module Bootstrap
-  module Form
-    # Your code goes here...
-  end
-end

data/lib/bootstrap-form/form_helper.rb

@@ -2,33 +2,24 @@ module  ActionView
   module Helpers
     module FormHelper
       def bootstrap_text_field(object_name, method, options={})
-        error_messages = options[:object].errors[method]
-        clearfix_tag = error_messages.empty? ? 'clearfix' : 'clearfix error'
-
-        content_tag(:div,
-                    label(object_name, method) +
-                    content_tag(:div,
-                        text_field(object_name, method, options) +
-                        inline_help_tag(error_messages),
-                        class: 'input'),
-                    class: clearfix_tag)
+        bootstrap_clearfix_wrap(object_name, method, options.dup, text_field(object_name, method, options))
       end
 
       def bootstrap_password_field(object_name, method, options={})
+        bootstrap_clearfix_wrap(object_name, method, options.dup, password_field(object_name, method, options))
+      end
+
+      def bootstrap_clearfix_wrap(object_name, method, options={}, content)
         error_messages = options[:object].errors[method]
         clearfix_tag = error_messages.empty? ? 'clearfix' : 'clearfix error'
-
-        content_tag(:div,
-                    label(object_name, method) +
-                    content_tag(:div,
-                        password_field(object_name, method, options) +
-                        inline_help_tag(error_messages),
-                        class: 'input'),
-                    class: clearfix_tag)
+        content_tag(:div, label(object_name, method) +
+            content_tag(:div, content + inline_help_tag(error_messages), class: 'input'),
+            class: clearfix_tag)
       end
 
       def inline_help_tag(messages)
-        messages.empty? ? '' : content_tag(:span, messages.join(','), class: 'help-inline')
+        message_span = ActiveSupport::SafeBuffer.new(" #{messages.join(',')}")
+        messages.empty? ? '' : content_tag(:span, message_span, class: 'help-inline')
       end
     end
   end

data/lib/bootstrap-form/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Form
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/lib/action_view/helpers/form_helper_test.rb

@@ -1,47 +1,44 @@
 require 'test_helper'
 
 class FormHelperTest < ActionView::TestCase
-  def test_bootstrap_text_field
+  def test_bootstrap_clearfix_wrap
     object = mock
-    errors = { :name => [] }
+    errors = {:name => []}
     stub(object).errors { errors }
     stub(object).name { 'Object Name' }
     options = { :object => object }
+    content = ::ActiveSupport::SafeBuffer.new('content')
+    # content = ''
 
-    expected_code = %{<div class="clearfix"><label for="post_name">Name</label><div class="input"><input id="post_name" name="post[name]" size="30" type="text" value="Object Name" /></div></div>}
-    assert_equal(expected_code, bootstrap_text_field(:post, :name, options))
+    expected_code = %{<div class="clearfix"><label for="post_name">Name</label><div class="input">content</div></div>}
+    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, options, content)
   end
 
-  def test_bootstrap_text_field_with_errors
+  def test_bootstrap_clearfix_wrap_with_errors
     object = mock
     errors = {:name => ["can't be blank"]}
     stub(object).errors { errors }
     stub(object).name { 'Object Name' }
     options = { :object => object }
+    content = ::ActiveSupport::SafeBuffer.new('content')
 
-    expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input"><input id="post_name" name="post[name]" size="30" type="text" value="Object Name" /><span class="help-inline">can't be blank</span></div></div>}
-    assert_equal(expected_code, bootstrap_text_field(:post, :name, options))
+    expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> can't be blank</span></div></div>}
+    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, options, content)
   end
 
-  def test_bootstrap_password_field
-    object = mock
-    errors = { :name => [] }
-    stub(object).errors { errors }
-    stub(object).name { 'Object Name' }
-    options = { :object => object }
-
-    expected_code = %{<div class="clearfix"><label for="post_name">Name</label><div class="input"><input id="post_name" name="post[name]" size="30" type="password" /></div></div>}
-    assert_equal(expected_code, bootstrap_password_field(:post, :name, options))
+  def test_bootstrap_text_field
+    options    = { :object => mock }
+    html, text_field = mock, mock
+    mock(self).text_field(:post, :name, options) { text_field }
+    mock(self).bootstrap_clearfix_wrap(:post, :name, options.dup, text_field) { html }
+    assert_equal html, bootstrap_text_field(:post, :name, options)
   end
 
-  def test_bootstrap_password_field_with_errors
-    object = mock
-    errors = {:name => ["can't be blank"]}
-    stub(object).errors { errors }
-    stub(object).name { 'Object Name' }
-    options = { :object => object }
-
-    expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input"><input id="post_name" name="post[name]" size="30" type="password" /><span class="help-inline">can't be blank</span></div></div>}
-    assert_equal(expected_code, bootstrap_password_field(:post, :name, options))
+  def test_bootstrap_password_field
+    options    = { :object => mock }
+    html, password_field = mock, mock
+    mock(self).password_field(:post, :name, options) { password_field }
+    mock(self).bootstrap_clearfix_wrap(:post, :name, options.dup, password_field) { html }
+    assert_equal html, bootstrap_password_field(:post, :name, options)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-form
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70143631856780 !ruby/object:Gem::Requirement
+  requirement: &70319989305380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143631856780
+  version_requirements: *70319989305380
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70143631856360 !ruby/object:Gem::Requirement
+  requirement: &70319989286820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143631856360
+  version_requirements: *70319989286820
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70143631855900 !ruby/object:Gem::Requirement
+  requirement: &70319985555820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143631855900
+  version_requirements: *70319985555820
 description: Twitter Bootstrap Form helpers
 email:
 - david@crowdint.com