bootstrap_forms 3.0.0 → 3.0.1

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

data/lib/bootstrap_forms/form_builder.rb

@@ -41,6 +41,13 @@ module BootstrapForms
       url_field
     ).each do |method_name|
       define_method(method_name) do |name, *raw_args|
+        
+        # Special case for select
+        if method_name == 'select'
+          while raw_args.length < 3
+            raw_args << {}
+          end
+        end
 
         options = {}
         html_options = {}
@@ -212,6 +219,7 @@ module BootstrapForms
     end
 
     private
+    
     def field_options(args)
       if @options
         @options.slice(:namespace, :index).merge(args)

data/spec/support/shared_context.rb

@@ -139,6 +139,30 @@ shared_examples 'a bootstrap form' do
       end
     end
     
+    describe "select" do
+      
+      describe "with hash values, options and html options" do
+        it 'is wrapped' do
+          @result = @builder.select(:name, {"False" => false}, { :selected => false }, {:class => "my-special-select"})
+          @result.should match /^<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name<\/label><div class=\"controls\"><select class=\"my-special-select\" id=\"item_name\" name=\"item\[name\]\"><option value=\"false\" selected=\"selected\">False<\/option><\/select><\/div><\/div>$/
+        end
+      end
+      
+      describe "with only hash values and options" do
+        it 'is wrapped' do
+          @result = @builder.select(:name, {"False" => false}, { :selected => false })
+          @result.should match /^<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name<\/label><div class=\"controls\"><select id=\"item_name\" name=\"item\[name\]\"><option value=\"false\" selected=\"selected\">False<\/option><\/select><\/div><\/div>$/
+        end
+      end
+      
+      describe "with only hash values" do
+        it 'is wrapped' do
+          @result = @builder.select(:name, {"False" => false})
+          @result.should match /^<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name<\/label><div class=\"controls\"><select id=\"item_name\" name=\"item\[name\]\"><option value=\"false\">False<\/option><\/select><\/div><\/div>$/
+        end
+      end
+      
+    end
     
     describe 'country_select' do
       before(:each) do
@@ -150,7 +174,7 @@ shared_examples 'a bootstrap form' do
       end
     end
     
-    describe 'collection_select with html options' do
+    describe 'country_select with html options' do
       before(:each) do
         @result = @builder.country_select(:name, [ "United Kingdom", "France", "Germany" ], {}, :class => "baz")
       end
@@ -235,7 +259,7 @@ shared_examples 'a bootstrap form' do
     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|
+      %w(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>/
@@ -245,6 +269,17 @@ shared_examples 'a bootstrap form' do
           @builder.send(method_name.to_sym, 'name', :label => false).should_not match /<\/label>/
         end
       end
+
+      %w(select).each do |method_name|
+
+        it "should not add a label when ''" do
+          @builder.send(method_name.to_sym, 'name', [1,2], :label => '').should_not match /<\/label>/
+        end
+
+        it 'should not add a label when false' do
+          @builder.send(method_name.to_sym, 'name', [1,2], :label => false).should_not match /<\/label>/
+        end
+      end
     end
   end # extras
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails