bootstrap_forms 2.0.0 → 2.0.1

data/README.markdown

@@ -1,5 +1,7 @@
 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. 
 
 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.
@@ -8,7 +10,7 @@ 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. 
 
-To get these new features, ensure you are using `bootstrap_forms ~> 1.0.0`.
+To get these new features, ensure you are using `bootstrap_forms ~> 2.0.0`.
 
 Note/Caution/Warning
 --------------------
@@ -186,8 +188,9 @@ 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:
 
- - Squash into a single commit (unless it makes sense to have multiple commits)
- - Document your changes
+ - **Squash** into a single commit (unless it makes sense to have multiple commits)
+ - **Test/Spec** the changes
+ - **Document** your changes
 
 License
 -------

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.0"
+  s.version     = "2.0.1"
   s.author      = "Seth Vargo"
   s.email       = "sethvargo@gmail.com"
   s.homepage    = "https://github.com/sethvargo/bootstrap_forms"
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_development_dependency "rspec-rails", "~> 2.9.0"
   s.add_development_dependency "capybara", "~> 1.1.0"
   s.add_development_dependency "rake"

data/config/locales/it.yml

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

data/lib/bootstrap_forms/form_builder.rb

@@ -1,7 +1,7 @@
 module BootstrapForms
   class FormBuilder < ::ActionView::Helpers::FormBuilder
     include BootstrapForms::Helpers::Wrappers
-    
+
     delegate :content_tag, :hidden_field_tag, :check_box_tag, :radio_button_tag, :button_tag, :link_to, :to => :@template
 
     def error_messages
@@ -40,8 +40,12 @@ module BootstrapForms
 
       control_group_div do
         input_div do
-          label(@name, :class => [ 'checkbox', required_class ].compact.join(' ')) do
-            extras { super(name, *(@args << @field_options)) + (@field_options[:label].blank? ? human_attribute_name : @field_options[:label])}
+          if @field_options[:label] == false || @field_options[:label] == ''
+            extras { super(name, *(@args << @field_options)) }
+          else
+            label(@name, :class => [ 'checkbox', required_class ].compact.join(' ')) do
+              extras { super(name, *(@args << @field_options)) + (@field_options[:label].blank? ? human_attribute_name : @field_options[:label])}
+            end
           end
         end
       end
@@ -54,8 +58,12 @@ module BootstrapForms
       control_group_div do
         label_field + input_div do
           values.map do |text, value|
-            label("#{@name}_#{value}", :class => [ 'radio', required_class ].compact.join(' ')) do
+            if @field_options[:label] == '' || @field_options[:label] == false
               extras { radio_button(name, value, @options) + text }
+            else
+              label("#{@name}_#{value}", :class => [ 'radio', required_class ].compact.join(' ')) do
+                extras { radio_button(name, value, @options) + text }
+              end
             end
           end.join.html_safe
         end

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -4,7 +4,7 @@ module BootstrapForms
       private
       def control_group_div(&block)
         field_errors = error_string
-        if @field_options[:error] 
+        if @field_options[:error]
           (@field_options[:error] << ", " << field_errors) if field_errors
         else
           @field_options[:error] = field_errors
@@ -37,8 +37,9 @@ module BootstrapForms
       def input_div(&block)
         content_tag(:div, :class => 'controls') do
           if @field_options[:append] || @field_options[:prepend]
-            klass = 'input-prepend' if @field_options[:prepend]
-            klass = 'input-append' if @field_options[:append]
+            klass = []
+            klass << 'input-prepend' if @field_options[:prepend]
+            klass << 'input-append' if @field_options[:append]
             content_tag(:div, :class => klass, &block)
           else
             yield if block_given?
@@ -47,10 +48,14 @@ module BootstrapForms
       end
 
       def label_field(&block)
-        if respond_to?(:object)
-          label(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+        if @field_options[:label] == '' || @field_options[:label] == false
+          return ''.html_safe
         else
-          label_tag(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+          if respond_to?(:object)
+             label(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+           else
+             label_tag(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+           end
         end
       end
 
@@ -89,4 +94,4 @@ module BootstrapForms
       end
     end
   end
-end
+end

data/spec/lib/bootstrap_forms/form_builder_spec.rb

@@ -8,51 +8,51 @@ describe "BootstrapForms::FormBuilder" do
       @template.output_buffer = ""
       @builder = BootstrapForms::FormBuilder.new(:item, @project, @template, {}, proc {})
     end
-    
+
     describe "with no options" do
       describe "error_messages" do
         it "returns empty string without errors" do
           @builder.error_messages.should == ""
         end
-      
+
         context "with errors" do
           before(:each) do
             @project.errors.add("name")
             @result = @builder.error_messages
           end
-        
+
           it "is wrapped in error div" do
             @result.should match /^<div class="alert alert-block alert-error validation-errors">.*<\/div>$/
           end
-        
+
           it "has a list with errors" do
             @result.should match /<ul><li>Name is invalid<\/li><\/ul>/
           end
-        
+
           it "has error title" do
-            @result.should match /<h4 class="alert-heading">#{I18n.t('bootstrap_forms.errors.header', :model => Project.model_name.human)}<\/h4>/ 
+            @result.should match /<h4 class="alert-heading">#{I18n.t('bootstrap_forms.errors.header', :model => Project.model_name.human)}<\/h4>/
           end
-          
+
           it "has error message on field" do
             @builder.text_field("name").should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">Name is invalid</span></div></div>"
           end
-          
+
           it "joins passed error message and validation errors with ', '" do
             @builder.text_field("name", :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This is an error!, Name is invalid</span></div></div>"
           end
         end
       end
-    
+
       describe "text_area" do
         before(:each) do
           @result = @builder.text_area "name"
         end
-      
+
         it "has textarea input" do
           @result.should match /textarea/
-        end      
+        end
       end
-    
+
       describe "check_box" do
         it "generates wrapped input" do
           @builder.check_box("name").should == "<div class=\"control-group\"><div class=\"controls\"><label class=\"checkbox\" for=\"item_name\"><input name=\"item[name]\" type=\"hidden\" value=\"0\" /><input id=\"item_name\" name=\"item[name]\" type=\"checkbox\" value=\"1\" />Name</label></div></div>"
@@ -61,8 +61,15 @@ describe "BootstrapForms::FormBuilder" do
         it "allows custom label" do
           @builder.check_box("name", :label => "custom label").should match /custom label<\/label>/
         end
+
+        it "allows no label with :label => false " do
+          @builder.check_box("name", :label => false).should_not match /<\/label>/
+        end
+        it "allows no label with :label => '' " do
+          @builder.check_box("name", :label => '').should_not match /<\/label>/
+        end
       end
-      
+
       describe "radio_buttons" do
         it "doesn't use field_options from previously generated field" do
           @builder.text_field :name, :label => 'Heading', :help_inline => 'Inline help', :help_block => 'Block help'
@@ -77,7 +84,7 @@ describe "BootstrapForms::FormBuilder" do
         it "generates wrapped input" do
           @builder.radio_buttons(:name, {"One" => "1", "Two" => "2"}).should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><label class=\"radio\" for=\"item_name_1\"><input id=\"item_name_1\" name=\"item[name]\" type=\"radio\" value=\"1\" />One</label><label class=\"radio\" for=\"item_name_2\"><input id=\"item_name_2\" name=\"item[name]\" type=\"radio\" value=\"2\" />Two</label></div></div>"
         end
-        
+
         it "allows custom label" do
           @builder.radio_buttons(:name, {"One" => "1", "Two" => "2"}, {:label => "custom label"}).should match /custom label<\/label>/
         end
@@ -89,16 +96,16 @@ describe "BootstrapForms::FormBuilder" do
             before(:each) do
               @result = @builder.send(field, "name")
             end
-      
+
             it "is wrapped" do
               @result.should match /^<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name<\/label><div class=\"controls\">.*<\/div><\/div>$/
             end
-   
+
             it "has an input of type: #{type}" do
               @result.should match /<input.*type=["#{type}"]/
             end
           end # result
-          
+
           context "call expectations" do
             %w(control_group_div label_field input_div extras).map(&:to_sym).each do |method|
               it "calls #{method}" do
@@ -110,40 +117,56 @@ describe "BootstrapForms::FormBuilder" do
               @builder.send(field, "name")
             end
           end # call expectations
-          
+
         end # field
       end # fields
     end # no options
-  
+
     describe "extras" do
       context "text_field" do
         it "adds span for inline help" do
           @builder.text_field(:name, :help_inline => 'help me!').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\" /><span class=\"help-inline\">help me!</span></div></div>"
         end
-        
+
         it "adds help block" do
           @builder.text_field(:name, :help_block => 'help me!').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\" /><p class=\"help-block\">help me!</p></div></div>"
         end
-        
+
         it "adds error message and class" do
           @builder.text_field(:name, :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This is an error!</span></div></div>"
         end
-        
+
         it "adds success message and class" do
           @builder.text_field(:name, :success => 'This checked out OK').should == "<div class=\"control-group success\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This checked out OK</span></div></div>"
         end
-        
+
         it "adds warning message and class" do
           @builder.text_field(:name, :warning => 'Take a look at this...').should == "<div class=\"control-group warning\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">Take a look at this...</span></div></div>"
         end
-        
+
         it "prepends passed text" do
           @builder.text_field(:name, :prepend => '@').should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-prepend\"><span class=\"add-on\">@</span><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /></div></div></div>"
         end
-        
+
         it "appends passed text" do
           @builder.text_field(:name, :append => '@').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\" /><span class=\"add-on\">@</span></div></div></div>"
         end
+
+        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
+      end
+       context "label option" do
+        %w(select email_field file_field number_field password_field search_field text_area text_field url_field).each do |method_name|
+
+          it "should not add a label when ''" do
+            @builder.send(method_name.to_sym, 'name', :label => '').should_not match /<\/label>/
+          end
+
+          it "should not add a label when false" do
+            @builder.send(method_name.to_sym, 'name', :label => false).should_not match /<\/label>/
+          end
+        end
       end
     end # extras
 
@@ -155,19 +178,19 @@ describe "BootstrapForms::FormBuilder" do
           end.should == "<div class=\"form-actions\"><input class=\"btn btn-primary\" name=\"commit\" type=\"submit\" value=\"Create Project\" /></div>"
         end
       end
-      
+
       context "submit" do
         it "adds btn primary class" do
           @builder.submit.should == "<input class=\"btn btn-primary\" name=\"commit\" type=\"submit\" value=\"Create Project\" />"
         end
       end
-      
+
       context "button" do
         it "adds btn primary class" do
           @builder.submit.should == "<input class=\"btn btn-primary\" name=\"commit\" type=\"submit\" value=\"Create Project\" />"
         end
       end
-      
+
       context "cancel" do
         it "creates link with correct class" do
           @builder.should_receive(:link_to).with(I18n.t('bootstrap_forms.buttons.cancel'), :back, :class => 'btn cancel').and_return("")
@@ -176,5 +199,5 @@ describe "BootstrapForms::FormBuilder" do
       end
     end # actions
   end # setup builder
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - bootstrap_forms.gemspec
 - config/locales/en.yml
+- config/locales/it.yml
 - config/locales/sv.yml
 - lib/bootstrap_forms.rb
 - lib/bootstrap_forms/engine.rb
@@ -189,15 +190,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3425154550503238939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3425154550503238939
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Bootstrap Forms makes Twitter's Bootstrap on Rails easy!