bootstrap_forms 2.0.6 → 2.0.8

data/Gemfile

@@ -1,3 +1,2 @@
-source "http://rubygems.org"
-
-gemspec
+source :rubygems
+gemspec

data/README.markdown

@@ -183,6 +183,11 @@ You can add as many options to any form helper tag. If they are interpreted by B
     <td>Customize the field's label. Pass false to have no label.</td>
     <td><tt>= f.text_field :name, :label => 'Other name'</td></td>
   </tr>
+  <tr>
+    <th>control_group</th>
+    <td>Pass false to remove the control group and controls HTML, leaving only the label and input, wrapped in a plain div</td>
+    <td><tt>= f.text_field :name, :control_group => false</tt></td>
+  </tr>
 </table>
 
 Internationalization/Custom Errors
@@ -201,6 +206,15 @@ en:
 
 Obviously you can also change to a different `lang.yml` file and use the same syntax.
 
+Nested Forms
+------------
+Bootstrap Forms works with [Ryan Bates' nested_form](https://github.com/ryanb/nested_form) out of the box. Just add `nested_form` to you Gemfile and `bootstrap_forms` will automatically add a builder for you:
+
+```haml
+= bootstrap_nested_form_for @model do |f|
+
+```
+
 Contributing
 ------------
 I'm pretty dam active on github. Fork and submit a pull request. Most of my pull requests are merged the same day. Make sure you:

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.6'
+  s.version     = '2.0.8'
   s.author      = 'Seth Vargo'
   s.email       = 'sethvargo@gmail.com'
   s.homepage    = 'https://github.com/sethvargo/bootstrap_forms'

data/config/locales/en.yml

@@ -3,4 +3,4 @@ en:
     errors:
       header: "There were errors that prevented this %{model} from being saved:"
     buttons:
-      cancel: 'Cancel'
+      cancel: 'Cancel'

data/config/locales/it.yml

@@ -3,4 +3,4 @@ it:
     errors:
       header: "Alcuni errori hanno impedito il salvataggio di %{model}:"
     buttons:
-      cancel: 'Cancella'
+      cancel: 'Cancella'

data/lib/bootstrap_forms.rb

@@ -8,4 +8,4 @@ module BootstrapForms
   autoload :Helpers
   mattr_accessor(:default_form_builder)
   self.default_form_builder = BootstrapForms::FormBuilder
-end
+end

data/lib/bootstrap_forms/engine.rb

@@ -5,7 +5,8 @@ module BootstrapForms
         ActiveSupport.on_load(:action_view) do
           include BootstrapForms::Helpers::FormHelper
           include BootstrapForms::Helpers::FormTagHelper
-          
+          include BootstrapForms::Helpers::NestedFormHelper
+
           # Do not wrap errors in the extra div
           ::ActionView::Base.field_error_proc = Proc.new do |html_tag, instance_tag|
             html_tag
@@ -14,4 +15,4 @@ module BootstrapForms
       end
     end
   end
-end
+end

data/lib/bootstrap_forms/helpers.rb

@@ -2,6 +2,7 @@ module BootstrapForms
   module Helpers
     autoload :FormHelper, 'bootstrap_forms/helpers/form_helper'
     autoload :FormTagHelper, 'bootstrap_forms/helpers/form_tag_helper'
+    autoload :NestedFormHelper, 'bootstrap_forms/helpers/nested_form_helper'
     autoload :Wrappers, 'bootstrap_forms/helpers/wrappers'
   end
-end
+end

data/lib/bootstrap_forms/helpers/nested_form_helper.rb

@@ -0,0 +1,30 @@
+begin
+  require 'nested_form/builder_mixin'
+
+  module NestedForm
+    class TwitterBootstrapBuilder < ::BootstrapForms::FormBuilder
+      include ::NestedForm::BuilderMixin
+    end
+  end
+
+  module BootstrapForms
+    module Helpers
+      module NestedFormHelper
+        def bootstrap_nested_form_for(*args, &block)
+          options = args.extract_options!.reverse_merge(:builder => NestedForm::TwitterBootstrapBuilder)
+          form_for(*(args << options), &block) << after_nested_form_callbacks
+        end
+      end
+    end
+  end
+rescue LoadError => e
+  module BootstrapForms
+    module Helpers
+      module NestedFormHelper
+        def bootstrap_nested_form_for(*args, &block)
+          raise 'nested_form was not found. Is it in your Gemfile?'
+        end
+      end
+    end
+  end
+end

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -10,12 +10,16 @@ module BootstrapForms
           @field_options[:error] = field_errors
         end
 
-        klasses = ['control-group']
+        klasses = []
+        klasses << 'control-group' unless @field_options[:control_group] == false
         klasses << 'error' if @field_options[:error]
         klasses << 'success' if @field_options[:success]
         klasses << 'warning' if @field_options[:warning]
 
-        content_tag(:div, :class => klasses, &block)
+        control_group_options = {}
+        control_group_options[:class] = klasses if !klasses.empty?
+
+        content_tag(:div, control_group_options, &block)
       end
 
       def error_string
@@ -34,26 +38,39 @@ module BootstrapForms
       end
 
       def input_div(&block)
-        content_tag(:div, :class => 'controls') do
-          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] || @field_options[:append_button]
-            content_tag(:div, :class => klass, &block)
-          else
-            yield if block_given?
+        content_options = {}
+        content_options[:class] = 'controls'
+        if @field_options[:control_group] == false
+          @field_options.delete :control_group
+          write_input_div(&block)
+        else
+          content_tag(:div, :class => 'controls') do
+            write_input_div(&block)
           end
         end
       end
 
+      def write_input_div(&block)
+        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] || @field_options[:append_button]
+          content_tag(:div, :class => klass, &block)
+        else
+          yield if block_given?
+        end
+      end
+
       def label_field(&block)
         if @field_options[:label] == '' || @field_options[:label] == false
           return ''.html_safe
         else
+          label_options = {}
+          label_options[:class] = 'control-label' unless @field_options[:control_group] == false
           if respond_to?(:object)
-             label(@name, block_given? ? block : @field_options[:label], :class => 'control-label')
+             label(@name, block_given? ? block : @field_options[:label], label_options)
            else
-             label_tag(@name, block_given? ? block : @field_options[:label], :class => 'control-label')
+             label_tag(@name, block_given? ? block : @field_options[:label], label_options)
            end
         end
       end
@@ -68,7 +85,7 @@ module BootstrapForms
       %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
@@ -82,15 +99,15 @@ module BootstrapForms
             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
@@ -107,7 +124,7 @@ module BootstrapForms
       end
 
       def objectify_options(options)
-        super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append, :append_button)
+        super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append, :append_button, :control_group)
       end
     end
   end

data/spec/support/shared_context.rb

@@ -142,22 +142,30 @@ 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
+
+      it "does not add control group" do
+        @builder.text_field(:name, :control_group => false).should == "<div><label for=\"item_name\">Name</label><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /></div>"
+      end
+
+      it "does not add control group attribute to html if :control_group is true" do
+        @builder.text_field(:name, :control_group => true).should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /></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.6
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -132,6 +132,7 @@ files:
 - lib/bootstrap_forms/helpers.rb
 - lib/bootstrap_forms/helpers/form_helper.rb
 - lib/bootstrap_forms/helpers/form_tag_helper.rb
+- lib/bootstrap_forms/helpers/nested_form_helper.rb
 - lib/bootstrap_forms/helpers/wrappers.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -195,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2313446882174708142
+      hash: -810555499159365620
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2313446882174708142
+      hash: -810555499159365620
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24