formtastic 0.9.4 → 0.9.5

data/spec/inputs/select_input_spec.rb

@@ -103,13 +103,29 @@ describe 'select input' do
     end
   end
   
+  describe "for a belongs_to association with :group_by => :author" do
+    it "should call author.posts" do
+      [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
+      @fred.should_receive(:posts)
+
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:main_post, :as => :select, :group_by => :author ) )
+      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| mock("continent", :id => (100 - i) ) }
+      @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| mock('reflection', :klass => Author) if macro == :has_many}
+      ::Continent.stub!(:reflect_on_association).and_return {|column_name| mock('reflection', :klass => Author) if column_name == :authors}
+      ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('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]])
@@ -279,21 +295,76 @@ describe 'select input' do
 
   describe 'when :selected is set' do
     before do
-      @new_post.stub!(:author_id).and_return(nil)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:author, :as => :select, :selected => @bob.id ))
+      @output_buffer = ''
+    end
+
+    describe "no selected items" do
+      before do
+        @new_post.stub!(:author_id).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :select, :selected => nil))
+        end
+      end
+
+      it 'should not have any selected item(s)' do
+        output_buffer.should_not have_tag("form li select option[@selected='selected']")
       end
     end
-     
-    it 'should have a selected item' do
-      output_buffer.should have_tag("form li select option[@selected='selected']")
+
+    describe "single selected item" do
+      before do
+        @new_post.stub!(:author_id).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :select, :selected => @bob.id))
+        end
+      end
+
+      it 'should have a selected item; the specified one' do
+        output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
+        output_buffer.should have_tag("form li select option[@selected='selected']", /bob/i)
+        output_buffer.should have_tag("form li select option[@selected='selected'][@value='#{@bob.id}']")
+      end
     end
-    
-    it 'bob should be selected' do
-      output_buffer.should have_tag("form li select option[@selected='selected']", /bob/i)
-      output_buffer.should have_tag("form li select option[@selected='selected'][@value='42']")
+
+    describe "multiple selected items" do
+
+      describe "when :multiple => false" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+          
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :select, :selected => [@bob.id, @fred.id], :multiple => false))
+          end
+        end
+
+        it "should only select the first value" do
+          output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
+          # FIXME: Not supported by Nokogiri.
+          # output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected']", /bob/i)
+          # output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected'][@value='#{@bob.id}']")
+        end
+      end
+
+      describe "when :multiple => true" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :select, :selected => [@bob.id, @fred.id]))
+          end
+        end
+
+        it "should have multiple items selected; the specified ones" do
+          output_buffer.should have_tag("form li select option[@selected='selected']", :count => 2)
+          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected']", /bob/i)
+          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected'][@value='#{@bob.id}']")
+          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected']", /fred/i)
+          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected'][@value='#{@fred.id}']")
+        end
+      end
+
     end
-    
+
   end
 
   describe 'boolean select' do
@@ -339,4 +410,45 @@ describe 'select input' do
     end
   end
 
+  describe "enums" do
+    describe ":collection is set" do
+      before do
+        @output_buffer = ''
+        @some_meta_descriptions = ["One", "Two", "Three"]
+        @new_post.stub!(:meta_description).any_number_of_times
+      end
+
+      describe ":as is not set" do
+        before do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
+          end
+          semantic_form_for(:project, :url => 'http://test.host') do |builder|
+            concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
+          end
+        end
+
+        it "should render a select field" do
+          output_buffer.should have_tag("form li select", :count => 2)
+        end
+      end
+
+      describe ":as is set" do
+        before do
+          # Should not be a case, but just checking :as got highest priority in setting input type.
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
+          end
+          semantic_form_for(:project, :url => 'http://test.host') do |builder|
+            concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
+          end
+        end
+        
+        it "should render a text field" do
+          output_buffer.should have_tag("form li input[@type='text']", :count => 2)
+        end
+      end
+    end
+  end
+
 end

data/spec/inputs/time_input_spec.rb

@@ -38,5 +38,7 @@ describe 'time input' do
     output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
   end
 
-end
+  it_should_select_existing_datetime_else_current(:hour, :minute, :second)
+  it_should_select_explicit_default_value_if_set(:hour, :minute, :second)
 
+end

data/spec/inputs/time_zone_input_spec.rb

@@ -8,7 +8,7 @@ describe 'time_zone input' do
   before do
     @output_buffer = ''
     mock_everything
-
+    
     semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone))
     end
@@ -56,4 +56,47 @@ describe 'time_zone input' do
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
     end
   end
+  
+  describe 'when :selected is set' do
+    before do
+      @output_buffer = ''
+    end
+
+    # Note: Not possible to override default selected value for time_zone input
+    # without overriding Rails time_zone_select. This Rails helper works "a bit different". =/
+    #
+    # describe "no selected items" do
+    #   before do
+    #     @new_post.stub!(:time_zone).and_return('Stockholm')
+    # 
+    #     semantic_form_for(@new_post) do |builder|
+    #       concat(builder.input(:time_zone, :as => :time_zone, :selected => nil))
+    #     end
+    #   end
+    # 
+    #   it 'should not have any selected item(s)' do
+    #     output_buffer.should_not have_tag("form li select option[@selected='selected']")
+    #   end
+    # end
+
+    describe "single selected item" do
+      before do
+        # Note: See above...only works for the "attribute is nil" case.
+        # @new_post.stub!(:time_zone).and_return('Stockholm')
+        @new_post.stub!(:time_zone).and_return(nil)
+
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:time_zone, :as => :time_zone, :selected => 'Melbourne'))
+        end
+      end
+
+      it 'should have a selected item; the specified one' do
+        output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
+        output_buffer.should have_tag("form li select option[@selected='selected']", /Melbourne/i)
+        output_buffer.should have_tag("form li select option[@selected='selected'][@value='Melbourne']")
+      end
+    end
+
+  end
+
 end

data/spec/inputs_spec.rb

@@ -176,6 +176,7 @@ describe 'SemanticFormBuilder#inputs' do
           @legend_text = "Advanced options"
           @legend_text_using_name = "Advanced options 2"
           @legend_text_using_title = "Advanced options 3"
+          @nested_forms_legend_text = "This is a nested form title"
           semantic_form_for(@new_post) do |builder|
             builder.inputs @legend_text do
             end
@@ -183,6 +184,8 @@ describe 'SemanticFormBuilder#inputs' do
             end
             builder.inputs :title => @legend_text_using_title do
             end
+            builder.inputs @nested_forms_legend_text, :for => :authors do |nf|
+            end
           end
         end
 
@@ -190,6 +193,7 @@ describe 'SemanticFormBuilder#inputs' do
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@nested_forms_legend_text}$/)
         end
       end
       
@@ -198,12 +202,14 @@ describe 'SemanticFormBuilder#inputs' do
           @localized_legend_text = "Localized advanced options"
           @localized_legend_text_using_name = "Localized advanced options 2"
           @localized_legend_text_using_title = "Localized advanced options 3"
+          @localized_nested_forms_legend_text = "This is a localized nested form title"
           ::I18n.backend.store_translations :en, :formtastic => {
               :titles => {
                   :post => {
                       :advanced_options => @localized_legend_text,
                       :advanced_options_using_name => @localized_legend_text_using_name,
-                      :advanced_options_using_title => @localized_legend_text_using_title
+                      :advanced_options_using_title => @localized_legend_text_using_title,
+                      :nested_forms_title => @localized_nested_forms_legend_text
                     }
                 }
             }
@@ -214,6 +220,8 @@ describe 'SemanticFormBuilder#inputs' do
             end
             builder.inputs :title => :advanced_options_using_title do
             end
+            builder.inputs :nested_forms_title, :for => :authors do |nf|
+            end
           end
         end
 
@@ -221,6 +229,7 @@ describe 'SemanticFormBuilder#inputs' do
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@localized_nested_forms_legend_text}$/)
         end
       end
     end

data/spec/semantic_fields_for_spec.rb

@@ -35,7 +35,9 @@ describe 'SemanticFormBuilder#semantic_fields_for' do
       end
     end
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
-    output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
+    # Not valid selector, so using good ol' regex
+    output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
+    # <=> output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
   end
 
 end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ end
 smart_require 'spec', 'spec', '>= 1.2.6'
 smart_require false, 'rspec-rails', '>= 1.2.6'
 smart_require 'hpricot', 'hpricot', '>= 0.6.1'
-smart_require 'rspec_hpricot_matchers', 'rspec_hpricot_matchers', '>= 1.0.0'
+smart_require 'rspec_tag_matchers', 'rspec_tag_matchers', '>= 1.0.0'
 smart_require 'active_support', 'activesupport', '>= 2.3.4'
 smart_require 'action_controller', 'actionpack', '>= 2.3.4'
 smart_require 'action_view', 'actionpack', '>= 2.3.4'
@@ -23,7 +23,7 @@ smart_require 'action_view', 'actionpack', '>= 2.3.4'
 require 'custom_macros'
 
 Spec::Runner.configure do |config|
-  config.include(RspecHpricotMatchers)
+  config.include(RspecTagMatchers)
   config.include(CustomMacros)
 end
 
@@ -124,6 +124,8 @@ module FormtasticSpecHelper
     @new_post.stub!(:new_record?).and_return(true)
     @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
+    @new_post.stub!(:main_post).and_return(nil)
+    @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
 
     @freds_post = mock('post')
     @freds_post.stub!(:class).and_return(::Post)
@@ -150,7 +152,12 @@ module FormtasticSpecHelper
         mock
       when :authors
         mock('reflection', :options => {}, :klass => ::Author, :macro => :has_and_belongs_to_many)
+      when :sub_posts
+        mock('reflection', :options => {}, :klass => ::Post, :macro => :has_many)
+      when :main_post
+        mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       end
+      
     end
     ::Post.stub!(:find).and_return([@freds_post])
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
@@ -174,6 +181,10 @@ module FormtasticSpecHelper
     
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)
+
+    @new_post.should_receive(:publish_at=).any_number_of_times
+    @new_post.should_receive(:title=).any_number_of_times
+    @new_post.stub!(:main_post_id).and_return(nil)
         
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +11:00
+date: 2009-12-03 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,17 +43,7 @@ dependencies:
         version: 1.2.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec_hpricot_matchers
+  name: rspec_tag_matchers
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -122,7 +112,7 @@ has_rdoc: true
 homepage: http://github.com/justinfrench/formtastic/tree/master
 licenses: []
 
-post_install_message: "\n  ========================================================================\n  Thanks for installing Formtastic!\n  ------------------------------------------------------------------------\n  You can now (optionally) run the generater to copy some stylesheets and\n  a config initializer into your application:\n    ./script/generate formtastic\n\n  To generate some semantic form markup for your exisiting models, just run:\n    ./script/generate form MODEL_NAME\n\n  Find out more and get involved:\n    http://github.com/justinfrench/formtastic\n    http://groups.google.com.au/group/formtastic\n  ========================================================================\n  "
+post_install_message: "\n  ========================================================================\n  Thanks for installing Formtastic!\n  ------------------------------------------------------------------------\n  You can now (optionally) run the generator to copy some stylesheets and\n  a config initializer into your application:\n    ./script/generate formtastic\n\n  To generate some semantic form markup for your exisiting models, just run:\n    ./script/generate form MODEL_NAME\n\n  Find out more and get involved:\n    http://github.com/justinfrench/formtastic\n    http://groups.google.com.au/group/formtastic\n  ========================================================================\n  "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: