formtastic 2.0.0.rc3 → 2.0.0.rc4

data/spec/inputs/radio_input_spec.rb

@@ -50,6 +50,11 @@ describe 'radio input' do
         output_buffer.should_not have_tag('li.choice label.label')
       end
       
+      it 'should not add the required attribute to each input' do
+        output_buffer.should_not have_tag('li.choice input[@required]')
+      end
+      
+      
       it 'should contain a label for the radio input with a nested input and label text' do
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
@@ -63,12 +68,6 @@ describe 'radio input' do
         end
       end
       
-      it "should add the required attribute to the input's html options" do
-        ::Author.all.each do |post|
-          output_buffer.should have_tag("form li fieldset ol li.author_#{post.id} input[@required]")
-        end
-      end
-
       it "should have a radio input" do
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")

data/spec/inputs/string_input_spec.rb

@@ -151,12 +151,29 @@ describe 'string input' do
   end
   
   describe "when required" do
-    it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :string, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+    
+    context "and configured to use HTML5 attribute" 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 => :string, :required => true))
+          end)
+          output_buffer.should have_tag("input[@required]")
+        end
+      end
     end
+
+    context "and configured to not use HTML5 attribute" do
+      it "should add the required attribute to the input's html options" do
+        with_config :use_required_attribute, false do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :as => :string, :required => true))
+          end)
+          output_buffer.should_not have_tag("input[@required]")
+        end
+      end
+    end
+    
   end
 
 end

data/spec/inputs/time_input_spec.rb

@@ -16,22 +16,46 @@ describe 'time input' do
       output_buffer.replace ''
     end
 
-    describe "with :ignore_date" do
+    describe "with :ignore_date => true" do
       before do
         concat(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.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')
+      it 'should not have hidden inputs for day, month and year' do
+        output_buffer.should_not have_tag('input#post_publish_at_1i')
+        output_buffer.should_not have_tag('input#post_publish_at_2i')
+        output_buffer.should_not have_tag('input#post_publish_at_3i')
       end
 
       it 'should have an input for hour and minute' do
-        output_buffer.should have_tag('#post_publish_at_4i')
-        output_buffer.should have_tag('#post_publish_at_5i')
+        output_buffer.should have_tag('select#post_publish_at_4i')
+        output_buffer.should have_tag('select#post_publish_at_5i')
+      end
+
+    end
+    
+    describe "with :ignore_date => false" do
+      before do
+        @new_post.stub(:publish_at).and_return(Time.parse('2010-11-07'))
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :ignore_date => false))
+        end)
+      end
+
+      it 'should have a hidden input for day, month and year' do
+        output_buffer.should have_tag('input#post_publish_at_1i')
+        output_buffer.should have_tag('input#post_publish_at_2i')
+        output_buffer.should have_tag('input#post_publish_at_3i')
+        output_buffer.should have_tag('input#post_publish_at_1i[@value="2010"]')
+        output_buffer.should have_tag('input#post_publish_at_2i[@value="11"]')
+        output_buffer.should have_tag('input#post_publish_at_3i[@value="7"]')
+      end
+
+      it 'should have an select for hour and minute' do
+        output_buffer.should have_tag('select#post_publish_at_4i')
+        output_buffer.should have_tag('select#post_publish_at_5i')
       end
 
     end
@@ -126,6 +150,26 @@ describe 'time input' do
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
         end
       end
+      
+      it "should not render the label when :labels[:#{field}] is false" do 
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => false }))
+        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
+      
+      it "should not render unsafe HTML when :labels[:#{field}] is false" do 
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => false }))
+        end)
+        output_buffer.should_not include(">")
+      end
+      
     end
   end
 

data/spec/spec_helper.rb

@@ -72,6 +72,17 @@ module FormtasticSpecHelper
     active_model_validator(:numericality, attributes, options)
   end
 
+  class ::MongoPost
+    include MongoMapper::Document if defined?(MongoMapper::Document)
+
+    def id
+    end
+
+    def persisted?
+    end
+  end
+
+
   class ::Post
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
@@ -82,6 +93,7 @@ module FormtasticSpecHelper
     def persisted?
     end
   end
+  
   module ::Namespaced
     class Post
       extend ActiveModel::Naming if defined?(ActiveModel::Naming)
@@ -94,6 +106,7 @@ module FormtasticSpecHelper
       end
     end
   end
+  
   class ::Author
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
@@ -104,10 +117,21 @@ module FormtasticSpecHelper
     def persisted?
     end
   end
+  
+  class ::HashBackedAuthor < Hash
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+    def persisted?; false; end
+    def name
+      'hash backed author'
+    end
+  end
+  
   class ::Continent
     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)
@@ -138,15 +162,15 @@ module FormtasticSpecHelper
 
     # 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_models_path(*args); "/postmodels/1"; end
 
-    def post_path(o); "/posts/1"; end
-    def posts_path; "/posts"; end
-    def new_post_path; "/posts/new"; end
+    def post_path(*args); "/posts/1"; end
+    def posts_path(*args); "/posts"; end
+    def new_post_path(*args); "/posts/new"; end
 
-    def author_path(o); "/authors/1"; end
-    def authors_path; "/authors"; end
-    def new_author_path; "/authors/new"; end
+    def author_path(*args); "/authors/1"; end
+    def authors_path(*args); "/authors"; end
+    def new_author_path(*args); "/authors/new"; end
     
     @fred = ::Author.new
     @fred.stub!(:class).and_return(::Author)
@@ -198,6 +222,8 @@ module FormtasticSpecHelper
     ::Author.stub!(:to_key).and_return(nil)
     ::Author.stub!(:persisted?).and_return(nil)
 
+    @hash_backed_author = HashBackedAuthor.new
+    
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
     @new_post.stub!(:class).and_return(::Post)
@@ -256,7 +282,6 @@ module FormtasticSpecHelper
       when :mongoid_reviewer
         mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
-
     end
     ::Post.stub!(:find).and_return([@freds_post])
     ::Post.stub!(:all).and_return([@freds_post])
@@ -266,6 +291,34 @@ module FormtasticSpecHelper
     ::Post.stub!(:persisted?).and_return(nil)
     ::Post.stub!(:to_ary)
 
+
+    ::MongoPost.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
+    ::MongoPost.stub!(:human_name).and_return('MongoPost')
+    ::MongoPost.stub!(:associations).and_return do |column_name|
+      case column_name
+      when :sub_posts
+        mock('reflection', :options => {:polymorphic => true}, :klass => ::MongoPost, :macro => :has_many)
+      end
+    end
+    ::MongoPost.stub!(:find).and_return([@freds_post])
+    ::MongoPost.stub!(:all).and_return([@freds_post])
+    ::MongoPost.stub!(:where).and_return([@freds_post])
+    ::MongoPost.stub!(:to_key).and_return(nil)
+    ::MongoPost.stub!(:persisted?).and_return(nil)
+    ::MongoPost.stub!(:to_ary)
+    ::MongoPost.stub!(:model_name).and_return( mock(:model_name_mock, :singular => "post", :plural => "posts", :param_key => "post", :route_key => "posts") ) 
+
+    @new_mm_post = mock('mm_post')
+    @new_mm_post.stub!(:class).and_return(::MongoPost)
+    @new_mm_post.stub!(:id).and_return(nil)
+    @new_mm_post.stub!(:new_record?).and_return(true)
+    @new_mm_post.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @new_mm_post.stub!(:title).and_return("Hello World")    
+    @new_mm_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
+    @new_mm_post.stub!(:to_key).and_return(nil)
+    @new_mm_post.stub!(:to_model).and_return(@new_mm_post)
+    @new_mm_post.stub!(:persisted?).and_return(nil)
+
     @mock_file = mock('file')
     Formtastic::FormBuilder.file_methods.each do |method|
       @mock_file.stub!(method).and_return(true)
@@ -350,12 +403,11 @@ end
 
 ::ActiveSupport::Deprecation.silenced = false
 
-
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.before(:all) do
-    DeferredGarbageCollection.start
+    DeferredGarbageCollection.start unless ENV["DEFER_GC"] == "false"
   end
   config.after(:all) do
-    DeferredGarbageCollection.reconsider
+    DeferredGarbageCollection.reconsider unless ENV["DEFER_GC"] == "false"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 977940588
-  prerelease: true
+  hash: 15424093
+  prerelease: 6
   segments: 
   - 2
   - 0
   - 0
-  - rc3
-  version: 2.0.0.rc3
+  - rc
+  - 4
+  version: 2.0.0.rc4
 platform: ruby
 authors: 
 - Justin French
@@ -16,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 +10:00
-default_executable: 
+date: 2011-08-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -152,6 +152,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - .yardopts
 - CHANGELOG
 - Gemfile
@@ -240,6 +241,7 @@ files:
 - spec/helpers/form_helper_spec.rb
 - spec/helpers/input_helper_spec.rb
 - spec/helpers/inputs_helper_spec.rb
+- spec/helpers/reflection_helper_spec.rb
 - spec/helpers/semantic_errors_helper_spec.rb
 - spec/i18n_spec.rb
 - spec/inputs/boolean_input_spec.rb
@@ -273,11 +275,10 @@ files:
 - spec/support/deferred_garbage_collection.rb
 - spec/support/deprecation.rb
 - spec/support/test_environment.rb
-has_rdoc: true
 homepage: http://github.com/justinfrench/formtastic
 licenses: []
 
-post_install_message: "\n  ========================================================================\n  Thanks for installing Formtastic!\n  ------------------------------------------------------------------------\n  You can now (optionally) run the generator to copy a config initializer \n  (and some stylesheets, in Rails 3.0.x) into your application:\n    rails generate formtastic:install\n\n  Find out more and get involved:\n    http://github.com/justinfrench/formtastic\n    http://rdoc.info/github/justinfrench/formtastic/master/frames\n    http://groups.google.com.au/group/formtastic\n    http://twitter.com/formtastic\n  ========================================================================\n  "
+post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -303,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
@@ -317,6 +318,7 @@ test_files:
 - spec/helpers/form_helper_spec.rb
 - spec/helpers/input_helper_spec.rb
 - spec/helpers/inputs_helper_spec.rb
+- spec/helpers/reflection_helper_spec.rb
 - spec/helpers/semantic_errors_helper_spec.rb
 - spec/i18n_spec.rb
 - spec/inputs/boolean_input_spec.rb