formtastic 2.3.1 → 3.0.0.rc

data/lib/formtastic/util.rb

@@ -42,7 +42,7 @@ module Formtastic
     end
     
     def deprecated_version_of_rails?
-      rails_version < Gem::Version.new("3.2.13")
+      rails_version < Gem::Version.new("4.0.4")
     end
 
     def rails_version

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.3.1"
+  VERSION = "3.0.0.rc"
 end

data/lib/generators/formtastic/install/install_generator.rb

@@ -1,32 +1,17 @@
 # encoding: utf-8
 
 module Formtastic
-  # Copies formtastic.css to public/stylesheets/ (Rails 3.0.x only) and a config initializer
-  # to config/initializers/formtastic.rb (all Rails versions).
+  # Copies a config initializer to config/initializers/formtastic.rb
   #
   # @example
   #   $ rails generate formtastic:install
-  #
-  # @todo Test with Rails 3.0
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path('../../../templates', __FILE__)
     class_option :template_engine
 
-    if ::Rails::VERSION::MAJOR==4 || (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1)
-      # Rails 3.1+ has the asset pipeline, no need to copy CSS files any more
-      desc "Copies a config initializer to config/initializers/formtastic.rb"
-      def copy_files
-        copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'
-      end
-    else
-      # Rails 3.0 doesn't have an asset pipeline, so we copy in CSS too
-      desc "Copies some CSS files to public/stylesheets/ and a config initializer to config/initializers/formtastic.rb"
-      def copy_files
-        template 'formtastic.rb', 'config/initializers/formtastic.rb'
-        template '../../../app/assets/stylesheets/formtastic.css',     'public/stylesheets/formtastic.css'
-        template '../../../app/assets/stylesheets/formtastic_ie6.css', 'public/stylesheets/formtastic_ie6.css'
-        template '../../../app/assets/stylesheets/formtastic_ie7.css', 'public/stylesheets/formtastic_ie7.css'
-      end
+    desc "Copies a config initializer to config/initializers/formtastic.rb"
+    def copy_files
+      copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'
     end
 
     def copy_scaffold_template

data/spec/actions/generic_action_spec.rb

@@ -164,7 +164,14 @@ describe 'InputAction::Base' do
             ::I18n.backend.store_translations :en, :formtastic => {
               :submit => 'Submit %{model}',
               :reset => 'Reset %{model}',
-              :cancel => 'Cancel %{model}'
+              :cancel => 'Cancel %{model}',
+              :actions => {
+                :message => {
+                  :submit => 'Submit message',
+                  :reset => 'Reset message',
+                  :cancel => 'Cancel message'
+                }
+              }
             }
           end
   
@@ -182,6 +189,17 @@ describe 'InputAction::Base' do
             output_buffer.should have_tag('li.generic_action input[@value="Cancel Post"]')
             output_buffer.should have_tag('li.generic_action input[@value="Reset Post"]')
           end
+
+          it 'should render an input with custom resource name localized label' do
+            concat(semantic_form_for(:post, :as => :message, :url => 'http://example.com') do |builder|
+              concat(builder.action(:submit, :as => :generic))
+              concat(builder.action(:reset, :as => :generic))
+              concat(builder.action(:cancel, :as => :generic))
+            end)
+            output_buffer.should have_tag('li.generic_action input[@value="Submit message"]')
+            output_buffer.should have_tag('li.generic_action input[@value="Cancel message"]')
+            output_buffer.should have_tag('li.generic_action input[@value="Reset message"]')
+          end
         end
   
        describe 'when I18n-localized label is provided' do
@@ -366,7 +384,14 @@ describe 'InputAction::Base' do
             ::I18n.backend.store_translations :en, :formtastic => {
               :update => 'Save %{model}',
               :reset => 'Reset %{model}',
-              :cancel => 'Cancel %{model}'
+              :cancel => 'Cancel %{model}',
+              :actions => {
+                :message => {
+                  :submit => 'Submit message',
+                  :reset => 'Reset message',
+                  :cancel => 'Cancel message'
+                }
+              }
             }
           end
   
@@ -384,6 +409,17 @@ describe 'InputAction::Base' do
             output_buffer.should have_tag('li.generic_action input[@value="Reset Post"]')
             output_buffer.should have_tag('li.generic_action input[@value="Cancel Post"]')
           end
+
+          it 'should render an input with custom resource name localized label' do
+            concat(semantic_form_for(:post, :as => :message, :url => 'http://example.com') do |builder|
+              concat(builder.action(:submit, :as => :generic))
+              concat(builder.action(:reset, :as => :generic))
+              concat(builder.action(:cancel, :as => :generic))
+            end)
+            output_buffer.should have_tag('li.generic_action input[@value="Submit message"]')
+            output_buffer.should have_tag('li.generic_action input[@value="Cancel message"]')
+            output_buffer.should have_tag('li.generic_action input[@value="Reset message"]')
+          end
         end
   
         describe 'when I18n-localized label is provided' do

data/spec/helpers/input_helper_spec.rb

@@ -470,6 +470,12 @@ describe 'Formtastic::FormBuilder#input' do
           default_input_type(:string, :search).should == :search
         end
 
+        it 'should default to :color for :string columns matching color' do
+          default_input_type(:string, :color).should == :color
+          default_input_type(:string, :user_color).should == :color
+          default_input_type(:string, :color_for_image).should == :color
+        end
+
         describe 'defaulting to file column' do
           Formtastic::FormBuilder.file_methods.each do |method|
             it "should default to :file for attributes that respond to ##{method}" do
@@ -665,16 +671,6 @@ describe 'Formtastic::FormBuilder#input' do
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
 
-				it 'should have a custom hint class if I ask for one' do
-          with_deprecation_silenced do
-            hint_text = "this is the title of the post"
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :hint => hint_text, :hint_class => 'custom-hint-class'))
-            end)
-            output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
-          end
-        end
-
         it 'should have a custom hint class defaulted for all forms' do
           hint_text = "this is the title of the post"
           Formtastic::FormBuilder.default_hint_class = "custom-hint-class"
@@ -720,25 +716,6 @@ describe 'Formtastic::FormBuilder#input' do
               end
             end
 
-						it 'should render a hint paragraph containing a localized hint (I18n) with a custom hint class if i ask for one' do
-              with_config :i18n_lookups_by_default, false do
-                ::I18n.backend.store_translations :en,
-                :formtastic => {
-                    :hints => {
-                      :post => {
-                        :title => @localized_hint_text
-                       }
-                     }
-                  }
-                with_deprecation_silenced do
-                  concat(semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
-                  end)
-                end
-                output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
-              end
-            end
-
             it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
               with_config :i18n_lookups_by_default, false do
                 concat(semantic_form_for(@new_post) do |builder|

data/spec/inputs/boolean_input_spec.rb

@@ -8,21 +8,18 @@ describe 'boolean input' do
   before do
     @output_buffer = ''
     mock_everything
+
+    concat(semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean))
+    end)
   end
 
-  describe 'generic' do
-    before do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:allow_comments, :as => :boolean))
-      end)
-    end
-    
-    it_should_have_input_wrapper_with_class("boolean")
-    it_should_have_input_wrapper_with_class(:input)
-    it_should_have_input_wrapper_with_id("post_allow_comments_input")
-    it_should_apply_error_logic_for_input_type(:boolean)
-  
-    it 'should generate a label containing the input' do
+  it_should_have_input_wrapper_with_class("boolean")
+  it_should_have_input_wrapper_with_class(:input)
+  it_should_have_input_wrapper_with_id("post_allow_comments_input")
+  it_should_apply_error_logic_for_input_type(:boolean)
+
+  it 'should generate a label containing the input' do
     output_buffer.should_not have_tag('label.label')
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
@@ -30,25 +27,24 @@ describe 'boolean input' do
     output_buffer.should have_tag('form li label input[@type="checkbox"]', :count => 1)
     output_buffer.should have_tag('form li input[@type="hidden"]', :count => 1)
     output_buffer.should_not have_tag('form li label input[@type="hidden"]', :count => 1) # invalid HTML5
-    end
-  
-    it 'should not add a "name" attribute to the label' do
-      output_buffer.should_not have_tag('form li label[@name]')
-    end
-  
-    it 'should generate a checkbox input' do
-      output_buffer.should have_tag('form li label input')
-      output_buffer.should have_tag('form li label input#post_allow_comments')
-      output_buffer.should have_tag('form li label input[@type="checkbox"]')
-      output_buffer.should have_tag('form li label input[@name="post[allow_comments]"]')
-      output_buffer.should have_tag('form li label input[@type="checkbox"][@value="1"]')
-    end
-  
-    it 'should generate a checked input if object.method returns true' do
-      output_buffer.should have_tag('form li label input[@checked="checked"]')
-      output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
-      output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
-    end
+  end
+
+  it 'should not add a "name" attribute to the label' do
+    output_buffer.should_not have_tag('form li label[@name]')
+  end
+
+  it 'should generate a checkbox input' do
+    output_buffer.should have_tag('form li label input')
+    output_buffer.should have_tag('form li label input#post_allow_comments')
+    output_buffer.should have_tag('form li label input[@type="checkbox"]')
+    output_buffer.should have_tag('form li label input[@name="post[allow_comments]"]')
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="1"]')
+  end
+
+  it 'should generate a checked input if object.method returns true' do
+    output_buffer.should have_tag('form li label input[@checked="checked"]')
+    output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
+    output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
   end
 
   it 'should generate a checked input if :input_html is passed :checked => checked' do
@@ -131,16 +127,6 @@ describe 'boolean input' do
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
   end
 
-  it 'should generate a checked input for boolean database values compared to string checked values' do
-    @new_post.stub(:foo).and_return(1)
-
-    concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:foo, :as => :boolean))
-    end)
-
-    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="1"][@checked="checked"]')
-  end
-
   it 'should generate a checked input if object.method returns checked value when inverted' do
     @new_post.stub(:allow_comments).and_return(0)
 

data/spec/inputs/color_input_spec.rb

@@ -0,0 +1,97 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'color input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  if Formtastic::Util.rails3?
+    describe "attempting to use color input with Rails 3" do
+      it "raises an error" do
+        expect {
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:color))
+          end)
+        }.to raise_error "The :color input requires the color_field form helper, which is only available in Rails 4+"
+      end
+    end
+  else
+    describe "when object is provided" do
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:color))
+        end)
+      end
+
+      it_should_have_input_wrapper_with_class(:color)
+      it_should_have_input_wrapper_with_class(:input)
+      it_should_have_input_wrapper_with_class(:stringish)
+      it_should_have_input_wrapper_with_id("post_color_input")
+      it_should_have_label_with_text(/Color/)
+      it_should_have_label_for("post_color")
+      it_should_have_input_with_id("post_color")
+      it_should_have_input_with_type(:color)
+      it_should_have_input_with_name("post[color]")
+
+    end
+
+    describe "when namespace is provided" do
+
+      before do
+        concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+          concat(builder.input(:color))
+        end)
+      end
+
+      it_should_have_input_wrapper_with_id("context2_post_color_input")
+      it_should_have_label_and_input_with_id("context2_post_color")
+
+    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 => :color))
+          end)
+        end)
+      end
+
+      it 'should index the id of the wrapper' do
+        output_buffer.should have_tag("li#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
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :as => :color, :required => true))
+          end)
+          output_buffer.should have_tag("input[@required]")
+        end
+      end
+    end
+  end
+
+end
+

data/spec/inputs/hidden_input_spec.rb

@@ -9,15 +9,11 @@ describe 'hidden input' do
     @output_buffer = ''
     mock_everything
     
-    with_deprecation_silenced do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:secret, :as => :hidden))
-        concat(builder.input(:author_id, :as => :hidden, :value => 99))
-        concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
-        concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
-        concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
-      end)
-    end
+    concat(semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:secret, :as => :hidden))
+      concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
+      concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
+    end)
   end
 
   it_should_have_input_wrapper_with_class("hidden")
@@ -35,11 +31,6 @@ describe 'hidden input' do
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"][@value=\"1\"]")
   end
   
-  it "should pass any explicitly specified value - using :value" do
-    output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
-  end
-
-  # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
@@ -48,10 +39,6 @@ describe 'hidden input' do
     output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
-  it "should prefer :input_html over directly supplied options" do
-    output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"formtastic_value\"]")
-  end
-
   it "should not render inline errors" do
     @errors = double('errors')
     @errors.stub(:[]).with(errors_matcher(:secret)).and_return(["foo", "bah"])
@@ -80,18 +67,14 @@ describe 'hidden input' do
       @output_buffer = ''
       mock_everything
       
-      with_deprecation_silenced do
-        concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-          concat(builder.input(:secret, :as => :hidden))
-          concat(builder.input(:author_id, :as => :hidden, :value => 99))
-          concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
-          concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
-          concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
-        end)
-      end
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+        concat(builder.input(:secret, :as => :hidden))
+        concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
+        concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
+      end)
     end
 
-    attributes_to_check = [:secret, :author_id, :published, :reviewer]
+    attributes_to_check = [:secret, :published, :reviewer]
     attributes_to_check.each do |a|
       it_should_have_input_wrapper_with_id("context2_post_#{a}_input")
     end

data/spec/inputs/select_input_spec.rb

@@ -220,21 +220,6 @@ describe 'select input' do
     end
   end
 
-  describe "for a belongs_to association with :group_by => :author" do
-    it "should call author.posts" do
-      ::Author.stub(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [double('reflection', :klass => Post, :name => :posts)] : []}
-
-      [@freds_post].each { |post| post.stub(:to_label).and_return("Post - #{post.id}") }
-      @fred.should_receive(:posts)
-
-      with_deprecation_silenced do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:main_post, :as => :select, :group_by => :author ) )
-        end)
-      end
-    end
-  end
-
   describe "for a belongs_to association with :conditions" do
     before do
       ::Post.stub(:reflect_on_association).with(:author).and_return do
@@ -244,11 +229,11 @@ describe 'select input' do
       end
     end
 
-    it "should call author.find with association conditions" do
+    it "should call author.(scoped|where) with association conditions" do
       if Formtastic::Util.rails3?
         ::Author.should_receive(:scoped).with(:conditions => {:active => true})
       else
-        ::Author.should_receive(:where).with(:conditions => {:active => true})
+        ::Author.should_receive(:where).with({:active => true})
       end
 
       semantic_form_for(@new_post) do |builder|
@@ -256,100 +241,14 @@ describe 'select input' do
       end
     end
 
-    it "should call author.find with association conditions and find_options conditions" do
+    it "should call author.(scoped|where) with association conditions" do
       if Formtastic::Util.rails3?
         ::Author.should_receive(:scoped).with(:conditions => {:active => true})
-        ::Author.should_receive(:where).with({:publisher => true})
       else
-        proxy = double
-        ::Author.should_receive(:where).with({:active => true}).and_return(proxy)
-        proxy.should_receive(:where).with({:publisher => true})
-      end
-      
-
-      with_deprecation_silenced do
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
-        end
-      end
-    end
-  end
-
-  describe 'for a belongs_to association with :group_by => :continent' do
-    before do
-      @authors = [@bob, @fred, @fred, @fred]
-      ::Author.stub(:find).and_return(@authors)
-      @continent_names = %w(Europe Africa)
-      @continents = (0..1).map { |i| c = ::Continent.new; c.stub(:id).and_return(100 - i);c }
-      @authors[0..1].each_with_index { |author, i| author.stub(:continent).and_return(@continents[i]) }
-
-      ::Continent.stub(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [double('reflection', :klass => Author, :name => :authors)] : [] }
-      ::Continent.stub(:reflect_on_association).and_return {|column_name| double('reflection', :klass => Author) if column_name == :authors}
-      ::Author.stub(:reflect_on_association).and_return { |column_name| double('reflection', :options => {}, :klass => Continent, :macro => :belongs_to) if column_name == :continent }
-
-
-      @continents.each_with_index do |continent, i|
-        continent.stub(:to_label).and_return(@continent_names[i])
-        continent.stub(:authors).and_return([@authors[i]])
+        ::Author.should_receive(:where).with({:active => true})
       end
-
-      with_deprecation_silenced do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author, :as => :select, :group_by => :continent ) )
-          concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label => :id ) )
-          concat(builder.input(:author, :as => :select, :group_by => :continent, :member_label => :login ) )
-          concat(builder.input(:author, :as => :select, :group_by => :continent, :member_label => :login, :group_label => :id ) )
-        end)
-      end
-    end
-
-    it_should_have_input_wrapper_with_class("select")
-    it_should_have_input_wrapper_with_id("post_author_input")
-    it_should_have_label_with_text(/Author/)
-    it_should_have_label_for('post_author_id')
-
-    # TODO, need to find a way to repeat some of the specs and logic from the belongs_to specs without grouping
-
-    0.upto(1) do |i|
-      it 'should have all option groups and the right values' do
-        output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
-      end
-
-      it 'should have custom group labels' do
-        output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
-      end
-
-      it 'should have custom author labels' do
-        output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
-      end
-
-      it 'should have custom author and group labels' do
-        output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
-      end
-    end
-
-    it 'should have no duplicate groups' do
-      output_buffer.should have_tag('form li select optgroup', :count => 8)
-    end
-
-    it 'should sort the groups on the label method' do
-      output_buffer.should have_tag("form li select optgroup[@label='Africa']")
-      output_buffer.should have_tag("form li select optgroup[@label='99']")
-    end
-
-    it 'should call find with :include for more optimized queries' do
-      if Formtastic::Util.rails3?
-       Author.should_receive(:where).with(:include => :continent)
-      else
-       proxy = author_array_or_scope(@authors)
-       Author.should_receive(:where).and_return(proxy)
-       proxy.should_receive(:includes).with(:continent).and_call_original
-      end
-
-      with_deprecation_silenced do 
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author, :as => :select, :group_by => :continent ) )
-        end
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author, :as => :select))
       end
     end
   end