bootstrap-form 0.0.6 → 0.0.7

data/README.md

@@ -64,6 +64,7 @@ Then, you get something like this:
 * bootstrap_collection_select
 * bootstrap_file_field
 * bootstrap_text_area
+* bootstrap_email_field
 
 ## Error handling
 

data/lib/bootstrap-form/form_helper.rb

@@ -1,37 +1,54 @@
 module  ActionView
   module Helpers
     module FormHelper
+      
+      BOOTSTRAP_OPTIONS = [:label, :hint].freeze
+      
       def bootstrap_text_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, text_field(object_name, method, options.dup), options)
+        bootstrap_clearfix_wrap(object_name, method, text_field(object_name, method, extract_input_options(options)), options)
+      end
+
+      def bootstrap_email_field(object_name, method, options={})
+        bootstrap_clearfix_wrap(object_name, method, email_field(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_password_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, password_field(object_name, method, options.dup), options)
+        bootstrap_clearfix_wrap(object_name, method, password_field(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_collection_select(object_name, method, collection, value_method, text_method, options = {}, html_options = {})
-        bootstrap_clearfix_wrap(object_name, method, collection_select(object_name, method, collection, value_method, text_method, options.dup, html_options), options)
+        bootstrap_clearfix_wrap(object_name, method, collection_select(object_name, method, collection, value_method, text_method, extract_input_options(options), html_options), options)
       end
 
       def bootstrap_file_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, file_field(object_name, method, options.dup), options)
+        bootstrap_clearfix_wrap(object_name, method, file_field(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_text_area(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, text_area(object_name, method, options.dup), options)
+        bootstrap_clearfix_wrap(object_name, method, text_area(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_clearfix_wrap(object_name, method, content, options={})
         error_messages = options[:object].errors[method]
-        clearfix_tag = error_messages.empty? ? 'clearfix' : 'clearfix error'
+        clearfix_tag = error_messages.blank? ? 'clearfix' : 'clearfix error'
+        inline_help = inline_help_tag(error_messages.presence || options[:hint])
+
         content_tag(:div, label(object_name, method, options[:label]) +
-            content_tag(:div, content + inline_help_tag(error_messages), :class => 'input'),
+            content_tag(:div, content + inline_help, :class => 'input'),
             :class => clearfix_tag)
       end
 
       def inline_help_tag(messages)
-        message_span = ActiveSupport::SafeBuffer.new(" #{messages.join(',')}")
-        messages.empty? ? '' : content_tag(:span, message_span, :class => 'help-inline')
+        messages = Array.wrap(messages)
+        return '' if messages.empty?
+        message_span = ActiveSupport::SafeBuffer.new(" #{messages.to_sentence}")
+        content_tag(:span, message_span, :class => 'help-inline')
+      end
+      
+      private
+      
+      def extract_input_options(options)
+        options.except(*BOOTSTRAP_OPTIONS)
       end
     end
   end
@@ -42,6 +59,10 @@ class ActionView::Helpers::FormBuilder #:nodoc:
     @template.bootstrap_text_field(@object_name, method, objectify_options(options))
   end
 
+  def bootstrap_email_field(method, options={})
+    @template.bootstrap_email_field(@object_name, method, objectify_options(options))
+  end
+
   def bootstrap_password_field(method, options={})
     @template.bootstrap_password_field(@object_name, method, objectify_options(options))
   end

data/lib/bootstrap-form/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Form
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

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

@@ -37,6 +37,42 @@ class FormHelperTest < ActionView::TestCase
     assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
   end
 
+  def test_bootstrap_clearfix_wrap_with_many_errors
+    object  = mock
+    errors  = { :name   => ["has already been taken", "is reserved", "must be odd"] }
+    options = { :object => object }
+    content = ::ActiveSupport::SafeBuffer.new('content')
+    stub(object).errors { errors }
+    stub(object).name   { 'Object Name' }
+
+    expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> has already been taken, is reserved, and must be odd</span></div></div>}
+    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+  end
+
+  def test_bootstrap_clearfix_wrap_with_hint
+    object  = mock
+    errors  = {}
+    options = { :object => object, :hint => "format matters" }
+    content = ::ActiveSupport::SafeBuffer.new('content')
+    stub(object).errors { errors }
+    stub(object).name   { 'Object Name' }
+
+    expected_code = %{<div class="clearfix"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> format matters</span></div></div>}
+    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+  end
+
+  def test_bootstrap_clearfix_wrap_with_hint_and_errors
+    object  = mock
+    errors  = { :name   => ["can't be blank"] }
+    options = { :object => object, :hint => "format matters" }
+    content = ::ActiveSupport::SafeBuffer.new('content')
+    stub(object).errors { errors }
+    stub(object).name   { 'Object Name' }
+
+    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, content, options)
+  end
+
   def test_bootstrap_text_field
     html, text_field = mock, mock
     options = { :object => mock }
@@ -46,6 +82,15 @@ class FormHelperTest < ActionView::TestCase
     assert_equal html, bootstrap_text_field(:post, :name, options)
   end
 
+  def test_bootstrap_email_field
+    html, email_field = mock, mock
+    options = { :object => mock }
+
+    mock(self).email_field(:post, :email, options) { email_field }
+    mock(self).bootstrap_clearfix_wrap(:post, :email, email_field, options.dup) { html }
+    assert_equal html, bootstrap_email_field(:post, :email, options)
+  end
+
   def test_bootstrap_password_field
     html, password_field = mock, mock
     options = { :object => mock }
@@ -82,5 +127,14 @@ class FormHelperTest < ActionView::TestCase
     mock(self).bootstrap_clearfix_wrap(:post, :description, text_area, options.dup) { html }
     assert_equal html, bootstrap_text_area(:post, :description, options)
   end
+
+  def test_ignore_bootstrap_options
+    html, text_area = mock, mock
+    options = { :object => mock, :label => "Custom", :hint => "be careful" }
+
+    mock(self).text_area(:post, :description, options.except(:label, :hint)) { text_area }
+    mock(self).bootstrap_clearfix_wrap(:post, :description, text_area, options.dup) { html }
+    assert_equal html, bootstrap_text_area(:post, :description, options)
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-form
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70310125359080 !ruby/object:Gem::Requirement
+  requirement: &70116894263240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310125359080
+  version_requirements: *70116894263240
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70310125358580 !ruby/object:Gem::Requirement
+  requirement: &70116894262740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310125358580
+  version_requirements: *70116894262740
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70310125358200 !ruby/object:Gem::Requirement
+  requirement: &70116894262360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310125358200
+  version_requirements: *70116894262360
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70310125357740 !ruby/object:Gem::Requirement
+  requirement: &70116894261900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310125357740
+  version_requirements: *70116894261900
 description: Twitter Bootstrap Form helpers
 email:
 - david@crowdint.com