twitter_bootstrap_form_for 1.0.3 → 1.0.4

data/CHANGELOG.markdown

@@ -1,6 +1,9 @@
 Twitter Bootstrap Form For Changes
 ==================================
 
+## 1.0.4 (2011-11-20) ##
+  - support for inline fields (closes [\#2])
+
 ## 1.0.3 (2011-11-11) ##
   - ruby 1.8 compatibility for hidden fields (closes [\#20])
   - produce correct labels for radio buttons (closes [\#16])
@@ -36,4 +39,5 @@ Twitter Bootstrap Form For Changes
 [\#14]: https://github.com/stouset/twitter_bootstrap_form_for/issues/14
 [\#7]:  https://github.com/stouset/twitter_bootstrap_form_for/issues/7
 [\#5]:  https://github.com/stouset/twitter_bootstrap_form_for/issues/5
+[\#2]:  https://github.com/stouset/twitter_bootstrap_form_for/issues/2
 [\#1]:  https://github.com/stouset/twitter_bootstrap_form_for/issues/1

data/README.markdown

@@ -38,6 +38,15 @@ Just Rails. But you were going to use that anyway, weren't you?
     / input fields with custom add-ons
     = user.text_field :twitter_id, 'Twitter', :class => 'medium', :add_on => :prepend do
       %span.add-on @
+      
+    / select fields now have the second parameter as a label
+    = user.date_select :born_on, 'Born on', {}, :class => 'small'
+
+    / inline inputs are not automatically labeled
+    = user.inline 'Interests' do |inline|
+      #{inline.text_field :interest_1, :class => 'small'},
+      #{inline.text_field :interest_2, :class => 'small'}, and
+      #{inline.text_field :interest_3, :class => 'small'}
 
     / group of radio buttons
     = user.toggles 'Email Preferences' do
@@ -66,7 +75,7 @@ the functionality anticipated by Twitter Bootstrap.
 
 ## Known Bugs ##
 
-  - inline fields are not yet supported ([issue #2])
+  - inline fields don't receive error markup ([issue #28])
 
 [Twitter Bootstrap]: http://twitter.github.com/bootstrap/
-[issue #2]:          https://github.com/stouset/twitter_bootstrap_form_for/issues/2
+[issue #28]:          https://github.com/stouset/twitter_bootstrap_form_for/issues/28

data/lib/twitter_bootstrap_form_for/form_builder.rb

@@ -27,16 +27,10 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # +legend+ text.
   #
   def inputs(legend = nil, options = {}, &block)
-    # stash the old field_error_proc, then override it temporarily
-    original_field_error_proc = template.field_error_proc
-    template.field_error_proc = lambda {|html_tag, instance| html_tag }
-
     template.content_tag(:fieldset, options) do
       template.concat template.content_tag(:legend, legend) unless legend.nil?
       block.call
     end
-  ensure
-    template.field_error_proc = original_field_error_proc
   end
 
   #
@@ -45,7 +39,7 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # inside of here, and will not look correct unless they are.
   #
   def toggles(label = nil, &block)
-    template.content_tag(:div, :class => "clearfix") do
+    template.content_tag(:div, :class => 'clearfix') do
       template.concat template.content_tag(:label, label)
       template.concat template.content_tag(:div, :class => "input") {
         template.content_tag(:ul, :class => "inputs-list") { block.call }
@@ -70,6 +64,26 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
     super value, options
   end
 
+  #
+  # Creates bootstrap wrapping before yielding a plain old rails builder
+  # to the supplied block.
+  #
+  def inline(label = nil, &block)
+    template.content_tag(:div, :class => 'clearfix') do
+      template.concat template.content_tag(:label, label) if label.present?
+      template.concat template.content_tag(:div, :class => 'input') {
+        template.content_tag(:div, :class => 'inline-inputs') do
+          self.fields_for(
+            self.object_name,
+            self.object,
+            self.options.merge(:builder => ActionView::Helpers::FormBuilder),
+            &block
+          )
+        end
+      }
+    end
+  end
+
   INPUTS.each do |input|
     define_method input do |attribute, *args, &block|
       options  = args.extract_options!
@@ -155,7 +169,7 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # This merges any +classes+ passed in.
   #
   def _wrapper_classes(attribute, *classes)
-    classes.tap do |klasses|
+    classes.compact.tap do |klasses|
       klasses.push 'error' if self.errors_on?(attribute)
     end.join(' ')
   end

data/lib/twitter_bootstrap_form_for/form_helpers.rb

@@ -9,8 +9,22 @@ module TwitterBootstrapFormFor::FormHelpers
         options[:builder] = TwitterBootstrapFormFor::FormBuilder
 
         # call the original method with our overridden options
-        send method, record, *(args << options), &block
+        _override_field_error_proc do
+          send method, record, *(args << options), &block
+        end
       end
     end
   end
+
+  private
+
+  BLANK_FIELD_ERROR_PROC = lambda {|input, _| input }
+
+  def _override_field_error_proc
+    original_field_error_proc = self.field_error_proc
+    self.field_error_proc     = BLANK_FIELD_ERROR_PROC
+    yield
+  ensure
+    self.field_error_proc     = original_field_error_proc
+  end
 end

data/lib/twitter_bootstrap_form_for/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapFormFor
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_bootstrap_form_for
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2011-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70157112743780 !ruby/object:Gem::Requirement
+  requirement: &70325744527840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70157112743780
+  version_requirements: *70325744527840
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70157112743200 !ruby/object:Gem::Requirement
+  requirement: &70325744526200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70157112743200
+  version_requirements: *70325744526200
 description: A custom Rails FormBuilder that assumes the use of Twitter Bootstrap
 email:
 - stephen@touset.org