bootstrap_forms 2.0.5 → 2.0.6

data/README.markdown

@@ -2,13 +2,13 @@ Bootstrap Forms
 ===============
 [![Build Status](https://secure.travis-ci.org/sethvargo/bootstrap_forms.png?branch=master)](http://travis-ci.org/sethvargo/bootstrap_forms)
 
-Bootstrap Forms is a nice Rails generator that makes working with [Bootstrap (by Twitter)](http://twitter.github.com/bootstrap) even easier on Rails. 
+Bootstrap Forms is a nice Rails generator that makes working with [Bootstrap (by Twitter)](http://twitter.github.com/bootstrap) even easier on Rails.
 
 Forms with Bootstrap are crowded with additional layout markup. While it's necessary, you shouldn't have to type it every time you create a form! That's why I created Bootstrap Forms.
 
 Bootstrap 2.0 Compliant!
 ------------------------
-A super special thanks to [vincenzor](https://github.com/vincenzor) for updating `bootstrap_forms` to comply with the new methods and features in Twitter Bootstrap 2.0. 
+A super special thanks to [vincenzor](https://github.com/vincenzor) for updating `bootstrap_forms` to comply with the new methods and features in Twitter Bootstrap 2.0.
 
 To get these new features, ensure you are using `bootstrap_forms ~> 2.0.0`.
 
@@ -105,7 +105,7 @@ Bootstrap Forms also adds a default actions panel when you call `f.submit`:
 ```haml
 = f.submit
 ```
-    
+
 generates:
 
 ```html
@@ -134,42 +134,54 @@ You can add as many options to any form helper tag. If they are interpreted by B
   <tr>
     <th>help_inline</th>
     <td>Add inline help text</td>
-    <td>= f.text_field :name, :help_inline => 'help me!'</td>
+    <td><tt>= f.text_field :name, :help_inline => 'help me!'</td></td>
   </tr>
   <tr>
     <th>help_block</th>
     <td>Add block help text (below)</td>
-    <td>= f.text_field :name, :help_block => 'help me!'</td>
+    <td><tt>= f.text_field :name, :help_block => 'help me!'</td></td>
   </tr>
   <tr>
     <th>error</th>
     <td>Styles the field as error (red)</td>
-    <td>= f.text_field :name, :error => 'This is an error!'</td>
+    <td><tt>= f.text_field :name, :error => 'This is an error!'</td></td>
   </tr>
   <tr>
     <th>success</th>
     <td>Styles the field as success (green)</td>
-    <td>= f.text_field :name, :success => 'This checked out OK'</td>
+    <td><tt>= f.text_field :name, :success => 'This checked out OK'</td></td>
   </tr>
   <tr>
     <th>warning</th>
     <td>Styles the field as warning (yellow)</td>
-    <td>= f.text_field :name, :warning => 'Take a look at this...'</td>
+    <td><tt>= f.text_field :name, :warning => 'Take a look at this...'</td></td>
   </tr>
   <tr>
     <th>prepend</th>
     <td>Adds special text to the front of the input</td>
-    <td>= f.text_field :name, :prepend => '@'</td>
+    <td><tt>= f.text_field :name, :prepend => '@'</td></td>
   </tr>
   <tr>
     <th>append</th>
     <td>Adds special text at the end of the input</td>
-    <td>= f.text_field :name, :append => '@'</td>
+    <td><tt>= f.text_field :name, :append => '@'</td></td>
+  </tr>
+  <tr>
+    <th>append_button</th>
+    <td>
+      Adds the given button to the end of the input. The value is a hash.<br/>
+      :label is the button label<br/>
+      :icon adds an icon before the label<br/>
+      :class has a default value of 'btn'<br/>
+      :type has a default value of 'button'<br/>
+      Any other entries are passed directly to Rails's tag helper.
+    </td>
+    <td><tt>= f.text_field :name, :append_button => { :label => 'Button label', :icon => 'icon-plus', :type => 'button' }</td></td>
   </tr>
   <tr>
     <th>label</th>
     <td>Customize the field's label. Pass false to have no label.</td>
-    <td>= f.text_field :name, :label => 'Other name'</td>
+    <td><tt>= f.text_field :name, :label => 'Other name'</td></td>
   </tr>
 </table>
 

data/bootstrap_forms.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'bootstrap_forms'
-  s.version     = '2.0.5'
+  s.version     = '2.0.6'
   s.author      = 'Seth Vargo'
   s.email       = 'sethvargo@gmail.com'
   s.homepage    = 'https://github.com/sethvargo/bootstrap_forms'

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -35,10 +35,10 @@ module BootstrapForms
 
       def input_div(&block)
         content_tag(:div, :class => 'controls') do
-          if @field_options[:append] || @field_options[:prepend]
+          if @field_options[:append] || @field_options[:prepend] || @field_options[:append_button]
             klass = []
             klass << 'input-prepend' if @field_options[:prepend]
-            klass << 'input-append' if @field_options[:append]
+            klass << 'input-append' if @field_options[:append] || @field_options[:append_button]
             content_tag(:div, :class => klass, &block)
           else
             yield if block_given?
@@ -65,30 +65,49 @@ module BootstrapForms
         {}
       end
 
-      %w(help_inline error success warning help_block append prepend).each do |method_name|
+      %w(help_inline error success warning help_block append append_button prepend).each do |method_name|
         define_method(method_name) do |*args|
           return '' unless value = @field_options[method_name.to_sym]
+          
+          escape = true
+          tag_options = {}
           case method_name
           when 'help_block'
             element = :p
-            klass = 'help-block'
+            tag_options[:class] = 'help-block'
           when 'append', 'prepend'
             element = :span
-            klass = 'add-on'
+            tag_options[:class] = 'add-on'
+          when 'append_button'
+            element = :button
+            button_options = value
+            value = ''
+            
+            if button_options.has_key? :icon
+              value << content_tag(:i, '', { :class => button_options.delete(:icon) })
+              value << ' '
+              escape = false
+            end
+            
+            value << button_options.delete(:label)
+            
+            tag_options[:type] = 'button'
+            tag_options[:class] = 'btn'
+            tag_options.merge! button_options
           else
             element = :span
-            klass = 'help-inline'
+            tag_options[:class] = 'help-inline'
           end
-          content_tag(element, value, :class => klass)
+          content_tag(element, value, tag_options, escape)
         end
       end
 
       def extras(&block)
-        [prepend, (yield if block_given?), append, help_inline, error, success, warning, help_block].join('').html_safe
+        [prepend, (yield if block_given?), append, append_button, help_inline, error, success, warning, help_block].join('').html_safe
       end
 
       def objectify_options(options)
-        super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append)
+        super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append, :append_button)
       end
     end
   end

data/spec/support/shared_context.rb

@@ -142,6 +142,22 @@ shared_examples 'a bootstrap form' do
       it 'prepends and appends passed text' do
         @builder.text_field(:name, :append => '@', :prepend => '#').should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-prepend input-append\"><span class=\"add-on\">\#</span><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"add-on\">@</span></div></div></div>"
       end
+      
+      it 'appends button with default values' do
+        @builder.text_field(:name, :append_button => { :label => 'button label' }).should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-append\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><button class=\"btn\" type=\"button\">button label</button></div></div></div>"
+      end
+      
+      it 'appends button and overrides class and type' do
+        @builder.text_field(:name, :append_button => { :label => 'Danger!', :class => 'btn btn-danger', :type => 'submit' }).should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-append\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><button class=\"btn btn-danger\" type=\"submit\">Danger!</button></div></div></div>"
+      end
+      
+      it 'appends button with custom attributes' do
+        @builder.text_field(:name, :append_button => { :label => 'button label', :data => { :custom_1 => 'value 1', :custom_2 => 'value 2' } }).should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-append\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><button class=\"btn\" data-custom-1=\"value 1\" data-custom-2=\"value 2\" type=\"button\">button label</button></div></div></div>"
+      end
+      
+      it 'appends button with an icon' do
+        @builder.text_field(:name, :append_button => { :label => 'button label', :icon => 'icon-plus icon-white' }).should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-append\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><button class=\"btn\" type=\"button\"><i class=\"icon-plus icon-white\"></i> button label</button></div></div></div>"
+      end
     end
 
     context 'label option' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -195,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4298855100164431662
+      hash: 2313446882174708142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4298855100164431662
+      hash: 2313446882174708142
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24