speedo-formstrap 1.2.3 → 1.2.4

data/spec/inputs/time_zone_input_spec.rb

@@ -15,15 +15,15 @@ describe 'time_zone input' do
     end)
   end
 
-  it_should_have_input_wrapper_with_class("time_zone-wrapper")
-  it_should_have_input_wrapper_with_class("control-group")
+  it_should_have_input_wrapper_with_class("time_zone")
+  it_should_have_input_wrapper_with_class(:clearfix)
   it_should_have_input_wrapper_with_id("post_time_zone_input")
   it_should_apply_error_logic_for_input_type(:time_zone)
 
   it 'should generate a label for the input' do
-    output_buffer.should have_tag('form div label.control-label')
-    output_buffer.should have_tag('form div label.control-label[@for="post_time_zone"]')
-    output_buffer.should have_tag('form div label.control-label', /Time zone/)
+    output_buffer.should have_tag('form div label')
+    output_buffer.should have_tag('form div label[@for="post_time_zone"]')
+    output_buffer.should have_tag('form div label', /Time zone/)
   end
 
   it "should generate a select" do
@@ -56,7 +56,7 @@ describe 'time_zone input' do
     it_should_have_label_for("context2_post_time_zone")
 
   end
-
+  
   describe "when index is provided" do
 
     before do
@@ -70,21 +70,21 @@ describe 'time_zone input' do
         end)
       end)
     end
-
+    
     it 'should index the id of the wrapper' do
       output_buffer.should have_tag("div#post_author_attributes_3_name_input")
     end
-
+    
     it 'should index the id of the select tag' do
       output_buffer.should have_tag("select#post_author_attributes_3_name")
     end
-
+    
     it 'should index the name of the select tag' do
       output_buffer.should have_tag("select[@name='post[author_attributes][3][name]']")
     end
-
+    
   end
-
+  
 
   describe 'when no object is given' do
     before(:each) do
@@ -94,9 +94,9 @@ describe 'time_zone input' do
     end
 
     it 'should generate labels' do
-      output_buffer.should have_tag('form div label.control-label')
-      output_buffer.should have_tag('form div label.control-label[@for="project_time_zone"]')
-      output_buffer.should have_tag('form div label.control-label', /Time zone/)
+      output_buffer.should have_tag('form div label')
+      output_buffer.should have_tag('form div label[@for="project_time_zone"]')
+      output_buffer.should have_tag('form div label', /Time zone/)
     end
 
     it 'should generate select inputs' do
@@ -105,10 +105,10 @@ describe 'time_zone input' do
       output_buffer.should have_tag("form div select[@name=\"project[time_zone]\"]")
     end
   end
-
+  
   context "when required" do
     it "should add the required attribute to the input's html options" do
-      with_config :use_required_attribute, true do
+      with_config :use_required_attribute, true do 
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :time_zone, :required => true))
         end)
@@ -116,5 +116,5 @@ describe 'time_zone input' do
       end
     end
   end
-
+  
 end

data/spec/inputs/url_input_spec.rb

@@ -18,8 +18,8 @@ describe 'url input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class('url-wrapper')
-    it_should_have_input_wrapper_with_class("control-group")
+    it_should_have_input_wrapper_with_class(:url)
+    it_should_have_input_wrapper_with_class(:clearfix)
     it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_class_in_the_right_place
     it_should_have_input_wrapper_with_id("post_url_input")
@@ -43,38 +43,10 @@ describe 'url input' do
     it_should_have_label_and_input_with_id("context2_post_url")
 
   end
-
-  describe "when index is provided" do
-
-    before do
-      @output_buffer = ''
-      mock_everything
-
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for(:author, :index => 3) do |author|
-          concat(author.input(:name, :as => :url))
-        end)
-      end)
-    end
-
-    it 'should index the id of the wrapper' do
-      output_buffer.should have_tag("div#post_author_attributes_3_name_input")
-    end
-
-    it 'should index the id of the select tag' do
-      output_buffer.should have_tag("input#post_author_attributes_3_name")
-    end
-
-    it 'should index the name of the select tag' do
-      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
-    end
-
-  end
-
-
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      with_config :use_required_attribute, true do
+      with_config :use_required_attribute, true do 
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :url, :required => true))
         end)
@@ -82,6 +54,6 @@ describe 'url input' do
       end
     end
   end
-
+  
 end
 

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ require 'action_view'
 require 'action_controller'
 require 'action_dispatch'
 
-require 'speedo-formstrap'
+require 'formtastic-bootstrap'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/support/custom_macros.rb

@@ -18,8 +18,8 @@ module CustomMacros
     # it's located on the outer wrapper.  We move it to the inner wrapper.
     def it_should_have_input_class_in_the_right_place
       it "should have 'input' class in the right place" do
-        output_buffer.should have_tag("form div.control-group div.controls")
-        output_buffer.should_not have_tag("form div.control-group.input")
+        output_buffer.should have_tag("form div.clearfix div.input")
+        output_buffer.should_not have_tag("form div.clearfix.input")
       end
     end
 
@@ -31,7 +31,7 @@ module CustomMacros
 
     def it_should_not_have_a_label
       it "should not have a label" do
-        output_buffer.should_not have_tag("form div.control-group label.control-label")
+        output_buffer.should_not have_tag("form li label")
       end
     end
 
@@ -40,25 +40,25 @@ module CustomMacros
         output_buffer.should have_tag("form li fieldset")
       end
     end
-
+    
     def it_should_have_a_nested_fieldset_with_class(klass)
       it "should have a nested_fieldset with class #{klass}" do
         output_buffer.should have_tag("form li fieldset.#{klass}")
       end
     end
-
+    
     def it_should_have_a_nested_div
       it "should have a nested div" do
-        output_buffer.should have_tag("form div.control-group div")
+        output_buffer.should have_tag("form div.clearfix div")
       end
     end
 
     def it_should_have_a_nested_div_with_class(klass)
       it "should have a nested div with class #{klass}" do
-        output_buffer.should have_tag("form div.control-group div.#{klass}")
+        output_buffer.should have_tag("form div.clearfix div.#{klass}")
       end
     end
-
+    
     def it_should_have_a_nested_ordered_list_with_class(klass)
       it "should have a nested fieldset with class #{klass}" do
         output_buffer.should have_tag("form li ol.#{klass}")
@@ -67,76 +67,71 @@ module CustomMacros
 
     def it_should_have_a_nested_unordered_list_with_class(klass)
       it "should have a nested unordered list with class #{klass}" do
-        output_buffer.should have_tag("form div.control-group div ul.#{klass}")
+        output_buffer.should have_tag("form div.clearfix div ul.#{klass}")
       end
     end
 
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
-        output_buffer.should have_tag("form div.control-group label.control-label", string_or_regex)
+        output_buffer.should have_tag("form div.clearfix label", string_or_regex)
       end
     end
 
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
         # output_buffer.should have_tag("form div label.label[@for='#{element_id}']")
-        output_buffer.should have_tag("form div.control-group label[@for='#{element_id}']")
+        output_buffer.should have_tag("form div.clearfix label[@for='#{element_id}']")
+        output_buffer.should_not have_tag("form div.clearfix label.label")
       end
     end
-
+    
     def it_should_have_an_inline_label_for(element_id)
       it "should have a label for ##{element_id}" do
-        output_buffer.should have_tag("form div.controls label[@for='#{element_id}']")
+        output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
 
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        # output_buffer.should have_tag("form div.control-group div.controls input##{element_id}")
-        output_buffer.should have_tag("form div.control-group div.controls input[@id=\"#{element_id}\"]")
+        # output_buffer.should have_tag("form div.clearfix div.input input##{element_id}")
+        output_buffer.should have_tag("form div.clearfix div.input input[@id=\"#{element_id}\"]")
       end
     end
 
     def it_should_have_select_with_id(element_id)
       it "should have a select box with id '#{element_id}'" do
-        output_buffer.should have_tag("form div.control-group div.controls select##{element_id}")
+        output_buffer.should have_tag("form div.clearfix div.input select##{element_id}")
       end
     end
 
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
-        output_buffer.should have_tag("form div.control-group div.controls input[@type=\"#{input_type}\"]")
+        output_buffer.should have_tag("form div.clearfix div.input input[@type=\"#{input_type}\"]")
       end
     end
 
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.should have_tag("form div.control-group div.controls input[@name=\"#{name}\"]")
-      end
-    end
-
-    def it_should_have_select_with_name(name)
-      it "should have an input named #{name}" do
-        output_buffer.should have_tag("form div.control-group div.controls select[@name=\"#{name}\"]")
+        output_buffer.should have_tag("form div.clearfix div.input input[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.should have_tag("form div.control-group div.controls textarea[@name=\"#{name}\"]")
+        output_buffer.should have_tag("form div.clearfix div.input textarea[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.should have_tag("form div.control-group div.controls textarea##{element_id}")
+        output_buffer.should have_tag("form div.clearfix div.input textarea##{element_id}")
       end
     end
 
     def it_should_have_label_and_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.should have_tag("form div.control-group div.controls input##{element_id}")
-        output_buffer.should have_tag("form div.control-group label.control-label[@for='#{element_id}']")
+        output_buffer.should have_tag("form div.clearfix div.input input##{element_id}")
+        output_buffer.should have_tag("form div.clearfix label[@for='#{element_id}']")
       end
     end
 
@@ -146,7 +141,7 @@ module CustomMacros
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
           end)
-          output_buffer.should have_tag("form div.control-group div.controls input[@size='#{FormtasticBootstrap::FormBuilder.default_text_field_size}']")
+          output_buffer.should have_tag("form div.clearfix div.input input[@size='#{FormtasticBootstrap::FormBuilder.default_text_field_size}']")
         end
       end
     end
@@ -157,8 +152,8 @@ module CustomMacros
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
           end)
-          output_buffer.should have_tag("form div.control-group div.controls input")
-          output_buffer.should_not have_tag("form div.control-group div.controls input[@size]")
+          output_buffer.should have_tag("form div.clearfix div.input input")
+          output_buffer.should_not have_tag("form div.clearfix div.input input[@size]")
         end
       end
     end
@@ -168,7 +163,7 @@ module CustomMacros
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
         end)
-        output_buffer.should have_tag("form div.control-group div.controls input.myclass")
+        output_buffer.should have_tag("form div.clearfix div.input input.myclass")
       end
     end
 
@@ -177,14 +172,14 @@ module CustomMacros
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
         end)
-        output_buffer.should have_tag('form div.control-group label.control-label[@for="myid"]')
+        output_buffer.should have_tag('form div.clearfix label[@for="myid"]')
       end
     end
 
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
-        output_buffer.should have_tag("form div.control-group div.controls input[@maxlength='50']")
+        output_buffer.should have_tag("form div.clearfix div.input input[@maxlength='50']")
       end
     end
 
@@ -324,7 +319,7 @@ module CustomMacros
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
           end)
-          output_buffer.should have_tag("form div.#{as}-wrapper #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
+          output_buffer.should have_tag("form div.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
         describe 'and the :collection is an array of strings' do
@@ -338,8 +333,8 @@ module CustomMacros
             end)
 
             @categories.each do |value|
-              output_buffer.should have_tag("form div.#{as}-wrapper", /#{value}/)
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{value}']")
+              output_buffer.should have_tag("form div.#{as}", /#{value}/)
+              output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{value}']")
             end
           end
 
@@ -352,10 +347,10 @@ module CustomMacros
                 end
                 concat(fields)
               end)
-              output_buffer.should have_tag("form div div label.radio[@for='post_author_category_name_general']")
-              output_buffer.should have_tag("form div div label.radio[@for='post_author_category_name_design']")
-              output_buffer.should have_tag("form div div label.radio[@for='post_author_category_name_development']")
-              output_buffer.should have_tag("form div div label.radio[@for='post_author_category_name_quasi-serious_inventions']")
+              output_buffer.should have_tag("form div div ul li label[@for='post_author_category_name_general']")
+              output_buffer.should have_tag("form div div ul li label[@for='post_author_category_name_design']")
+              output_buffer.should have_tag("form div div ul li label[@for='post_author_category_name_development']")
+              output_buffer.should have_tag("form div div ul li label[@for='post_author_category_name_quasi-serious_inventions']")
             end
           end
         end
@@ -371,8 +366,8 @@ module CustomMacros
             end)
 
             @categories.each do |label, value|
-              output_buffer.should have_tag("form div.#{as}-wrapper", /#{label}/)
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{value}']")
+              output_buffer.should have_tag("form div.#{as}", /#{label}/)
+              output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{value}']")
             end
           end
         end
@@ -389,9 +384,9 @@ module CustomMacros
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
-              output_buffer.should have_tag("form div.#{as}-wrapper #{label}", /#{text}/i)
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{value.to_s}']")
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}#post_category_name_#{value.to_s}") if as == :radio
+              output_buffer.should have_tag("form div.#{as} #{label}", /#{text}/i)
+              output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{value.to_s}']")
+              output_buffer.should have_tag("form div.#{as} #{countable}#post_category_name_#{value.to_s}") if as == :radio
             end
           end
         end
@@ -407,8 +402,8 @@ module CustomMacros
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
               end)
 
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}#post_category_name_true")
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}#post_category_name_false")
+              output_buffer.should have_tag("form div.#{as} #{countable}#post_category_name_true")
+              output_buffer.should have_tag("form div.#{as} #{countable}#post_category_name_false")
             end
           end
         end
@@ -425,8 +420,8 @@ module CustomMacros
 
             @categories.each do |value|
               label = as == :select ? :option : :label
-              output_buffer.should have_tag("form div.#{as}-wrapper #{label}", /#{value}/i)
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{value.to_s}']")
+              output_buffer.should have_tag("form div.#{as} #{label}", /#{value}/i)
+              output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{value.to_s}']")
             end
           end
         end
@@ -442,8 +437,8 @@ module CustomMacros
             end)
 
             @categories.each do |label, value|
-              output_buffer.should have_tag("form div.#{as}-wrapper", /#{label}/)
-              output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{value}']")
+              output_buffer.should have_tag("form div.#{as}", /#{label}/)
+              output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{value}']")
             end
           end
 
@@ -460,7 +455,7 @@ module CustomMacros
 
             it 'should have options with text content from the specified method' do
               ::Author.all.each do |author|
-                output_buffer.should have_tag("form div.#{as}-wrapper", /#{author.login}/)
+                output_buffer.should have_tag("form div.#{as}", /#{author.login}/)
               end
             end
           end
@@ -474,7 +469,7 @@ module CustomMacros
 
             it 'should have options with the proc applied to each' do
               ::Author.all.each do |author|
-                output_buffer.should have_tag("form div.#{as}-wrapper", /#{author.login.reverse}/)
+                output_buffer.should have_tag("form div.#{as}", /#{author.login.reverse}/)
               end
             end
           end
@@ -491,7 +486,7 @@ module CustomMacros
 
             it 'should have options with the proc applied to each' do
               ::Author.all.each do |author|
-                output_buffer.should have_tag("form div.#{as}-wrapper", /#{author.login.reverse}/)
+                output_buffer.should have_tag("form div.#{as}", /#{author.login.reverse}/)
               end
             end
           end
@@ -512,7 +507,7 @@ module CustomMacros
 
               it "should render the options with #{label_method} as the label" do
                 ::Author.all.each do |author|
-                  output_buffer.should have_tag("form div.#{as}-wrapper", /The Label Text/)
+                  output_buffer.should have_tag("form div.#{as}", /The Label Text/)
                 end
               end
             end
@@ -531,7 +526,7 @@ module CustomMacros
 
             it 'should have options with values from specified method' do
               ::Author.all.each do |author|
-                output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{author.login}']")
+                output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{author.login}']")
               end
             end
           end
@@ -545,7 +540,7 @@ module CustomMacros
 
             it 'should have options with the proc applied to each value' do
               ::Author.all.each do |author|
-                output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{author.login.reverse}']")
+                output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
             end
           end
@@ -562,7 +557,141 @@ module CustomMacros
 
             it 'should have options with the proc applied to each value' do
               ::Author.all.each do |author|
-                output_buffer.should have_tag("form div.#{as}-wrapper #{countable}[@value='#{author.login.reverse}']")
+                output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
+        end
+
+        describe 'when the deprecated :label_method option is provided' do
+          
+          describe 'as a symbol' do
+            before do
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => :login))
+                end)
+              end
+            end
+
+            it 'should have options with text content from the specified method' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form div.#{as}", /#{author.login}/)
+              end
+            end
+          end
+
+          describe 'as a proc' do
+            
+            before do
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form div.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form div.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
+        end
+
+        describe 'when the deprecated :label_method option is not provided' do
+          Formtastic::FormBuilder.collection_label_methods.each do |label_method|
+
+            describe "when the collection objects respond to #{label_method}" do
+              before do
+                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
+                ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
+
+                with_deprecation_silenced do 
+                  concat(semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:author, :as => as))
+                  end)
+                end
+              end
+
+              it "should render the options with #{label_method} as the label" do
+                ::Author.all.each do |author|
+                  output_buffer.should have_tag("form div.#{as}", /The Label Text/)
+                end
+              end
+            end
+
+          end
+        end
+
+        describe 'when the deprecated :value_method option is provided' do
+
+          describe 'as a symbol' do
+            before do
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => :login))
+                end)
+              end
+            end
+
+            it 'should have options with values from specified method' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{author.login}']")
+              end
+            end
+          end
+
+          describe 'as a proc' do
+            before do
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form div.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
             end
           end