formtastic-rails3 0.9.10.1 → 1.0.0.beta3

data/spec/inputs/country_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'country input' do
   

data/spec/inputs/date_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'date input' do
   

data/spec/inputs/datetime_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'datetime input' do
   

data/spec/inputs/file_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'file input' do
   

data/spec/inputs/hidden_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'hidden input' do
   

data/spec/inputs/numeric_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'numeric input' do
   

data/spec/inputs/password_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'password input' do
   

data/spec/inputs/radio_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'radio input' do
   
@@ -31,7 +31,7 @@ describe 'radio input' do
     
     it 'should not link the label within the legend to any input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should_not have_tag('form li fieldset legend label[@for^="post_author_id_"]')
+      output_buffer.should_not have_tag('form li fieldset legend label[@for]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
@@ -84,6 +84,17 @@ describe 'radio input' do
         output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
+      
+      it "should not contain invalid HTML attributes" do
+        
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :radio))
+        end
+        
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
+      end
+      
     end
 
     describe 'and no object is given' do
@@ -112,6 +123,17 @@ describe 'radio input' do
         end
       end
 
+      it 'should html escape the label string' do
+        output_buffer.replace ''
+        form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_id, :as => :radio, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li fieldset ol li label') do |label|
+          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
+        end
+      end
+
       it 'should generate inputs for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
@@ -165,5 +187,42 @@ describe 'radio input' do
     end
 
   end
+  
+  describe "with i18n of the legend label" do
+    
+    before do
+      ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
 
+      Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio))
+      end
+    end
+    
+    after do
+      ::I18n.backend.reload!
+      Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+    end
+    
+    it "should do foo" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("legend.label label", /Translated/)
+    end
+    
+  end
+
+  describe "when :label option is set" do
+    before do
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio, :label => 'The authors'))
+      end
+    end
+
+    it "should output the correct label title" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("legend.label label", /The authors/)
+    end
+  end
 end

data/spec/inputs/select_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'select input' do
 

data/spec/inputs/string_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'string input' do
   
@@ -8,26 +8,30 @@ describe 'string input' do
   before do
     @output_buffer = ''
     mock_everything
-    
-    @form = semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:title, :as => :string))
+  end
+  
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :string))
+      end
     end
+    
+    it_should_have_input_wrapper_with_class(:string)
+    it_should_have_input_wrapper_with_id("post_title_input")
+    it_should_have_label_with_text(/Title/)
+    it_should_have_label_for("post_title")
+    it_should_have_input_with_id("post_title")
+    it_should_have_input_with_type(:text)
+    it_should_have_input_with_name("post[title]")
+    it_should_have_maxlength_matching_column_limit
+    it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
+    it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
+    it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
+    it_should_apply_custom_input_attributes_when_input_html_provided(:string)
+    it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
+    it_should_apply_error_logic_for_input_type(:string)
   end
-
-  it_should_have_input_wrapper_with_class(:string)
-  it_should_have_input_wrapper_with_id("post_title_input")
-  it_should_have_label_with_text(/Title/)
-  it_should_have_label_for("post_title")
-  it_should_have_input_with_id("post_title")
-  it_should_have_input_with_type(:text)
-  it_should_have_input_with_name("post[title]")
-  it_should_have_maxlength_matching_column_limit
-  it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
-  it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
-  it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
-  it_should_apply_custom_input_attributes_when_input_html_provided(:string)
-  it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
-  it_should_apply_error_logic_for_input_type(:string)
   
   describe "when no object is provided" do
     before do
@@ -43,5 +47,18 @@ describe 'string input' do
     it_should_have_input_with_name("project[title]")
   end
   
+  describe "when size is nil" do
+    before do
+      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+        concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
+      end
+    end
+  
+    it "should have no size attribute" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should_not have_tag("input[@size]")
+    end
+  end
+  
 end
 

data/spec/inputs/text_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'text input' do
   

data/spec/inputs/time_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'time input' do
   
@@ -15,7 +15,29 @@ describe 'time input' do
       ::I18n.backend.reload!
       output_buffer.replace ''
     end
-
+    
+    describe "with :ignore_date" do
+      before do
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :ignore_date => true))
+        end
+      end
+      
+      it 'should not have an input for day, month and year' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag('#post_publish_at_1i')
+        output_buffer.should_not have_tag('#post_publish_at_2i')
+        output_buffer.should_not have_tag('#post_publish_at_3i')
+      end
+      
+      it 'should have an input for hour and minute' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('#post_publish_at_4i')
+        output_buffer.should have_tag('#post_publish_at_5i')
+      end
+      
+    end
+    
     describe "without seconds" do
       before do
         @form = semantic_form_for(@new_post) do |builder|

data/spec/inputs/time_zone_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'time_zone input' do
   

data/spec/inputs_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#inputs' do
   
@@ -82,7 +82,23 @@ describe 'SemanticFormBuilder#inputs' do
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
       end
-      
+
+      it 'should concat rendered nested inputs to the template under rails3' do
+        @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+        ::Formtastic::Util.stub!(:rails3?).and_return(true)
+
+        form = semantic_form_for(@new_post) do |builder|
+          builder.inputs :for => [:author, @bob] do |bob_builder|
+            concat(bob_builder.input(:login))
+          end
+        end
+
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
+        output_buffer.should_not have_tag("form fieldset.inputs #author_login")
+
+      end
+
       describe "as a symbol representing the association name" do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do
@@ -98,6 +114,25 @@ describe 'SemanticFormBuilder#inputs' do
         
       end
       
+      describe "as a symbol representing a has_many association name" do
+        before do
+          @new_post.stub!(:authors).and_return([@bob, @fred])
+          @new_post.stub!(:authors_attributes=)
+        end
+        
+        it 'should nest the inputs with a name input for each item' do
+          form = semantic_form_for(@new_post) do |post|
+            post.inputs :for => :authors do |author|
+              concat(author.input(:login))
+            end
+          end
+          
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
+          output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
+        end
+      end
+      
       describe 'as an array containing the a symbole for the association name and the associated object' do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do

data/spec/label_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#label' do
 
@@ -30,6 +30,26 @@ describe 'SemanticFormBuilder#label' do
     end
   end
 
+  describe 'when a collection is given' do
+    it 'should use a supplied label_method for simple collections' do
+      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
+    end
+
+    it 'should use a supplied value_method for simple collections' do
+      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
+      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
+      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')
+    end
+  end
+
   describe 'when label is given' do
     it 'should allow the text to be given as label option' do
       semantic_form_for(@new_post) do |builder|
@@ -42,6 +62,27 @@ describe 'SemanticFormBuilder#label' do
         builder.label(:login, :label => false).should be_blank
       end
     end
+
+    it 'should html escape the label string by default' do
+      semantic_form_for(@new_post) do |builder|
+        builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\">&lt;b&gt;My label&lt;/b&gt;</label>"
+      end
+    end
+
+    it 'should not html escape the label if configured that way' do
+      ::Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
+      semantic_form_for(@new_post) do |builder|
+        builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\"><b>My label</b></label>"
+      end
+    end
+
+    it 'should not html escape the label string for html_safe strings' do
+      ::Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = true
+      semantic_form_for(@new_post) do |builder|
+        builder.label(:login, :required => false, :label => '<b>My label</b>'.html_safe).should == "<label for=\"post_login\"><b>My label</b></label>"
+      end
+    end
+
   end
   
 end

data/spec/semantic_errors_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_errors' do
 

data/spec/semantic_fields_for_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_fields_for' do
 

data/spec/spec_helper.rb

@@ -1,53 +1,23 @@
 # coding: utf-8
 require 'rubygems'
-
-gem 'activesupport', '>=2.3.8'
-gem 'actionpack', '>=2.3.8'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
+require 'action_mailer'
 
-begin
-  gem 'activemodel', '>= 3.0.0.beta'
-  require 'active_model'
-rescue Exception
-end
-
-gem 'rspec', '>= 1.2.6'
-gem 'rspec-rails', '>= 1.2.6'
-gem 'hpricot', '>= 0.6.1'
-gem 'rspec_tag_matchers', '>= 1.0.0'
-require 'rspec_tag_matchers'
-
-require 'custom_macros'
-
-begin
-  Spec::Runner.configure do |config|
-    config.include(RspecTagMatchers)
-    config.include(CustomMacros)
-  end
-rescue
-  require 'rspec/core'
-  Rspec.configure do |config|
-    config.include RspecTagMatchers
-    config.include CustomMacros
-    config.mock_with :rspec
-  end
-end
-
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
-module ActionView
-  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
-  end
-end
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories in alphabetic order.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
 
 module FormtasticSpecHelper
   include ActionPack
   include ActionView::Context if defined?(ActionView::Context)
+  include ActionController::RecordIdentifier
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
@@ -56,12 +26,11 @@ module FormtasticSpecHelper
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
   include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
-  include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
   include ActionView::Helpers::AssetTagHelper
   include ActiveSupport
-  include ActionController::PolymorphicRoutes
+  include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
   
   include Formtastic::SemanticFormHelper
   
@@ -123,11 +92,17 @@ module FormtasticSpecHelper
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
+  class ::PostModel
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+  end
   
   def mock_everything
     
     # Resource-oriented styles like form_for(@post) will expect a path method for the object,
     # so we're defining some here.
+    def post_models_path; "/postmodels/1"; end
+
     def post_path(o); "/posts/1"; end
     def posts_path; "/posts"; end
     def new_post_path; "/posts/new"; end
@@ -147,6 +122,7 @@ module FormtasticSpecHelper
     @fred.stub!(:persisted?).and_return(nil)
 
     @bob = mock('user')
+    @bob.stub!(:to_ary)
     @bob.stub!(:class).and_return(::Author)
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')
@@ -212,7 +188,7 @@ module FormtasticSpecHelper
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
-    ::Post.stub!(:reflect_on_validations_for).and_return([]) if defined?(Rspec)
+    ::Post.stub!(:reflect_on_validations_for).and_return([])
     ::Post.stub!(:reflections).and_return({})
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name