formtastic-rails3 0.9.10.1 → 1.0.0.beta3

data/lib/formtastic/railtie.rb

@@ -4,7 +4,7 @@ require 'rails'
 
 module Formtastic
   class Railtie < Rails::Railtie
-    initializer :after_initialize do
+    initializer 'formtastic.initialize', :after => :after_initialize do
       ActionView::Base.send :include, Formtastic::SemanticFormHelper
       ActionView::Base.send(:include, Formtastic::LayoutHelper)
     end

data/lib/formtastic/util.rb

@@ -13,7 +13,8 @@ module Formtastic
     def html_safe(text)
       return text if text.nil?
       return text.html_safe if defined?(ActiveSupport::SafeBuffer)
-      return text.html_safe!
+      return text.html_safe! if text.respond_to?(:html_safe!)
+      text
     end
 
     def rails_safe_buffer_class
@@ -29,7 +30,7 @@ module Formtastic
         if defined?(ActionPack::VERSION::MAJOR)
           ActionPack::VERSION::MAJOR
         end
-      version >= 3
+      !version.blank? && version >= 3
     end
   end
 end

data/lib/generators/formtastic/form/form_generator.rb

@@ -5,6 +5,9 @@ module Formtastic
          "generated code will be printed out directly in the terminal, and also copied " <<
          "to clipboard. Can optionally be saved into partial directly."
 
+    argument :name, :type => :string, :required => true, :banner => 'ExistingModelName'
+    argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
+
     class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
                  :desc => "Generate HAML instead of ERB"
 
@@ -19,11 +22,8 @@ module Formtastic
      @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'form', 'templates'), File.dirname(__FILE__))
     end
 
-    def self.banner
-      "rails generate formtastic:form ExistingModelName [options]"
-    end
-
     def create_or_show
+      @attributes = self.columns if @attributes.empty?
       if options[:partial]
         empty_directory "app/views/#{controller_path}"
         template "view__form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"

data/spec/buttons_spec.rb

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

data/spec/commit_button_spec.rb

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

data/spec/custom_builder_spec.rb

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

data/spec/defaults_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
+require 'spec_helper'
 
 describe 'Formtastic::SemanticFormBuilder-defaults' do
   

data/spec/error_proc_spec.rb

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

data/spec/errors_spec.rb

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

data/spec/form_helper_spec.rb

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

data/spec/helpers/layout_helper_spec.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe Formtastic::LayoutHelper do
+  
+  include FormtasticSpecHelper
+  include Formtastic::LayoutHelper
+  
+  describe '#formtastic_stylesheet_link_tag' do
+    
+    it 'should render a link to formtastic.css' do
+      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic.css']")
+    end
+    
+    it 'should render a link to formtastic_changes.css' do
+      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
+    end
+    
+  end
+end
+

data/spec/i18n_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
+require 'spec_helper'
 
 describe 'Formtastic::I18n' do
   

data/spec/include_blank_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "*select: options[:include_blank]" do
 

data/spec/input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#input' do
   
@@ -136,13 +136,6 @@ describe 'SemanticFormBuilder#input' do
               @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
             end
 
-            unless defined?(Rspec)
-              after do
-                ::Post.unstub!(:reflect_on_validations_for)
-                @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(false)
-              end
-            end
-
             describe 'and validates_presence_of was called for the method' do
               it 'should be required' do
                 @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([
@@ -240,115 +233,111 @@ describe 'SemanticFormBuilder#input' do
 
           end
 
-          unless defined?(Rspec)
-            describe 'and its a ActiveModel' do
-              before do
-                ::Post.stub!(:validators_on).and_return([])
-                @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(true)
-              end
-
-              after do
-                ::Post.unstub!(:validators_on)
-                @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(false)
-              end
-              describe 'and validates_presence_of was called for the method' do
-                it 'should be required' do
+          describe 'and its a ActiveModel' do
+            before do
+              @new_post.stub!(:class).and_return(::PostModel)
+            end
 
-                  @new_post.class.should_receive(:validators_on).with(:title).and_return([
-                    active_model_presence_validator([:title])
-                  ])
+            after do
+              @new_post.stub!(:class).and_return(::Post)
+            end
+            describe 'and validates_presence_of was called for the method' do
+              it 'should be required' do
 
-                  @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                    active_model_presence_validator([:body], {:if => true})
-                  ])
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([
+                  active_model_presence_validator([:title])
+                ])
 
-                  form = semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:title))
-                    concat(builder.input(:body))
-                  end
-                  output_buffer.concat(form) if Formtastic::Util.rails3?
-                  output_buffer.should have_tag('form li.required')
-                  output_buffer.should_not have_tag('form li.optional')
-                end
+                @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                  active_model_presence_validator([:body], {:if => true})
+                ])
 
-                it 'should be not be required if the optional :if condition is not satisifed' do
-                  should_be_required(:required => false, :options => { :if => false })
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                  concat(builder.input(:body))
                 end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
 
-                it 'should not be required if the optional :if proc evaluates to false' do
-                  should_be_required(:required => false, :options => { :if => proc { |record| false } })
-                end
+              it 'should be not be required if the optional :if condition is not satisifed' do
+                should_be_required(:required => false, :options => { :if => false })
+              end
 
-                it 'should be required if the optional :if proc evaluates to true' do
-                  should_be_required(:required => true, :options => { :if => proc { |record| true } })
-                end
+              it 'should not be required if the optional :if proc evaluates to false' do
+                should_be_required(:required => false, :options => { :if => proc { |record| false } })
+              end
 
-                it 'should not be required if the optional :unless proc evaluates to true' do
-                  should_be_required(:required => false, :options => { :unless => proc { |record| true } })
-                end
+              it 'should be required if the optional :if proc evaluates to true' do
+                should_be_required(:required => true, :options => { :if => proc { |record| true } })
+              end
 
-                it 'should be required if the optional :unless proc evaluates to false' do
-                  should_be_required(:required => true, :options => { :unless => proc { |record| false } })
-                end
+              it 'should not be required if the optional :unless proc evaluates to true' do
+                should_be_required(:required => false, :options => { :unless => proc { |record| true } })
+              end
 
-                it 'should be required if the optional :if with a method string evaluates to true' do
-                  @new_post.should_receive(:required_condition).and_return(true)
-                  should_be_required(:required => true, :options => { :if => :required_condition })
-                end
+              it 'should be required if the optional :unless proc evaluates to false' do
+                should_be_required(:required => true, :options => { :unless => proc { |record| false } })
+              end
 
-                it 'should be required if the optional :if with a method string evaluates to false' do
-                  @new_post.should_receive(:required_condition).and_return(false)
-                  should_be_required(:required => false, :options => { :if => :required_condition })
-                end
+              it 'should be required if the optional :if with a method string evaluates to true' do
+                @new_post.should_receive(:required_condition).and_return(true)
+                should_be_required(:required => true, :options => { :if => :required_condition })
+              end
 
-                it 'should not be required if the optional :unless with a method string evaluates to false' do
-                   @new_post.should_receive(:required_condition).and_return(false)
-                  should_be_required(:required => true, :options => { :unless => :required_condition })
-                end
+              it 'should be required if the optional :if with a method string evaluates to false' do
+                @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => false, :options => { :if => :required_condition })
+              end
 
-                 it 'should be required if the optional :unless with a method string evaluates to true' do
-                   @new_post.should_receive(:required_condition).and_return(true)
-                   should_be_required(:required => false, :options => { :unless => :required_condition })
-                 end
+              it 'should not be required if the optional :unless with a method string evaluates to false' do
+                 @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => true, :options => { :unless => :required_condition })
               end
 
-              # TODO make a matcher for this?
-              def should_be_required(options)
-                @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                  active_model_presence_validator([:body], options[:options])
-                ])
+               it 'should be required if the optional :unless with a method string evaluates to true' do
+                 @new_post.should_receive(:required_condition).and_return(true)
+                 should_be_required(:required => false, :options => { :unless => :required_condition })
+               end
+            end
 
-                form = semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:body))
-                end
+            # TODO make a matcher for this?
+            def should_be_required(options)
+              @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                active_model_presence_validator([:body], options[:options])
+              ])
 
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+              form = semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:body))
+              end
 
-                if options[:required]
-                  output_buffer.should_not have_tag('form li.optional')
-                  output_buffer.should have_tag('form li.required')
-                else
-                  output_buffer.should have_tag('form li.optional')
-                  output_buffer.should_not have_tag('form li.required')
-                end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
+
+              if options[:required]
+                output_buffer.should_not have_tag('form li.optional')
+                output_buffer.should have_tag('form li.required')
+              else
+                output_buffer.should have_tag('form li.optional')
+                output_buffer.should_not have_tag('form li.required')
               end
+            end
 
-              describe 'and validates_presence_of was not called for the method' do
-                before do
-                  @new_post.class.should_receive(:validators_on).with(:title).and_return([])
-                end
+            describe 'and validates_presence_of was not called for the method' do
+              before do
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([])
+              end
 
-                it 'should not be required' do
-                  form = semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:title))
-                  end
-                  output_buffer.concat(form) if Formtastic::Util.rails3?
-                  output_buffer.should_not have_tag('form li.required')
-                  output_buffer.should have_tag('form li.optional')
+              it 'should not be required' do
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
                 end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should_not have_tag('form li.required')
+                output_buffer.should have_tag('form li.optional')
               end
-
             end
+
           end
 
           describe 'and the validation reflection plugin is not available' do
@@ -717,6 +706,23 @@ describe 'SemanticFormBuilder#input' do
           end
         end
         
+        describe 'when localized hint (I18n) is a model with attribute hints' do
+          it "should see the provided hash as a blank entry" do
+            ::I18n.backend.store_translations :en,
+            :formtastic => {
+                :hints => {
+                  :title => { # movie title
+                    :summary => @localized_hint_text # summary of movie
+                   }
+                 }
+              }
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :hint => true))
+            end
+            output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
+          end
+        end
+        
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
             form = semantic_form_for(@new_post) do |builder|

data/spec/inputs/boolean_input_spec.rb

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

data/spec/inputs/check_boxes_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'check_boxes input' do
   
@@ -45,9 +45,9 @@ describe 'check_boxes input' do
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
-    it 'should generate hidden inputs with default value blank' do
+    it 'should not generate hidden inputs with default value blank' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
+      output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
     end
 
     describe "each choice" do
@@ -67,12 +67,27 @@ describe 'check_boxes input' do
         end
       end
 
-      it 'should have a checkbox input for each post' do
+      it 'should have a checkbox input but no hidden field for each post' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
+        ::Post.find(:all).each do |post|
+          output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
+          output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
+        end
+      end
+
+      it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do
+        output_buffer.replace ''
+
+        form = semantic_form_for(@fred) do |builder|
+          concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
         end
+
       end
 
       it "should mark input as checked if it's the the existing choice" do
@@ -117,6 +132,44 @@ describe 'check_boxes input' do
           output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id][]']")
         end
       end
+
+      it 'should html escape the label string' do
+        form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_id, :as => :check_boxes, :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
+    end
+
+    describe 'when :hidden_fields is set to false' do
+      before do
+        @output_buffer = ''
+        mock_everything
+
+        form = semantic_form_for(@fred) do |builder|
+          concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?        
+      end
+
+      it 'should have a checkbox input for each post' do
+        ::Post.find(:all).each do |post|
+          output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
+          output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => ::Post.find(:all).length)
+        end
+      end
+
+      it "should mark input as checked if it's the the existing choice" do
+        ::Post.find(:all).include?(@fred.posts.first).should be_true
+        output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
+      end
+
+      it 'should not generate empty hidden inputs' do
+        output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).length)
+      end
     end
 
     describe 'when :selected is set' do
@@ -250,10 +303,71 @@ describe 'check_boxes 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 => :check_boxes))
+        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 => :check_boxes, :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
 
+  describe 'for a has_and_belongs_to_many association' do
+    
+    before do
+      @output_buffer = ''
+      mock_everything
+      
+      @form = semantic_form_for(@freds_post) do |builder|
+        concat(builder.input(:authors, :as => :check_boxes))
+      end
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+    end
+    
+    it 'should render checkboxes' do
+      # I'm aware these two lines test the same thing
+      output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
+      output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.find(:all).size)
+    end
+    
+    it 'should only select checkboxes that are present in the association' do
+      # I'm aware these two lines test the same thing
+      output_buffer.should have_tag('input[checked="checked"]', :count => 1)
+      output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
+    end
+    
   end
-  
-  
 
 end