formtastic 0.9.7 → 0.9.8

data/spec/inputs/time_input_spec.rb

@@ -8,37 +8,163 @@ describe 'time input' do
   before do
     @output_buffer = ''
     mock_everything
+  end
+  
+  describe "general" do
+    before do
+      output_buffer.replace ''
+    end
+
+    describe "without seconds" do
+      before do
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time))
+        end
+      end
+     
+      it_should_have_input_wrapper_with_class("time")
+      it_should_have_input_wrapper_with_id("post_publish_at_input")
+      it_should_have_a_nested_fieldset
+      it_should_apply_error_logic_for_input_type(:time)
+    
+      it 'should have a legend and label with the label text inside the fieldset' do
+        output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
+      end
+    
+      it 'should associate the legend label with the first select' do
+        output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
+      end
+    
+      it 'should have an ordered list of two items inside the fieldset' do
+        output_buffer.should have_tag('form li.time fieldset ol')
+        output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+      end
+
+      it 'should have five labels for hour and minute' do
+        output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
+      end
     
-    semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:publish_at, :as => :time))
+      it 'should have two selects for hour and minute' do
+        output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+      end
     end
-  end
-   
-  it_should_have_input_wrapper_with_class("time")
-  it_should_have_input_wrapper_with_id("post_publish_at_input")
-  it_should_have_a_nested_fieldset
-  it_should_apply_error_logic_for_input_type(:time)
 
-  it 'should have a legend - classified as a label - containing the label text inside the fieldset' do
-    output_buffer.should have_tag('form li.time fieldset legend.label', /Publish at/)
-  end
+    describe "with seconds" do
+      before do
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :include_seconds => true))
+        end
+      end
+    
+      it 'should have five labels for hour and minute' do
+        output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /second/i)
+      end
 
-  it 'should have an ordered list of two items inside the fieldset' do
-    output_buffer.should have_tag('form li.time fieldset ol')
-    output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
-  end
+      it 'should have three selects for hour, minute and seconds' do
+        output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
+      end
 
-  it 'should have five labels for hour and minute' do
-    output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
-    output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
-    output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
+      it 'should generate a sanitized label and matching ids for attribute' do
+        4.upto(6) do |i|
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
+          output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
+        end
+      end
+    end
   end
 
-  it 'should have two selects for hour and minute' do
-    output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+  describe ':selected option' do
+    
+    describe "when the object has a value" do
+      it "should select the object value (ignoring :selected)" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => Time.mktime(2012, 11, 30, 21, 45))
+        with_deprecation_silenced do 
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
+          end
+        end
+        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
+        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='21'][@selected]", :count => 1)
+      end
+    end
+    
+    describe 'when the object has no value' do
+      it "should select the :selected if provided as a Time" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => nil)
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
+          end
+        end
+        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
+        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='22'][@selected]", :count => 1)
+      end
+      
+      it "should not select an option if the :selected is provided as nil" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => nil)
+        with_deprecation_silenced do 
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :time, :selected => nil))
+          end
+        end
+        output_buffer.should_not have_tag("form li ol li select#post_created_at_4i option[@selected]")
+      end
+      
+      it "should select Time.now if a :selected is not provided" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time))
+        end
+        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
+        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='#{Time.now.hour.to_s.rjust(2,'0')}'][@selected]", :count => 1)
+      end
+    end
+    
   end
-
-  it_should_select_existing_datetime_else_current(:hour, :minute, :second)
-  it_should_select_explicit_default_value_if_set(:hour, :minute, :second)
-
+  
+  describe ':labels option' do
+    fields = [:hour, :minute, :second]
+    fields.each do |field|
+      it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
+        output_buffer.replace ''
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
+        end
+        output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
+        end
+      end
+  
+      it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
+        output_buffer.replace ''
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
+        end
+        output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
+        end
+      end
+    end
+  end
+  
+  it 'should warn about :selected deprecation' do
+    with_deprecation_silenced do
+      ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999)))
+      end
+    end
+  end
+  
 end

data/spec/inputs/time_zone_input_spec.rb

@@ -85,8 +85,10 @@ describe 'time_zone input' do
         # @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'))
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:time_zone, :as => :time_zone, :selected => 'Melbourne'))
+          end
         end
       end
 

data/spec/layout_helper_spec.rb

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

data/spec/semantic_errors_spec.rb

@@ -0,0 +1,98 @@
+# coding: utf-8
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe 'SemanticFormBuilder#semantic_errors' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+    @title_errors = ['must not be blank', 'must be awesome']
+    @base_errors = ['base error message', 'nasty error']
+    @base_error = 'one base error'
+    @errors = mock('errors')
+    @new_post.stub!(:errors).and_return(@errors)
+  end
+
+  describe 'when there is only one error on base' do
+    before do
+      @errors.stub!(:on_base).and_return(@base_error)
+    end
+
+    it 'should render an unordered list' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_errors.should have_tag('ul.errors li', @base_error)
+      end
+    end
+  end
+
+  describe 'when there is more than one error on base' do
+    before do
+      @errors.stub!(:on_base).and_return(@base_errors)
+    end
+
+    it 'should render an unordered list' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_errors.should have_tag('ul.errors')
+        @base_errors.each do |error|
+          builder.semantic_errors.should have_tag('ul.errors li', error)
+        end
+      end
+    end
+  end
+
+  describe 'when there are errors on title' do
+    before do
+      @errors.stub!(:[]).with(:title).and_return(@title_errors)
+      @errors.stub!(:on_base).and_return([])
+    end
+
+    it 'should render an unordered list' do
+      semantic_form_for(@new_post) do |builder|
+        title_name = builder.send(:localized_string, :title, :title, :label) || builder.send(:humanized_attribute_name, :title)
+        builder.semantic_errors(:title).should have_tag('ul.errors li', title_name << " " << @title_errors.to_sentence)
+      end
+    end
+  end
+
+  describe 'when there are errors on title and base' do
+    before do
+      @errors.stub!(:[]).with(:title).and_return(@title_errors)
+      @errors.stub!(:on_base).and_return(@base_error)
+    end
+
+    it 'should render an unordered list' do
+      semantic_form_for(@new_post) do |builder|
+        title_name = builder.send(:localized_string, :title, :title, :label) || builder.send(:humanized_attribute_name, :title)
+        builder.semantic_errors(:title).should have_tag('ul.errors li', title_name << " " << @title_errors.to_sentence)
+        builder.semantic_errors(:title).should have_tag('ul.errors li', @base_error)
+      end
+    end
+  end
+
+  describe 'when there are no errors' do
+    before do
+      @errors.stub!(:[]).with(:title).and_return(nil)
+      @errors.stub!(:on_base).and_return(nil)
+    end
+
+    it 'should return nil' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_errors(:title).should be_nil
+      end
+    end
+  end
+
+  describe 'when there is one error on base and options with class is passed' do
+    before do
+      @errors.stub!(:on_base).and_return(@base_error)
+    end
+
+    it 'should render an unordered list with given class' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_errors(:class => "awesome").should have_tag('ul.awesome li', @base_error)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,24 +1,18 @@
 # coding: utf-8
 require 'rubygems'
 
-def smart_require(lib_name, gem_name, gem_version = '>= 0.0.0')
-  begin
-    require lib_name if lib_name
-  rescue LoadError
-    if gem_name
-      gem gem_name, gem_version
-      require lib_name if lib_name
-    end
-  end
-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_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'
+gem 'activesupport', '2.3.5'
+gem 'actionpack', '2.3.5'
+require 'active_support'
+require 'action_pack'
+require 'action_view'
+require 'action_controller'
+
+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'
 
@@ -28,6 +22,7 @@ Spec::Runner.configure do |config|
 end
 
 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 FormtasticSpecHelper
@@ -41,6 +36,7 @@ module FormtasticSpecHelper
   include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
+  include ActionView::Helpers::AssetTagHelper
   include ActiveSupport
   include ActionController::PolymorphicRoutes
   
@@ -61,6 +57,12 @@ module FormtasticSpecHelper
     def id
     end
   end
+  module ::Namespaced
+    class Post
+      def id
+      end
+    end
+  end
   class ::Author
     def to_label
     end
@@ -207,6 +209,12 @@ module FormtasticSpecHelper
     ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", old_value)
   end
   
+  def with_deprecation_silenced(&block)
+    ::ActiveSupport::Deprecation.silenced = true
+    yield
+    ::ActiveSupport::Deprecation.silenced = false
+  end
+  
 end
 
 ::ActiveSupport::Deprecation.silenced = false

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Justin French
@@ -9,49 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +11:00
+date: 2010-03-31 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 6
         version: 1.2.6
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec_tag_matchers
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :development
+  version_requirements: *id004
 description: A Rails form builder plugin/gem with semantically rich and accessible markup
 email: justin@indent.com.au
 executables: []
@@ -75,6 +96,7 @@ files:
 - generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
 - lib/formtastic.rb
 - lib/formtastic/i18n.rb
+- lib/formtastic/layout_helper.rb
 - lib/locale/en.yml
 - rails/init.rb
 - spec/buttons_spec.rb
@@ -105,6 +127,8 @@ files:
 - spec/inputs/time_zone_input_spec.rb
 - spec/inputs_spec.rb
 - spec/label_spec.rb
+- spec/layout_helper_spec.rb
+- spec/semantic_errors_spec.rb
 - spec/semantic_fields_for_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -112,7 +136,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 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  "
+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 existing 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: 
@@ -121,18 +145,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
@@ -165,5 +191,7 @@ test_files:
 - spec/inputs/time_zone_input_spec.rb
 - spec/inputs_spec.rb
 - spec/label_spec.rb
+- spec/layout_helper_spec.rb
+- spec/semantic_errors_spec.rb
 - spec/semantic_fields_for_spec.rb
 - spec/spec_helper.rb