formtastic-rails3 0.9.7 → 0.9.10.0

data/spec/label_spec.rb

@@ -6,7 +6,7 @@ describe 'SemanticFormBuilder#label' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 

data/spec/layout_helper_spec.rb

@@ -2,41 +2,30 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe 'LayoutHelper' do
-  
+
   include FormtasticSpecHelper
   include Formtastic::LayoutHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
   end
   
   describe '#formtastic_stylesheet_link_tag' do
     
     before do
-      concat(formtastic_stylesheet_link_tag())
+      @tags = concat(formtastic_stylesheet_link_tag())
     end
     
     it 'should render a link to formtastic.css' do
+      output_buffer.concat(@tags) if Formtastic::Util.rails3?
       output_buffer.should have_tag("link[@href='/stylesheets/formtastic.css']")
     end
     
     it 'should render a link to formtastic_changes.css' do
+      output_buffer.concat(@tags) if Formtastic::Util.rails3?
       output_buffer.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
     end
     
   end
-
-  # FIXME: Rspec issue?
-  def controller
-    mock('controller')
-  end
-
-  # FIXME: Rspec issue?
-  def config
-    returning mock('config') do |config|
-      config.stub!(:assets_dir).and_return('')
-    end
-  end
-
 end
 

data/spec/semantic_errors_spec.rb

@@ -6,7 +6,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     @title_errors = ['must not be blank', 'must be awesome']
     @base_errors = ['base error message', 'nasty error']
@@ -17,7 +17,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
 
   describe 'when there is only one error on base' do
     before do
-      @errors.stub!(:on_base).and_return(@base_error)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -29,7 +29,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
 
   describe 'when there is more than one error on base' do
     before do
-      @errors.stub!(:on_base).and_return(@base_errors)
+      @errors.stub!(:[]).with(:base).and_return(@base_errors)
     end
 
     it 'should render an unordered list' do
@@ -45,7 +45,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
   describe 'when there are errors on title' do
     before do
       @errors.stub!(:[]).with(:title).and_return(@title_errors)
-      @errors.stub!(:on_base).and_return([])
+      @errors.stub!(:[]).with(:base).and_return([])
     end
 
     it 'should render an unordered list' do
@@ -59,7 +59,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
   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)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -74,7 +74,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
   describe 'when there are no errors' do
     before do
       @errors.stub!(:[]).with(:title).and_return(nil)
-      @errors.stub!(:on_base).and_return(nil)
+      @errors.stub!(:[]).with(:base).and_return(nil)
     end
 
     it 'should return nil' do
@@ -86,7 +86,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
 
   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)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list with given class' do

data/spec/semantic_fields_for_spec.rb

@@ -6,7 +6,7 @@ describe 'SemanticFormBuilder#semantic_fields_for' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     @new_post.stub!(:author).and_return(::Author.new)
   end
@@ -29,11 +29,12 @@ describe 'SemanticFormBuilder#semantic_fields_for' do
   
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
-      end
+      end)
     end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should 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"/

data/spec/spec_helper.rb

@@ -1,42 +1,61 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '3.0.0.beta'
-gem 'actionpack', '3.0.0.beta'
-gem 'activemodel', '3.0.0.beta'
+gem 'activesupport', '>=2.3.8'
+gem 'actionpack', '>=2.3.8'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
-require 'active_model'
 
-gem 'rspec', '>= 2.0.0.beta.2'
-gem 'rspec-rails', '>= 2.0.0.beta.2'
+begin
+  gem 'activemodel', '>= 3.0.0.beta'
+  require 'active_model'
+rescue Exception
+end
+
+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'
 
-Rspec.configure do |config|
-  config.include RspecTagMatchers
-  config.include CustomMacros
-  config.mock_with :rspec
+begin
+  Spec::Runner.configure do |config|
+    config.include(RspecTagMatchers)
+    config.include(CustomMacros)
+  end
+rescue
+  require 'rspec/core'
+  Rspec.configure do |config|
+    config.include RspecTagMatchers
+    config.include CustomMacros
+    config.mock_with :rspec
+  end
 end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
+module ActionView
+  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
+  end
+end
 
 module FormtasticSpecHelper
-  include ActionView::Context
+  include ActionPack
+  include ActionView::Context if defined?(ActionView::Context)
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveModelHelper
+  include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
+  include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
   include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
@@ -46,6 +65,14 @@ module FormtasticSpecHelper
   
   include Formtastic::SemanticFormHelper
   
+  def rails3?
+    ActionPack::VERSION::MAJOR > 2
+  end
+
+  def rails2?
+    ActionPack::VERSION::MAJOR == 2
+  end
+  
   def default_input_type(column_type, column_name = :generic_column_name)
     @new_post.stub!(column_name)
     @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => column_type)) unless column_type.nil?
@@ -57,35 +84,44 @@ module FormtasticSpecHelper
     return @default_type
   end
   
+  def active_model_presence_validator(attributes, options = {})
+    presence_validator = mock('ActiveModel::Validations::PresenceValidator', :attributes => attributes, :options => options)
+    presence_validator.stub!(:kind).and_return(:presence)
+    presence_validator
+  end
+  
   class ::Post
-    extend ActiveModel::Naming
-    include ActiveModel::Conversion
-    
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
     def id
     end
+
+    def persisted?
+    end
   end
-  
   module ::Namespaced
     class Post
-      extend ActiveModel::Naming
-      include ActiveModel::Conversion
-      
+      extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+      include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
       def id
       end
+
+      def persisted?
+      end
     end
   end
-  
   class ::Author
-    extend ActiveModel::Naming
-    include ActiveModel::Conversion
-    
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
     def to_label
     end
   end
-  
   class ::Continent
-    extend ActiveModel::Naming
-    include ActiveModel::Conversion    
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
   
   def mock_everything
@@ -107,6 +143,8 @@ module FormtasticSpecHelper
     @fred.stub!(:id).and_return(37)
     @fred.stub!(:new_record?).and_return(false)
     @fred.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @fred.stub!(:to_key).and_return(nil)
+    @fred.stub!(:persisted?).and_return(nil)
 
     @bob = mock('user')
     @bob.stub!(:class).and_return(::Author)
@@ -118,24 +156,29 @@ module FormtasticSpecHelper
     @bob.stub!(:post_ids).and_return([])
     @bob.stub!(:new_record?).and_return(false)
     @bob.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @bob.stub!(:to_key).and_return(nil)
+    @bob.stub!(:persisted?).and_return(nil)
     
     @james = mock('user')
-     @james.stub!(:class).and_return(::Author)
-     @james.stub!(:to_label).and_return('James Shock')
-     @james.stub!(:login).and_return('james')
-     @james.stub!(:id).and_return(75)
-     @james.stub!(:posts).and_return([])
-     @james.stub!(:post_ids).and_return([])
-     @james.stub!(:new_record?).and_return(false)
-     @james.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @james.stub!(:class).and_return(::Author)
+    @james.stub!(:to_label).and_return('James Shock')
+    @james.stub!(:login).and_return('james')
+    @james.stub!(:id).and_return(75)
+    @james.stub!(:posts).and_return([])
+    @james.stub!(:post_ids).and_return([])
+    @james.stub!(:new_record?).and_return(false)
+    @james.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @james.stub!(:to_key).and_return(nil)
+    @james.stub!(:persisted?).and_return(nil)
     
 
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
-    ::Author.stub!(:validators_on).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
     ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
+    ::Author.stub!(:to_key).and_return(nil)
+    ::Author.stub!(:persisted?).and_return(nil)
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
@@ -144,9 +187,12 @@ 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!(:reviewer).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
+    @new_post.stub!(:to_key).and_return(nil)
     @new_post.stub!(:to_model).and_return(@new_post)
+    @new_post.stub!(:persisted?).and_return(nil)
 
     @freds_post = mock('post')
     @freds_post.stub!(:class).and_return(::Post)
@@ -158,18 +204,26 @@ module FormtasticSpecHelper
     @freds_post.stub!(:author_ids).and_return([@fred.id])
     @freds_post.stub!(:new_record?).and_return(false)
     @freds_post.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @freds_post.stub!(:to_key).and_return(nil)
+    @freds_post.stub!(:persisted?).and_return(nil)
     @fred.stub!(:posts).and_return([@freds_post])
     @fred.stub!(:post_ids).and_return([@freds_post.id])
 
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
-    ::Post.stub!(:validators_on).and_return([])
+    ::Post.stub!(:reflect_on_all_validations).and_return([])
+    ::Post.stub!(:reflect_on_validations_for).and_return([]) if defined?(Rspec)
+    ::Post.stub!(:reflections).and_return({})
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
       when :author, :author_status
         mock = mock('reflection', :options => {}, :klass => ::Author, :macro => :belongs_to)
         mock.stub!(:[]).with(:class_name).and_return("Author")
         mock
+      when :reviewer
+        mock = mock('reflection', :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to)
+        mock.stub!(:[]).with(:class_name).and_return("Author")
+        mock
       when :authors
         mock('reflection', :options => {}, :klass => ::Author, :macro => :has_and_belongs_to_many)
       when :sub_posts
@@ -181,6 +235,8 @@ module FormtasticSpecHelper
     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')])
+    ::Post.stub!(:to_key).and_return(nil)
+    ::Post.stub!(:persisted?).and_return(nil)
     
     @new_post.stub!(:title)
     @new_post.stub!(:body)
@@ -191,6 +247,9 @@ module FormtasticSpecHelper
     @new_post.stub!(:time_zone)
     @new_post.stub!(:category_name)
     @new_post.stub!(:allow_comments)
+    @new_post.stub!(:country)
+    @new_post.stub!(:country_subdivision)
+    @new_post.stub!(:country_code)
     @new_post.stub!(:column_for_attribute).with(:meta_description).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 50))
     @new_post.stub!(:column_for_attribute).with(:body).and_return(mock('column', :type => :text))
@@ -198,10 +257,17 @@ module FormtasticSpecHelper
     @new_post.stub!(:column_for_attribute).with(:publish_at).and_return(mock('column', :type => :date))
     @new_post.stub!(:column_for_attribute).with(:time_zone).and_return(mock('column', :type => :string))
     @new_post.stub!(:column_for_attribute).with(:allow_comments).and_return(mock('column', :type => :boolean))
+    @new_post.stub!(:column_for_attribute).with(:author).and_return(mock('column', :type => :integer))
+    @new_post.stub!(:column_for_attribute).with(:country).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:country_subdivision).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:country_code).and_return(mock('column', :type => :string, :limit => 255))
     
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)
 
+    @new_post.stub!(:reviewer).and_return(@fred)
+    @new_post.stub!(:reviewer_id).and_return(@fred.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)

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 10
+  - 0
+  version: 0.9.10.0
 platform: ruby
 authors: 
 - Rodrigo Alvarez
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +01:00
+date: 2010-06-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +26,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
+        - 0beta3
+        version: 3.0.0beta3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,10 +40,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
+        - 0beta3
+        version: 3.0.0beta3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -97,14 +98,12 @@ files:
 - lib/formtastic.rb
 - lib/formtastic/i18n.rb
 - lib/formtastic/layout_helper.rb
+- lib/formtastic/railtie.rb
+- lib/formtastic/util.rb
 - lib/generators/formtastic/form/form_generator.rb
-- lib/generators/formtastic/form/templates/_form.html.erb
-- lib/generators/formtastic/form/templates/_form.html.haml
 - lib/generators/formtastic/install/install_generator.rb
-- lib/generators/formtastic/install/templates/formtastic.css
-- lib/generators/formtastic/install/templates/formtastic.rb
-- lib/generators/formtastic/install/templates/formtastic_changes.css
 - lib/locale/en.yml
+- rails/init.rb
 - spec/buttons_spec.rb
 - spec/commit_button_spec.rb
 - spec/custom_builder_spec.rb
@@ -119,7 +118,6 @@ files:
 - spec/inputs/boolean_input_spec.rb
 - spec/inputs/check_boxes_input_spec.rb
 - spec/inputs/country_input_spec.rb
-- spec/inputs/currency_input_spec.rb
 - spec/inputs/date_input_spec.rb
 - spec/inputs/datetime_input_spec.rb
 - spec/inputs/file_input_spec.rb
@@ -184,7 +182,6 @@ test_files:
 - spec/inputs/boolean_input_spec.rb
 - spec/inputs/check_boxes_input_spec.rb
 - spec/inputs/country_input_spec.rb
-- spec/inputs/currency_input_spec.rb
 - spec/inputs/date_input_spec.rb
 - spec/inputs/datetime_input_spec.rb
 - spec/inputs/file_input_spec.rb