bootstrap_forms 2.1.1 → 3.0.0.rc1

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

data/lib/bootstrap_forms/form_builder.rb

@@ -19,11 +19,11 @@ module BootstrapForms
       end
     end
 
-    %w(collection_select select country_select time_zone_select email_field file_field number_field password_field phone_field range_field search_field telephone_field text_area text_field url_field datetime_select date_select time_select).each do |method_name|
+    %w(country_select time_zone_select email_field file_field number_field password_field phone_field range_field search_field telephone_field text_area text_field url_field datetime_select date_select time_select).each do |method_name|
       define_method(method_name) do |name, *args|
         # Workaround for ree and 1.8.7 since they don't allow block arguments with default values
         args = args.extract_options!
-        
+
         @name = name
         @field_options = field_options(args)
         @args = args
@@ -38,6 +38,34 @@ module BootstrapForms
       end
     end
 
+    %w(collection_select select).each do |method_name|
+      define_method(method_name) do |name, *args|
+        if args[-1].is_a? Hash
+          if args[-2].is_a? Hash
+            html_options = args.pop
+            options = args.pop
+          else
+            html_options = {}
+            options = args.pop
+          end
+        else
+          html_options = {}
+          options = {}
+        end
+
+        @name = name
+        @field_options = field_options(options)
+        @args = args
+
+        control_group_div do
+          label_field + input_div do
+            rebuilt_args = args + [options.merge(@field_options.merge(required_attribute)), html_options]
+            extras { super(name, *rebuilt_args) }
+          end
+        end
+      end
+    end
+
     def check_box(name, args = {})
       @name = name
       @field_options = field_options(args)

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -83,7 +83,7 @@ module BootstrapForms
 
       def required_attribute
         return {} if @field_options.present? && @field_options.has_key?(:required) && !@field_options[:required]
-        
+
         if respond_to?(:object) and object.respond_to?(:errors) and object.class.respond_to?('validators_on')
           return { :required => true } if object.class.validators_on(@name).any? { |v| v.kind_of?( ActiveModel::Validations::PresenceValidator ) && valid_validator?( v ) }
         end

data/spec/lib/bootstrap_forms/form_builder_spec.rb

@@ -95,29 +95,29 @@ describe 'BootstrapForms::FormBuilder' do
       it 'adds the required attribute' do
         @builder.text_field('owner').should match /<input .*required="required"/
       end
-      
+
       it "does not add the required attribute if required: false" do
         @builder.text_field('owner', :required => false).should_not match /<input .*required="required"/
       end
-      
+
       it "not require if or unless validators" do
         @builder.text_field('if_presence').should_not match /<input .*required="required"/
         @builder.text_field('unless_presence').should_not match /<input .*required="required"/
       end
-      
+
       it "should not be required if presence is on update and model is created" do
         @builder.text_field('update_presence').should_not match /<input .*required="required"/
       end
-      
+
       it "should be required if on create and model is new" do
         @builder.text_field('create_presence').should match /<input .*required="required"/
       end
-      
+
       it "should be required if presence is on update and model is not new" do
         @project.stub!(:persisted?).and_return(true)
         @builder.text_field('update_presence').should match /<input .*required="required"/
       end
-      
+
       it "should not be required if on create and model is not new" do
         @project.stub!(:persisted?).and_return(true)
         @builder.text_field('create_presence').should_not match /<input .*required="required"/

data/spec/support/shared_context.rb

@@ -41,7 +41,7 @@ shared_examples 'a bootstrap form' do
       it 'allows no label with :label => '' ' do
         @builder.check_box('name', :label => '').should_not match /<\/label>/
       end
-      
+
       it 'adds inline class' do
         @builder.check_box('name', :inline => true).should  == "<div class=\"control-group\"><div class=\"controls\"><label class=\"checkbox inline\" 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>"
       end
@@ -115,6 +115,27 @@ shared_examples 'a bootstrap form' do
 
       end # field
     end # fields
+
+    describe 'collection select' do
+      before(:each) do
+        @result = @builder.collection_select(:name, [["foo", "Foo"]], :first, :last)
+      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
+    end
+
+    describe 'collection select with html options' do
+      before(:each) do
+        @result = @builder.collection_select(:name, [["foo", "Foo"]], :first, :last, {}, :class => "baz")
+      end
+
+      it 'uses html options' do
+        @result.should match /class=".*baz/
+      end
+    end
+
   end # no options
 
   describe 'extras' do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 2.1.1
-  prerelease: 
+  version: 3.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Seth Vargo
@@ -213,16 +213,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1030141123140574531
+      hash: 594779022012185333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1030141123140574531
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23