formtastic-rails3 0.9.7 → 0.9.10.0

data/lib/formtastic/i18n.rb

@@ -6,13 +6,16 @@ module Formtastic
         :required       => 'required',
         :yes            => 'Yes',
         :no             => 'No',
-        :create         => 'Create {{model}}',
-        :update         => 'Update {{model}}'
+        :create         => 'Create %{model}',
+        :update         => 'Update %{model}'
       }.freeze
     SCOPES = [
-        '{{model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{attribute}}',
-        '{{attribute}}'
+        '%{model}.%{nested_model}.%{action}.%{attribute}',
+        '%{model}.%{action}.%{attribute}',
+        '%{model}.%{nested_model}.%{attribute}',
+        '%{model}.%{attribute}',
+        '%{nested_model}.%{attribute}',
+        '%{attribute}'
       ]
       
     class << self

data/lib/formtastic/railtie.rb

@@ -0,0 +1,12 @@
+require 'formtastic'
+require 'formtastic/layout_helper'
+require 'rails'
+
+module Formtastic
+  class Railtie < Rails::Railtie
+    initializer :after_initialize do
+      ActionView::Base.send :include, Formtastic::SemanticFormHelper
+      ActionView::Base.send(:include, Formtastic::LayoutHelper)
+    end
+  end
+end

data/lib/formtastic/util.rb

@@ -0,0 +1,35 @@
+# Adapted from the rails3 compatibility shim in Haml 2.2
+module Formtastic
+  module Util
+    extend self
+    ## Rails XSS Safety
+
+    # Returns the given text, marked as being HTML-safe.
+    # With older versions of the Rails XSS-safety mechanism,
+    # this destructively modifies the HTML-safety of `text`.
+    #
+    # @param text [String]
+    # @return [String] `text`, marked as HTML-safe
+    def html_safe(text)
+      return text if text.nil?
+      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
+      return text.html_safe!
+    end
+
+    def rails_safe_buffer_class
+      # It's important that we check ActiveSupport first,
+      # because in Rails 2.3.6 ActionView::SafeBuffer exists
+      # but is a deprecated proxy object.
+      return ActiveSupport::SafeBuffer if defined?(ActiveSupport::SafeBuffer)
+      return ActionView::SafeBuffer
+    end
+
+    def rails3?
+      version=
+        if defined?(ActionPack::VERSION::MAJOR)
+          ActionPack::VERSION::MAJOR
+        end
+      version >= 3
+    end
+  end
+end

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

@@ -15,7 +15,8 @@ module Formtastic
                  :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
 
     def self.source_root
-      @source_root ||= File.expand_path("../templates", __FILE__)
+     # Set source directory for the templates to the rails2 generator template directory
+     @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'form', 'templates'), File.dirname(__FILE__))
     end
 
     def self.banner
@@ -25,9 +26,9 @@ module Formtastic
     def create_or_show
       if options[:partial]
         empty_directory "app/views/#{controller_path}"
-        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
+        template "view__form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
       else
-        template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
+        template = File.read("#{self.class.source_root}/view__form.html.#{template_type}")
         erb = ERB.new(template, nil, '-')
         generated_code = erb.result(binding).strip rescue nil
 

data/lib/generators/formtastic/install/install_generator.rb

@@ -4,7 +4,8 @@ module Formtastic
     desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
 
     def self.source_root
-      @source_root ||= File.expand_path("../templates", __FILE__)
+      # Set source directory for the templates to the rails2 generator template directory
+      @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'formtastic', 'templates'), File.dirname(__FILE__))
     end
     
     def self.banner

data/rails/init.rb

@@ -0,0 +1,5 @@
+# coding: utf-8
+require File.join(File.dirname(__FILE__), *%w[.. lib formtastic])
+require File.join(File.dirname(__FILE__), *%w[.. lib formtastic layout_helper])
+ActionView::Base.send :include, Formtastic::SemanticFormHelper
+ActionView::Base.send :include, Formtastic::LayoutHelper

data/spec/buttons_spec.rb

@@ -6,33 +6,38 @@ describe 'SemanticFormBuilder#buttons' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
   describe 'with a block' do
     describe 'when no options are provided' do
       before do
-        semantic_form_for(@new_post) do |builder|
-          builder.buttons do
+        @form = semantic_form_for(@new_post) do |builder|
+          buttons = builder.buttons do
             concat('hello')
           end
+          concat(buttons)
         end
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.buttons")
       end
 
       it 'should render an ol inside the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.buttons ol")
       end
 
       it 'should render the contents of the block inside the ol' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.buttons ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form fieldset.buttons legend")
       end
     end
@@ -41,12 +46,13 @@ describe 'SemanticFormBuilder#buttons' do
       before do
         @legend_text = "Advanced options"
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           builder.buttons :name => @legend_text do
           end
         end
       end
       it 'should render a fieldset inside the form' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
     end
@@ -56,12 +62,13 @@ describe 'SemanticFormBuilder#buttons' do
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           builder.buttons :id => @id_option, :class => @class_option do
           end
         end
       end
       it 'should pass the options into the fieldset tag as attributes' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -74,32 +81,38 @@ describe 'SemanticFormBuilder#buttons' do
     describe 'with no args (default buttons)' do
 
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.buttons)
         end
       end
 
       it 'should render a form' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form')
       end
 
       it 'should render a buttons fieldset inside the form' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons')
       end
 
       it 'should not render a legend in the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('form fieldset.buttons legend')
       end
 
       it 'should render an ol in the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons ol')
       end
 
       it 'should render a list item in the ol for each default button' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons ol li', :count => 1)
       end
 
       it 'should render a commit list item for the commit button' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons ol li.commit')
       end
 
@@ -108,12 +121,13 @@ describe 'SemanticFormBuilder#buttons' do
     describe 'with button names as args' do
 
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit))
         end
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit')
       end
@@ -123,21 +137,24 @@ describe 'SemanticFormBuilder#buttons' do
     describe 'with button names as args and an options hash' do
 
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit, :name => "Now click a button", :id => "my-id"))
         end
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit', :count => 1)
       end
 
       it 'should pass the options down to the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.buttons')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.buttons > legend', /Now click a button/)
       end
 

data/spec/commit_button_spec.rb

@@ -6,7 +6,7 @@ describe 'SemanticFormBuilder#commit_button' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
@@ -14,29 +14,33 @@ describe 'SemanticFormBuilder#commit_button' do
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button)
       end
     end
 
     it 'should render a commit li' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit')
     end
 
     it 'should render an input with a type attribute of "submit"' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit input[@type="submit"]')
     end
 
     it 'should render an input with a name attribute of "commit"' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit input[@name="commit"]')
     end
 
     it 'should pass options given in :button_html to the button' do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
       end
 
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
@@ -54,9 +58,10 @@ describe 'SemanticFormBuilder#commit_button' do
     it 'should use the default if set' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :button_html => {}))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -64,9 +69,10 @@ describe 'SemanticFormBuilder#commit_button' do
     it 'should use the value set in options over the default' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o'))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -75,9 +81,10 @@ describe 'SemanticFormBuilder#commit_button' do
     it 'should use the value set in button_html over options' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -90,16 +97,18 @@ describe 'SemanticFormBuilder#commit_button' do
     
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
       end
     end
     
     it "should render the string as the value of the button" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input[@value="a string"]')
     end
     
     it "should deal with the options hash" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input.pretty')
     end
     
@@ -109,12 +118,13 @@ describe 'SemanticFormBuilder#commit_button' do
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button(:button_html => { :class => "pretty"}))
       end
     end
     
     it "should deal with the options hash" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input.pretty')
     end
     
@@ -126,9 +136,10 @@ describe 'SemanticFormBuilder#commit_button' do
     describe 'when used without object' do
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          semantic_form_for(:post, :url => 'http://example.com') do |builder|
+          form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
             concat(builder.commit_button("Click!"))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -136,17 +147,18 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit %{model}'}
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => nil}
+            ::I18n.backend.reload!
           end
           
           it 'should render an input with default I18n-localized label (fallback)' do
-            semantic_form_for(:post, :url => 'http://example.com') do |builder|
+            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -157,33 +169,36 @@ describe 'SemanticFormBuilder#commit_button' do
              :formtastic => {
                  :actions => {
                    :submit => 'Custom Submit',
-                   :post => {
-                     :submit => 'Custom Submit {{model}}'
-                    }
                   }
                }
            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
          end
 
-         it 'should render an input with localized label (I18n)' do
-           semantic_form_for(:post, :url => 'http://example.com') do |builder|
-             concat(builder.commit_button)
-           end
-           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         after do
+           ::I18n.backend.reload!
          end
 
-         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+         it 'should render an input with localized label (I18n)' do
            ::I18n.backend.store_translations :en,
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => nil
+                     :submit => 'Custom Submit %{model}'
                     }
                   }
                }
-           semantic_form_for(:post, :url => 'http://example.com') do |builder|
+           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+             concat(builder.commit_button)
+           end
+           output_buffer.concat(form) if Formtastic::Util.rails3?
+           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         end
+
+         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
+           output_buffer.concat(form) if Formtastic::Util.rails3?
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -199,9 +214,10 @@ describe 'SemanticFormBuilder#commit_button' do
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -209,17 +225,18 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create %{model}'}
           end
 
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -230,40 +247,37 @@ describe 'SemanticFormBuilder#commit_button' do
               :formtastic => {
                   :actions => {
                     :create => 'Custom Create',
-                    :post => {
-                      :create => 'Custom Create {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => nil
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
-          end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => nil
+                      :create => 'Custom Create %{model}'
                      }
                    }
                 }
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            form = semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
-            ::I18n.backend.store_translations :en, :formtastic => nil
-            
           end
 
         end
@@ -278,9 +292,10 @@ describe 'SemanticFormBuilder#commit_button' do
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -288,54 +303,59 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save %{model}'}
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
 
         describe 'when I18n-localized label is provided' do
           before do
+            ::I18n.backend.reload!
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :update => 'Custom Save',
-                    :post => {
-                      :update => 'Custom Save {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
 
-          it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          after do
+            ::I18n.backend.reload!
           end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+          
+          it 'should render an input with localized label (I18n)' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => nil
+                      :update => 'Custom Save %{model}'
                      }
                    }
                 }
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            form = semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -348,27 +368,31 @@ describe 'SemanticFormBuilder#commit_button' do
   describe 'when the model is two words' do
     before do
       output_buffer = ''
-
       class ::UserPost
-        extend ActiveModel::Naming
-        
+        extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+        include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
         def id
         end
         
+        def persisted?
+        end
+        
+        # Rails does crappy human_name
         def self.human_name
-          "Userpost" # Rails does crappy human_name
+          "User post"
         end
       end
-      
       @new_user_post = ::UserPost.new
       
       @new_user_post.stub!(:new_record?).and_return(true)
-      semantic_form_for(@new_user_post, :url => '') do |builder|
+      @form = semantic_form_for(@new_user_post, :url => '') do |builder|
         concat(builder.commit_button())
       end
     end
     
     it "should render the string as the value of the button" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end