formtastic 1.0.1 → 1.1.0.beta

data/lib/formtastic/i18n.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module Formtastic
   module I18n
     
@@ -7,16 +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}}.{{nested_model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{nested_model}}.{{attribute}}',
-        '{{model}}.{{attribute}}',
-        '{{nested_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/layout_helper.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module Formtastic
   module LayoutHelper
     

data/lib/formtastic/railtie.rb

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

data/lib/formtastic/util.rb

@@ -25,5 +25,12 @@ module Formtastic
       return ActionView::SafeBuffer
     end
 
+    def rails3?
+      version=
+        if defined?(ActionPack::VERSION::MAJOR)
+          ActionPack::VERSION::MAJOR
+        end
+      !version.blank? && version >= 3
+    end
   end
 end

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

@@ -0,0 +1,86 @@
+# coding: utf-8
+module Formtastic
+  class FormGenerator < Rails::Generators::NamedBase
+    desc "Generates formtastic form code based on an existing model. By default the " <<
+         "generated code will be printed out directly in the terminal, and also copied " <<
+         "to clipboard. Can optionally be saved into partial directly."
+
+    argument :name, :type => :string, :required => true, :banner => 'ExistingModelName'
+    argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
+
+    class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
+                 :desc => "Generate HAML instead of ERB"
+
+    class_option :partial, :type => :boolean, :default => false, :group => :formtastic,
+                 :desc => 'Generate a form partial in the model views path, i.e. "_form.html.erb" or "_form.html.haml"'
+
+    class_option :controller, :type => :string, :default => false, :group => :formtastic,
+                 :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
+
+    def self.source_root
+     # 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 create_or_show
+      @attributes = self.columns if @attributes.empty?
+      if options[:partial]
+        empty_directory "app/views/#{controller_path}"
+        template "view__form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
+      else
+        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
+
+        puts "# ---------------------------------------------------------"
+        puts "#  GENERATED FORMTASTIC CODE"
+        puts "# ---------------------------------------------------------"
+        puts
+        puts generated_code || "Nothing could be generated - model exists?"
+        puts
+        puts "# ---------------------------------------------------------"
+        puts "Copied to clipboard - just paste it!" if save_to_clipboard(generated_code)
+      end
+    end
+
+    protected
+
+    IGNORED_COLUMNS = [:updated_at, :created_at].freeze
+
+    def template_type
+      @template_type ||= options[:haml] ? :haml : :erb
+    end
+
+    def controller_path
+      @controller_path ||= if options[:controller]
+        options[:controller].underscore
+      else
+        name.underscore.pluralize
+      end
+    end
+
+    def columns
+      @columns ||= self.name.camelize.constantize.content_columns.reject { |column| IGNORED_COLUMNS.include?(column.name.to_sym) }
+    end
+
+    def save_to_clipboard(data)
+      return unless data
+
+      begin
+        case RUBY_PLATFORM
+        when /win32/
+          require 'win32/clipboard'
+          ::Win32::Clipboard.data = data
+        when /darwin/ # mac
+          `echo "#{data}" | pbcopy`
+        else # linux/unix
+          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
+        end
+      rescue LoadError
+        false
+      else
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# coding: utf-8
+module Formtastic
+  class InstallGenerator < Rails::Generators::Base
+    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
+      # 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
+      "rails generate formtastic:install [options]"
+    end
+
+    def copy_files
+      empty_directory 'config/initializers'
+      template        'formtastic.rb', 'config/initializers/formtastic.rb'
+
+      empty_directory 'public/stylesheets'
+      template        'formtastic.css',         'public/stylesheets/formtastic.css'
+      template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
+    end
+  end
+end

data/rails/init.rb

@@ -1,7 +1,2 @@
 # coding: utf-8
-require 'formtastic'
-require 'formtastic/layout_helper'
-
-ActionView::Base.send :include, Formtastic::SemanticFormHelper
-ActionView::Base.send :include, Formtastic::LayoutHelper
-
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))

data/spec/buttons_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#buttons' do
 
@@ -13,26 +13,31 @@ describe 'SemanticFormBuilder#buttons' do
   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

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#commit_button' do
 
@@ -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,7 +147,7 @@ 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
@@ -144,9 +155,10 @@ describe 'SemanticFormBuilder#commit_button' do
           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
@@ -171,20 +183,22 @@ describe 'SemanticFormBuilder#commit_button' do
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => 'Custom Submit {{model}}'
+                     :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
-           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"][@class~="submit"]})
          end
 
@@ -200,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
@@ -210,7 +225,7 @@ 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
@@ -218,9 +233,10 @@ describe 'SemanticFormBuilder#commit_button' do
           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
@@ -245,21 +261,23 @@ describe 'SemanticFormBuilder#commit_button' do
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => 'Custom Create {{model}}'
+                      :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
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})            
+            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
           end
 
         end
@@ -274,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
@@ -284,7 +303,7 @@ 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
@@ -292,15 +311,17 @@ describe 'SemanticFormBuilder#commit_button' do
           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 => {
@@ -319,20 +340,22 @@ describe 'SemanticFormBuilder#commit_button' do
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => 'Custom Save {{model}}'
+                      :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
-            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"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -345,16 +368,31 @@ describe 'SemanticFormBuilder#commit_button' do
   describe 'when the model is two words' do
     before do
       output_buffer = ''
-      class ::UserPost; def id; end; def self.human_name; "Userpost"; end; end # Rails does crappy human_name
+      class ::UserPost
+        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
+          "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