formtastic-rails3 0.9.7 → 0.9.10.0

data/README.textile

@@ -173,7 +173,7 @@ If you want to customize the label text, or render some hint text below the fiel
   <% end %>
 </pre>
 
-Nested forms (Rails 2.3) are also supported. You can do it in the Rails way:
+Nested forms (Rails 2.3) are also supported (don't forget your models need to be setup correctly with accepts_nested_attributes_for – search the Rails docs). You can do it in the Rails way:
 
 <pre>
   <% semantic_form_for @post do |form| %>
@@ -206,7 +206,7 @@ When working in has many association, you can even supply @"%i"@ in your fieldse
 </pre>
 
 
-Customize HTML attributes for any input using the @:input_html@ option. Typically his is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
+Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
 
 <pre>
   <% semantic_form_for @post do |form| %>
@@ -239,6 +239,23 @@ Customize the HTML attributes for the @<li>@ wrapper around every input with the
   <% end %>
 </pre>
 
+Many inputs provide a collection of options to choose from (like @:select@, @:radio@, @:check_boxes@, @:boolean@). In many cases, Formtastic can find choices through the model associations, but if you want to use your own set of choices, the @:collection@ option is what you want.  You can pass in an Array of objects, an array of Strings, a Hash... Throw almost anything at it! Examples:
+
+<pre>
+  f.input :authors, :as => :check_boxes, :collection => User.find(:all, :order => "last_name ASC")
+  f.input :authors, :as => :check_boxes, :collection => current_user.company.users.active
+  f.input :authors, :as => :check_boxes, :collection => [@justin, @kate]
+  f.input :authors, :as => :check_boxes, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+  f.input :author,  :as => :select,      :collection => Author.find(:all)
+  f.input :author,  :as => :select,      :collection => { @justin.name => @justin.id, @kate.name => @kate.id }
+  f.input :author,  :as => :select,      :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+  f.input :author,  :as => :radio,       :collection => User.find(:all)
+  f.input :author,  :as => :radio,       :collection => [@justin, @kate]
+  f.input :author,  :as => :radio,       :collection => { @justin.name => @justin.id, @kate.name => @kate.id }
+  f.input :author,  :as => :radio,       :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+  f.input :admin,   :as => :radio,       :collection => ["Yes!", "No"]
+</pre>
+
 
 h2. The Available Inputs
 
@@ -258,10 +275,10 @@ The Formtastic input types:
 * @:numeric@ - a text field (just like string). Default for  column types: @:integer@, @:float@, and @:decimal@.
 * @:file@ - a file field. Default for file-attachment attributes matching: "paperclip":http://github.com/thoughtbot/paperclip or "attachment_fu":http://github.com/technoweenie/attachment_fu.
 * @:country@ - a select menu of country names. Default for column types: :string with name @"country"@ - requires a *country_select* plugin to be installed.
-* @:currency@ - a select menu of currencies. Default for column types: :string with name @"currency"@ - requires a *currency_select* plugin to be installed.
 * @:hidden@ - a hidden field. Creates a hidden field (added for compatibility).
 
-The documentation is pretty good for each of these (what it does, what the output is, what the options are, etc.) so go check it out.
+The comments in the code are pretty good for each of these (what it does, what the output is, what the options are, etc.) so go check it out.
+
 
 h2. Delegation for label lookups
 
@@ -320,7 +337,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
           title: "Choose a good title for you post."
           body: "Write something inspiring here."
       actions:
-        create: "Create my {{model}}"
+        create: "Create my %{model}"
         update: "Save changes"
         dummie: "Launch!"
 </pre>
@@ -337,7 +354,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button %>     # => "Create my {{model}}"
+      <%= form.commit_button %>     # => "Create my %{model}"
     <% end %>
   <% end %>
 </pre>
@@ -514,7 +531,6 @@ There are none, but...
 
 * if you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin is installed, you won't have to specify the @:required@ option (it checks the validations on the model instead).
 * if you want to use the @:country@ input, you'll need to install the "iso-3166-country-select plugin":http://github.com/rails/iso-3166-country-select (or any other country_select plugin with the same API).
-* if you want to use the @:currency@ input, you'll need to install the "currency_select plugin":http://github.com/gavinlaking/currency_select (or any other currency_select plugin with the same API).
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 
 

data/Rakefile

@@ -1,13 +1,17 @@
 # coding: utf-8
+require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
 
 begin
+  gem 'rspec', '>= 1.2.6'
+  gem 'rspec-rails', '>= 1.2.6'
+  require 'spec'
   require 'spec/rake/spectask'
 rescue LoadError
   begin
-    gem 'rspec-rails', '>= 1.0.0'
-    require 'spec/rake/spectask'
+    require 'rspec/core/rake_task.rb'
+    require 'rspec/core/version'
   rescue LoadError
     puts "[formtastic:] RSpec - or one of it's dependencies - is not available. Install it with: sudo gem install rspec-rails"
   end
@@ -55,8 +59,8 @@ begin
     
     # Runtime dependencies: When installing Formtastic these will be checked if they are installed.
     # Will be offered to install these if they are not already installed.
-    s.add_dependency 'activesupport', '>= 2.3.0'
-    s.add_dependency 'actionpack', '>= 2.3.0'
+    s.add_dependency 'activesupport', '>= 3.0.0beta3'
+    s.add_dependency 'actionpack', '>= 3.0.0beta3'
     
     # Development dependencies. Not installed by default.
     # Install with: sudo gem install formtastic --development
@@ -101,3 +105,22 @@ if defined?(Spec)
     t.rcov_opts = ['--exclude', 'spec,Library']
   end
 end
+
+if defined?(Rspec)
+  desc 'Test the formtastic plugin.'
+  Rspec::Core::RakeTask.new('spec') do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+  end
+
+  desc 'Test the formtastic plugin with specdoc formatting and colors'
+  Rspec::Core::RakeTask.new('specdoc') do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+  end
+
+  desc "Run all examples with RCov"
+  Rspec::Core::RakeTask.new('examples_with_rcov') do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec,Library']
+  end
+end

data/generators/formtastic/templates/formtastic.css

@@ -19,7 +19,7 @@ form.formtastic ol, form.formtastic ul { list-style:none; }
 form.formtastic abbr, form.formtastic acronym { border:0; font-variant:normal; }
 form.formtastic input, form.formtastic textarea, form.formtastic select { font-family:inherit; font-size:inherit; font-weight:inherit; }
 form.formtastic input, form.formtastic textarea, form.formtastic select { font-size:100%; }
-form.formtastic legend { color:#000; }
+form.formtastic legend { white-space:normal; color:#000; }
 
 
 /* SEMANTIC ERRORS
@@ -68,7 +68,7 @@ form.formtastic fieldset > ol > li > li label input { line-height:100%; vertical
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li fieldset { position:relative; }
-form.formtastic fieldset > ol > li fieldset legend { position:absolute; width:25%; padding-top:0.1em; }
+form.formtastic fieldset > ol > li fieldset legend { position:absolute; width:95%; padding-top:0.1em; left: 0px; }
 form.formtastic fieldset > ol > li fieldset legend span { position:absolute; }
 form.formtastic fieldset > ol > li fieldset legend.label label { position:absolute; }
 form.formtastic fieldset > ol > li fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
@@ -89,9 +89,9 @@ form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; displa
 
 /* STRING & NUMERIC OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.string input { width:74%; }
-form.formtastic fieldset > ol > li.password input { width:74%; }
-form.formtastic fieldset > ol > li.numeric input { width:74%; }
+form.formtastic fieldset > ol > li.string input { max-width:74%; }
+form.formtastic fieldset > ol > li.password input { max-width: 13em; }
+form.formtastic fieldset > ol > li.numeric input { max-width:74%; }
 
 
 /* TEXTAREA OVERRIDES
@@ -100,9 +100,11 @@ form.formtastic fieldset > ol > li.text textarea { width:74%; }
 
 
 /* HIDDEN OVERRIDES
+The dual declarations are required because of our clearfix display hack on the LIs, which is more
+specific than the more general rule below. TODO: Revist the clearing hack and this rule.
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.hidden { display:none; }
-
+form.formtastic fieldset ol li.hidden,
+html[xmlns] form.formtastic fieldset ol li.hidden { display:none; }
 
 /* BOOLEAN OVERRIDES
 --------------------------------------------------------------------------------------------------*/

data/generators/formtastic/templates/formtastic.rb

@@ -28,7 +28,7 @@
 # Formtastic::SemanticFormBuilder.inline_errors = :sentence
 
 # Set the method to call on label text to transform or format it for human-friendly
-# reading when formtastic is user without object. Defaults to :humanize.
+# reading when formtastic is used without object. Defaults to :humanize.
 # Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
 # Set the array of methods to try calling on parent objects in :select and :radio inputs

data/generators/formtastic/templates/formtastic_changes.css

@@ -7,4 +7,8 @@ For example, to make the inline hint paragraphs a little darker in color than th
 
 form.formtastic fieldset > ol > li p.inline-hints { color:#333; }
 
+HINT:
+The following style may be *conditionally* included for improved support on older versions of IE(<8)
+form.formtastic fieldset ol li fieldset legend { margin-left: -6px;}
+
 --------------------------------------------------------------------------------------------------*/

data/lib/formtastic.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
+require File.join(File.dirname(__FILE__), *%w[formtastic util])
+require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
 
 module Formtastic #:nodoc:
 
@@ -9,7 +11,7 @@ module Formtastic #:nodoc:
     @@default_text_area_height = 20
     @@all_fields_required_by_default = true
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
+    @@required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize
@@ -17,13 +19,12 @@ module Formtastic #:nodoc:
     @@inline_order = [ :input, :hints, :errors ]
     @@file_methods = [ :file?, :public_filename, :filename ]
     @@priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
-    @@priority_currencies = ["US Dollar", "Euro"]
     @@i18n_lookups_by_default = false
-    @@default_commit_button_accesskey = nil
+    @@default_commit_button_accesskey = nil 
 
     cattr_accessor :default_text_field_size, :default_text_area_height, :all_fields_required_by_default, :include_blank_for_select_by_default,
                    :required_string, :optional_string, :inline_errors, :label_str_method, :collection_label_methods,
-                   :inline_order, :file_methods, :priority_countries, :priority_currencies, :i18n_lookups_by_default, :default_commit_button_accesskey
+                   :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :default_commit_button_accesskey 
 
     RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
@@ -77,6 +78,13 @@ module Formtastic #:nodoc:
     #   <% end %>
     #
     def input(method, options = {})
+      if options.key?(:selected) || options.key?(:checked) || options.key?(:default)
+        ::ActiveSupport::Deprecation.warn(
+          "The :selected, :checked (and :default) options are deprecated in Formtastic and will be removed from 1.0. " <<
+          "Please set default values in your models (using an after_initialize callback) or in your controller set-up. " <<
+          "See http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html for more information.", caller)
+      end
+      
       options[:required] = method_required?(method) unless options.key?(:required)
       options[:as]     ||= default_input_type(method, options)
 
@@ -93,13 +101,13 @@ module Formtastic #:nodoc:
       end
 
       input_parts = @@inline_order.dup
-      input_parts.delete(:errors) if options[:as] == :hidden
+      input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
 
       list_item_content = input_parts.map do |type|
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
-      return template.content_tag(:li, list_item_content, wrapper_html)
+      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
     end
 
     # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -253,7 +261,7 @@ module Formtastic #:nodoc:
       html_options = args.extract_options!
       html_options[:class] ||= "inputs"
       html_options[:name] = title
-
+      
       if html_options[:for] # Nested form
         inputs_for_nested_attributes(*(args << html_options), &block)
       elsif block_given?
@@ -268,7 +276,7 @@ module Formtastic #:nodoc:
         legend = args.shift if args.first.is_a?(::String)
         contents = args.collect { |method| input(method.to_sym) }
         args.unshift(legend) if legend.present?
-
+        
         field_set_and_list_wrapping(*((args << html_options) << contents))
       end
     end
@@ -319,10 +327,14 @@ module Formtastic #:nodoc:
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost") 
         # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
         # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
-        object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
-        crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
-        decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
-        object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
+        if @object.class.model_name.respond_to?(:human)
+          object_name = @object.class.model_name.human
+        else
+          object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
+          crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
+          decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
+          object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
+        end
       else
         key = :submit
         object_name = @object_name.to_s.send(@@label_str_method)
@@ -335,8 +347,8 @@ module Formtastic #:nodoc:
       button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
       element_class = ['commit', options.delete(:class)].compact.join(' ') # TODO: Add class reflecting on form action.
       accesskey = (options.delete(:accesskey) || @@default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
-      button_html = button_html.merge(:accesskey => accesskey) if accesskey
-      template.content_tag(:li, self.submit(text, button_html), :class => element_class)
+      button_html = button_html.merge(:accesskey => accesskey) if accesskey  
+      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), :class => element_class)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -393,11 +405,15 @@ module Formtastic #:nodoc:
         text = options_or_text
         options ||= {}
       end
+
       text = localized_string(method, text, :label) || humanized_attribute_name(method)
       text += required_or_optional_string(options.delete(:required))
+      text = Formtastic::Util.html_safe(text)
 
       # special case for boolean (checkbox) labels, which have a nested input
-      text = (options.delete(:label_prefix_for_nested_input) || "") + text
+      if options.key?(:label_prefix_for_nested_input)
+        text = options.delete(:label_prefix_for_nested_input) + text
+      end
 
       input_name = options.delete(:input_name) || method
       super(input_name, text, options)
@@ -416,8 +432,10 @@ module Formtastic #:nodoc:
     #
     def inline_errors_for(method, options = nil) #:nodoc:
       if render_inline_errors?
-        errors = @object.errors[method.to_sym]
-        send(:"error_#{@@inline_errors}", [*errors]) if errors.present?
+        errors = [@object.errors[method.to_sym]]
+        errors << [@object.errors[association_primary_key(method)]] if association_macro_for_method(method) == :belongs_to
+        errors = errors.flatten.compact.uniq
+        send(:"error_#{@@inline_errors}", [*errors]) if errors.any?
       else
         nil
       end
@@ -440,13 +458,13 @@ module Formtastic #:nodoc:
         errors = Array(@object.errors[method.to_sym]).to_sentence
         errors.present? ? array << [attribute, errors].join(" ") : array ||= []
       end
-      full_errors << @object.errors.on_base
+      full_errors << @object.errors[:base]
       full_errors.flatten!
       full_errors.compact!
       return nil if full_errors.blank?
       html_options[:class] ||= "errors"
       template.content_tag(:ul, html_options) do
-        full_errors.map { |error| template.content_tag(:li, error) }.join
+        Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
       end
     end
 
@@ -477,6 +495,18 @@ module Formtastic #:nodoc:
           []
         end
       end
+      
+      # Returns nil, or a symbol like :belongs_to or :has_many
+      def association_macro_for_method(method) #:nodoc:
+        reflection = self.reflection_for(method)
+        reflection.macro if reflection
+      end
+      
+      def association_primary_key(method)
+        reflection = self.reflection_for(method)
+        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
+        :"#{method}_id"
+      end
 
       # Prepare options to be sent to label
       #
@@ -498,9 +528,9 @@ module Formtastic #:nodoc:
           raise ArgumentError, 'You gave :for option with a block to inputs method, ' <<
                                'but the block does not accept any argument.' if block.arity <= 0
 
-          proc { |f| f.inputs(*args){ block.call(f) } }
+          proc { |f| return f.inputs(*args){ block.call(f) } }
         else
-          proc { |f| f.inputs(*args) }
+          proc { |f| return f.inputs(*args) }
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
@@ -519,23 +549,31 @@ module Formtastic #:nodoc:
       # * if the :required option was provided in the options hash, the true/false value will be
       #   returned immediately, allowing the view to override any guesswork that follows:
       #
-      # * if the :required option isn't provided in the options hash, true is returned if the
-      #   presence macro has been used in the class for this attribute, or false otherwise.
+      # * if the :required option isn't provided in the options hash, and the ValidationReflection
+      #   plugin is installed (http://github.com/redinger/validation_reflection), or the object is
+      #   an ActiveModel, true is returned
+      #   if the validates_presence_of macro has been used in the class for this attribute, or false
+      #   otherwise.
       #
-      # * if the :required option isn't provided, and the plugin isn't available, the value of the
+      # * if the :required option isn't provided, and validates_presence_of can't be determined, the
       #   configuration option @@all_fields_required_by_default is used.
       #
       def method_required?(attribute) #:nodoc:
-        if @object && @object.class.respond_to?(:validators_on)
+        if @object && @object.class.respond_to?(:reflect_on_validations_for)
           attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
 
-          @object.class.validators_on(attribute_sym).any? do |validation|
-            validation.kind == :presence &&
-            validation.attributes.include?(attribute_sym) &&
+          @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
+            validation.macro == :validates_presence_of &&
+            validation.name == attribute_sym &&
             (validation.options.present? ? options_require_validation?(validation.options) : true)
           end
         else
-          @@all_fields_required_by_default
+          if @object && @object.class.respond_to?(:validators_on)
+            attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
+            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
+          else
+            @@all_fields_required_by_default
+          end
         end
       end
 
@@ -639,9 +677,9 @@ module Formtastic #:nodoc:
       #   </select>
       #
       #
-      # You can customize the options available in the select by passing in a collection (an Array or
-      # Hash) through the :collection option.  If not provided, the choices are found by inferring the
-      # parent's class name from the method name and simply calling find(:all) on it
+      # You can customize the options available in the select by passing in a collection (an Array or 
+      # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
+      # parent's class name from the method name and simply calling find(:all) on it 
       # (VehicleOwner.find(:all) in the example above).
       #
       # Examples:
@@ -673,9 +711,9 @@ module Formtastic #:nodoc:
       #   f.input :author, :value_method => Proc.new { |a| "author_#{a.login}" }
       #
       # You can pre-select a specific option value by passing in the :selected option.
-      #
+      # 
       # Examples:
-      #
+      #  
       #   f.input :author, :selected => current_user.id
       #   f.input :author, :value_method => :login, :selected => current_user.login
       #   f.input :authors, :value_method => :login, :selected => Author.most_popular.collect(&:id)
@@ -691,14 +729,14 @@ module Formtastic #:nodoc:
       # a prompt with the :prompt option, or disable the blank option with :include_blank => false.
       #
       #
-      # You can group the options in optgroup elements by passing the :group_by option
+      # You can group the options in optgroup elements by passing the :group_by option 
       # (Note: only tested for belongs_to relations)
-      #
+      # 
       # Examples:
       #
       #   f.input :author, :group_by => :continent
-      #
-      # All the other options should work as expected. If you want to call a custom method on the
+      # 
+      # All the other options should work as expected. If you want to call a custom method on the 
       # group item. You can include the option:group_label_method
       # Examples:
       #
@@ -720,7 +758,7 @@ module Formtastic #:nodoc:
         input_name = generate_association_input_name(method)
 
         select_html = if options[:group_by]
-          # The grouped_options_select is a bit counter intuitive and not optimised (mostly due to ActiveRecord).
+          # The grouped_options_select is a bit counter intuitive and not optimised (mostly due to ActiveRecord). 
           # The formtastic user however shouldn't notice this too much.
           raw_collection = find_raw_collection_for_column(method, options.reverse_merge(:find_options => { :include => options[:group_by] }))
           label, value = detect_label_and_value_method!(raw_collection)
@@ -732,7 +770,7 @@ module Formtastic #:nodoc:
           # Here comes the monster with 8 arguments
           self.grouped_collection_select(input_name, group_collection,
                                          group_association, group_label_method,
-                                         value, label,
+                                         value, label, 
                                          strip_formtastic_options(options), html_options)
         else
           collection = find_collection_for_column(method, options)
@@ -754,9 +792,9 @@ module Formtastic #:nodoc:
       # You can pre-select a specific option value by passing in the :selected option.
       # Note: Right now only works if the form object attribute value is not set (nil),
       # because of how the core helper is implemented.
-      #
+      # 
       # Examples:
-      #
+      #  
       #   f.input :my_favorite_time_zone, :as => :time_zone, :selected => 'Singapore'
       #
       def time_zone_input(method, options)
@@ -790,7 +828,7 @@ module Formtastic #:nodoc:
       #     </ol>
       #   </fieldset>
       #
-      # You can customize the choices available in the radio button set by passing in a collection (an Array or
+      # You can customize the choices available in the radio button set by passing in a collection (an Array or 
       # Hash) through the :collection option.  If not provided, the choices are found by reflecting on the association
       # (Author.find(:all) in the example above).
       #
@@ -820,7 +858,7 @@ module Formtastic #:nodoc:
       #   f.input :author, :as => :radio, :value_method => :full_name
       #   f.input :author, :as => :radio, :value_method => :login
       #   f.input :author, :as => :radio, :value_method => Proc.new { |a| "author_#{a.login}" }
-      #
+      # 
       # You can force a particular radio button in the collection to be checked with the :selected option.
       #
       # Examples:
@@ -828,7 +866,7 @@ module Formtastic #:nodoc:
       #   f.input :subscribe_to_newsletter, :as => :radio, :selected => true
       #   f.input :subscribe_to_newsletter, :as => :radio, :collection => ["Yeah!", "Nope!"], :selected => "Nope!"
       #
-      # Finally, you can set :value_as_class => true if you want the li wrapper around each radio
+      # Finally, you can set :value_as_class => true if you want the li wrapper around each radio 
       # button / label combination to contain a class with the value of the radio button (useful for
       # applying specific CSS or Javascript to a particular radio button).
       #
@@ -851,12 +889,12 @@ module Formtastic #:nodoc:
           html_options[:checked] = selected_value == value if selected_option_is_present
 
           li_content = template.content_tag(:label,
-            "#{self.radio_button(input_name, value, html_options)} #{label}",
+            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -870,14 +908,14 @@ module Formtastic #:nodoc:
       # See date_or_datetime_input for a more detailed output example.
       #
       # You can pre-select a specific option value by passing in the :selected option.
-      #
+      # 
       # Examples:
-      #
+      # 
       #   f.input :created_at, :as => :date, :selected => 1.day.ago
       #   f.input :created_at, :as => :date, :selected => nil   # override any defaults: select none
       #   f.input :created_at, :as => :date, :labels => { :year => "Year", :month => "Month", :day => "Day" }
       #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
+      # Some of Rails' options for select_date are supported, but not everything yet, see 
       # documentation of date_or_datetime_input() for more information.
       def date_input(method, options)
         options = set_include_blank(options)
@@ -891,15 +929,15 @@ module Formtastic #:nodoc:
       # text as value.  See date_or_datetime_input for a more detailed output example.
       #
       # You can pre-select a specific option value by passing in the :selected option.
-      #
+      # 
       # Examples:
-      #
+      # 
       #   f.input :created_at, :as => :datetime, :selected => 1.day.ago
       #   f.input :created_at, :as => :datetime, :selected => nil   # override any defaults: select none
       #   f.input :created_at, :as => :date, :labels => { :year => "Year", :month => "Month", :day => "Day",
       #                                                   :hour => "Hour", :minute => "Minute" }
       #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
+      # Some of Rails' options for select_date are supported, but not everything yet, see 
       # documentation of date_or_datetime_input() for more information.
       def datetime_input(method, options)
         options = set_include_blank(options)
@@ -913,22 +951,22 @@ module Formtastic #:nodoc:
       # See date_or_datetime_input for a more detailed output example.
       #
       # You can pre-select a specific option value by passing in the :selected option.
-      #
+      # 
       # Examples:
-      #
+      # 
       #   f.input :created_at, :as => :time, :selected => 1.hour.ago
       #   f.input :created_at, :as => :time, :selected => nil   # override any defaults: select none
       #   f.input :created_at, :as => :date, :labels => { :hour => "Hour", :minute => "Minute" }
       #
-      # Some of Rails' options for select_time are supported, but not everything yet, see
+      # Some of Rails' options for select_time are supported, but not everything yet, see 
       # documentation of date_or_datetime_input() for more information.
       def time_input(method, options)
         options = set_include_blank(options)
         date_or_datetime_input(method, options.merge(:discard_year => true, :discard_month => true, :discard_day => true))
       end
-
-      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
-      # legend (for what would normally be considered the label), and an ordered list of list items
+      
+      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a 
+      # legend (for what would normally be considered the label), and an ordered list of list items 
       # for year, month, day, hour, etc, each containing a label and a select.  Example:
       #
       # <fieldset>
@@ -974,11 +1012,6 @@ module Formtastic #:nodoc:
       #   * @:include_blank => true@
       #   * @:labels => {}@
       def date_or_datetime_input(method, options)
-        if options.key?(:selected)
-          ::ActiveSupport::Deprecation.warn(":selected is deprecated (and may still have changed behavior) in #{options[:as]} inputs, use :default instead, see commit 09fc6b4 and issue #152 on github.com/justinfrench/formtastic")
-          options[:default] = options[:selected]
-        end
-        
         position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
         i18n_date_order = ::I18n.t(:order, :scope => [:date])
         i18n_date_order = nil unless i18n_date_order.is_a?(Array)
@@ -986,13 +1019,13 @@ module Formtastic #:nodoc:
         labels   = options.delete(:labels) || {}
 
         time_inputs = [:hour, :minute]
-        time_inputs << [:second] if options[:include_seconds]
+        time_inputs << :second if options[:include_seconds]
 
         list_items_capture = ""
         hidden_fields_capture = ""
 
-        datetime = options.key?(:default) ? options[:default] : Time.now # can't do an || because nil is an important value
-        datetime = @object.send(method) if @object && @object.send(method) # object trumps :default
+        datetime = options[:selected]
+        datetime = @object.send(method) if @object && @object.send(method) # object value trumps :selected value
 
         html_options = options.delete(:input_html) || {}
         input_ids    = []
@@ -1010,10 +1043,10 @@ module Formtastic #:nodoc:
             opts = strip_formtastic_options(options).merge(:prefix => @object_name, :field_name => field_name, :default => datetime)
             item_label_text = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
 
-            list_items_capture << template.content_tag(:li, [
-                !item_label_text.blank? ? template.content_tag(:label, item_label_text, :for => input_id) : "",
+            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
                 template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join("")
+              ].join(""))
             )
           end
         end
@@ -1083,15 +1116,15 @@ module Formtastic #:nodoc:
       #   f.input :author, :as => :check_boxes, :value_method => Proc.new { |a| "author_#{a.login}" }
       #
       # You can pre-select/check a specific checkbox value by passing in the :selected option (alias :checked works as well).
-      #
+      # 
       # Examples:
-      #
+      #  
       #   f.input :authors, :as => :check_boxes, :selected => @justin
       #   f.input :authors, :as => :check_boxes, :selected => Author.most_popular.collect(&:id)
       #   f.input :authors, :as => :check_boxes, :selected => nil   # override any defaults: select none
       #
-      # Finally, you can set :value_as_class => true if you want the li wrapper around each checkbox / label
-      # combination to contain a class with the value of the radio button (useful for applying specific
+      # Finally, you can set :value_as_class => true if you want the li wrapper around each checkbox / label 
+      # combination to contain a class with the value of the radio button (useful for applying specific 
       # CSS or Javascript to a particular checkbox).
       #
       def check_boxes_input(method, options)
@@ -1108,6 +1141,9 @@ module Formtastic #:nodoc:
         selected_values = (options.key?(:checked) ? options[:checked] : options[:selected]) if selected_option_is_present
         selected_values  = [*selected_values].compact
 
+        disabled_option_is_present = options.key?(:disabled)
+        disabled_values = [*options[:disabled]] if disabled_option_is_present
+
         list_item_content = collection.map do |c|
           label = c.is_a?(Array) ? c.first : c
           value = c.is_a?(Array) ? c.last : c
@@ -1115,28 +1151,29 @@ module Formtastic #:nodoc:
           input_ids << input_id
 
           html_options[:checked] = selected_values.include?(value) if selected_option_is_present
+          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
+            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
       end
 
-      # Outputs a country select input, wrapping around a regular country_select helper.
+      # Outputs a country select input, wrapping around a regular country_select helper. 
       # Rails doesn't come with a country_select helper by default any more, so you'll need to install
       # the "official" plugin, or, if you wish, any other country_select plugin that behaves in the
       # same way.
       #
       # The Rails plugin iso-3166-country-select plugin can be found "here":http://github.com/rails/iso-3166-country-select.
       #
-      # By default, Formtastic includes a handfull of english-speaking countries as "priority counties",
+      # By default, Formtastic includes a handfull of english-speaking countries as "priority counties", 
       # which you can change to suit your market and user base (see README for more info on config).
       #
       # Examples:
@@ -1145,7 +1182,7 @@ module Formtastic #:nodoc:
       #
       def country_input(method, options)
         raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless self.respond_to?(:country_select)
-
+      
         html_options = options.delete(:input_html) || {}
         priority_countries = options.delete(:priority_countries) || @@priority_countries
 
@@ -1153,34 +1190,14 @@ module Formtastic #:nodoc:
         self.country_select(method, priority_countries, strip_formtastic_options(options), html_options)
       end
 
-      # Outputs a currency select input, wrapping around a regular curency_select helper.
-      # You need to install the currency_select plugin "here":http://github.com/gavinlaking/currency_select
-      #
-      # By default, Formtastic includes a handfull of common currencies as "priority currencies",
-      # which you can change to suit your market and user base (see README for more info on config).
-      #
-      # Examples:
-      #   f.input :ticket_currency, :as => :currency # use Formtastic::SemanticFormBuilder.priority_curencies array for the priority currencies
-      #   f.input :ticket_currency, :as => :currency, :priority_currencies => /US Dollar/ # set your own
-      #
-     def currency_input(method, options)
-       raise "To use the :currency input, please install the currency_select plugin http://github.com/gavinlaking/currency_select" unless self.respond_to?(:currency_select)
-
-       html_options = options.delete(:input_html) || {}
-       priority_currencies = options.delete(:priority_currencies) || @@priority_currencies
-
-       self.label(method, options_for_label(options)) <<
-       self.currency_select(method, priority_currencies, strip_formtastic_options(options), html_options)
-     end
-
       # Outputs a label containing a checkbox and the label text. The label defaults
       # to the column name (method name) and can be altered with the :label option.
       # :checked_value and :unchecked_value options are also available.
       #
       # You can pre-select/check the boolean checkbox by passing in the :selected option (alias :checked works as well).
-      #
+      # 
       # Examples:
-      #
+      #  
       #   f.input :allow_comments, :as => :boolean, :selected => true   # override any default value: selected/checked
       #
       def boolean_input(method, options)
@@ -1208,13 +1225,13 @@ module Formtastic #:nodoc:
       def inline_hints_for(method, options) #:nodoc:
         options[:hint] = localized_string(method, options[:hint], :hint)
         return if options[:hint].blank?
-        template.content_tag(:p, options[:hint], :class => 'inline-hints')
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => 'inline-hints')
       end
 
       # Creates an error sentence by calling to_sentence on the errors array.
       #
       def error_sentence(errors) #:nodoc:
-        template.content_tag(:p, errors.to_sentence.untaint, :class => 'inline-errors')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => 'inline-errors')
       end
 
       # Creates an error li list.
@@ -1222,15 +1239,15 @@ module Formtastic #:nodoc:
       def error_list(errors) #:nodoc:
         list_elements = []
         errors.each do |error|
-          list_elements <<  template.content_tag(:li, error.untaint)
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
         end
-        template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => 'errors')
       end
 
       # Creates an error sentence containing only the first error
       #
       def error_first(errors) #:nodoc:
-        template.content_tag(:p, errors.first.untaint, :class => 'inline-errors')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => 'inline-errors')
       end
 
       # Generates the required or optional string. If the value set is a proc,
@@ -1277,7 +1294,7 @@ module Formtastic #:nodoc:
 
         legend  = html_options.delete(:name).to_s
         legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-        legend  = template.content_tag(:legend, template.content_tag(:span, legend)) unless legend.blank?
+        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
@@ -1290,11 +1307,11 @@ module Formtastic #:nodoc:
         # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
         contents = contents.join if contents.respond_to?(:join)
         fieldset = template.content_tag(:fieldset,
-          legend << template.content_tag(:ol, contents),
+          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given?
+        template.concat(fieldset) if block_given? && (!defined?(Rails::VERSION) || Rails::VERSION::MAJOR == 2)
         fieldset
       end
 
@@ -1322,7 +1339,7 @@ module Formtastic #:nodoc:
             template.content_tag(:legend,
                 self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
               ) <<
-            template.content_tag(:ol, contents)
+            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
           )
       end
 
@@ -1340,8 +1357,7 @@ module Formtastic #:nodoc:
           case column.type
           when :string
             return :password  if method.to_s =~ /password/
-            return :country   if method.to_s =~ /country/
-            return :currency   if method.to_s =~ /currency/
+            return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
           when :integer
             return :select    if method.to_s =~ /_id$/
@@ -1351,7 +1367,7 @@ module Formtastic #:nodoc:
           when :timestamp
             return :datetime
           end
-
+          
           # Try look for hints in options hash. Quite common senario: Enum keys stored as string in the database.
           return :select    if column.type == :string && options.key?(:collection)
           # Try 3: Assume the input name will be the same as the column type (e.g. string_input).
@@ -1398,7 +1414,13 @@ module Formtastic #:nodoc:
         collection = if options[:collection]
           options.delete(:collection)
         elsif reflection = self.reflection_for(column)
-          reflection.klass.find(:all, options[:find_options] || {})
+          options[:find_options] ||= {}
+
+          if conditions = reflection.options[:conditions]
+            options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+          end
+
+          reflection.klass.find(:all, options[:find_options])
         else
           create_boolean_collection(options)
         end
@@ -1407,7 +1429,7 @@ module Formtastic #:nodoc:
         collection
       end
 
-      # Detects the label and value methods from a collection values set in
+      # Detects the label and value methods from a collection values set in 
       # @@collection_label_methods. It will use and delete
       # the options :label_method and :value_methods when present
       #
@@ -1429,16 +1451,16 @@ module Formtastic #:nodoc:
       def detect_group_association(method, group_by)
         object_to_method_reflection = self.reflection_for(method)
         method_class = object_to_method_reflection.klass
-
+        
         method_to_group_association = method_class.reflect_on_association(group_by)
         group_class = method_to_group_association.klass
-
+        
         # This will return in the normal case
         return method.to_s.pluralize.to_sym if group_class.reflect_on_association(method.to_s.pluralize)
-
+      
         # This is for belongs_to associations named differently than their class
         # form.input :parent, :group_by => :customer
-        # eg.
+        # eg. 
         # class Project
         #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
         #   belongs_to :customer
@@ -1448,9 +1470,9 @@ module Formtastic #:nodoc:
         # end
         group_method = method_class.to_s.underscore.pluralize.to_sym
         return group_method if group_class.reflect_on_association(group_method) # :projects
-
+        
         # This is for has_many associations named differently than their class
-        # eg.
+        # eg. 
         # class Project
         #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
         #   belongs_to :customer
@@ -1460,9 +1482,9 @@ module Formtastic #:nodoc:
         # end
         possible_associations =  group_class.reflect_on_all_associations(:has_many).find_all{|assoc| assoc.klass == object_class}
         return possible_associations.first.name.to_sym if possible_associations.count == 1
-
+      
         raise "Cannot infer group association for #{method} grouped by #{group_by}, there were #{possible_associations.empty? ? 'no' : possible_associations.size} possible associations. Please specify using :group_association"
-
+        
       end
 
       # Returns a hash to be used by radio and select inputs when a boolean field
@@ -1489,7 +1511,7 @@ module Formtastic #:nodoc:
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
           else
-            reflection.options[:foreign_key] || reflection.options[:class_name].try(:foreign_key) || "#{method}_id"
+            reflection.options[:foreign_key] || "#{method}_id"
           end
         else
           method
@@ -1577,23 +1599,23 @@ module Formtastic #:nodoc:
 
       # Internal generic method for looking up localized values within Formtastic
       # using I18n, if no explicit value is set and I18n-lookups are enabled.
-      #
+      # 
       # Enabled/Disable this by setting:
       #
       #   Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true/false
       #
       # Lookup priority:
       #
-      #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{model}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{attribute}}'
-      #
+      #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
+      #   'formtastic.%{type}.%{model}.%{attribute}'
+      #   'formtastic.%{type}.%{attribute}'
+      # 
       # Example:
-      #
+      #   
       #   'formtastic.labels.post.edit.title'
       #   'formtastic.labels.post.title'
       #   'formtastic.labels.title'
-      #
+      # 
       # NOTE: Generic, but only used for form input titles/labels/hints/actions (titles = legends, actions = buttons).
       #
       def localized_string(key, value, type, options = {}) #:nodoc:
@@ -1605,15 +1627,16 @@ module Formtastic #:nodoc:
           use_i18n = value.nil? ? @@i18n_lookups_by_default : (value != false)
 
           if use_i18n
-            model_name  = self.model_name.underscore
+            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
             action_name = template.params[:action].to_s rescue ''
             attribute_name = key.to_s
 
             defaults = ::Formtastic::I18n::SCOPES.collect do |i18n_scope|
               i18n_path = i18n_scope.dup
-              i18n_path.gsub!('{{action}}', action_name)
-              i18n_path.gsub!('{{model}}', model_name)
-              i18n_path.gsub!('{{attribute}}', attribute_name)
+              i18n_path.gsub!('%{action}', action_name)
+              i18n_path.gsub!('%{model}', model_name)
+              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('%{attribute}', attribute_name)
               i18n_path.gsub!('..', '.')
               i18n_path.to_sym
             end
@@ -1630,6 +1653,14 @@ module Formtastic #:nodoc:
         @object.present? ? @object.class.name : @object_name.to_s.classify
       end
 
+      def normalize_model_name(name)
+        if name =~ /(.+)\[(.+)\]/
+          [$1, $2]
+        else
+          [name]
+        end
+      end
+
       def send_or_call(duck, object)
         if duck.is_a?(Proc)
           duck.call(object)
@@ -1651,11 +1682,15 @@ module Formtastic #:nodoc:
   #
   # * semantic_form_for(@post)
   # * semantic_fields_for(@post)
+  # * semantic_form_remote_for(@post)
+  # * semantic_remote_form_for(@post)
   #
   # Each of which are the equivalent of:
   #
   # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
   # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
   #
   # Example Usage:
   #
@@ -1665,7 +1700,7 @@ module Formtastic #:nodoc:
   #   <% end %>
   #
   # The above examples use a resource-oriented style of form_for() helper where only the @post
-  # object is given as an argument, but the generic style is also supported, as are forms with
+  # object is given as an argument, but the generic style is also supported, as are forms with 
   # inline objects (Post.new) rather than objects with instance variables (@post):
   #
   #   <% semantic_form_for :post, @post, :url => posts_path do |f| %>
@@ -1678,9 +1713,9 @@ module Formtastic #:nodoc:
   module SemanticFormHelper
     @@builder = ::Formtastic::SemanticFormBuilder
     mattr_accessor :builder
-
+    
     @@default_field_error_proc = nil
-
+    
     # Override the default ActiveRecordHelper behaviour of wrapping the input.
     # This gets taken care of semantically by adding an error class to the LI tag
     # containing the input.
@@ -1688,7 +1723,7 @@ module Formtastic #:nodoc:
     FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
       html_tag
     end
-
+    
     def with_custom_field_error_proc(&block)
       @@default_field_error_proc = ::ActionView::Base.field_error_proc
       ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
@@ -1696,8 +1731,18 @@ module Formtastic #:nodoc:
       ::ActionView::Base.field_error_proc = @@default_field_error_proc
       result
     end
+    
+    def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
+      options = args.extract_options!
+      if self.respond_to? :remote_form_for
+        semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
+      else
+        options[:remote] = true
+        semantic_form_for(record_or_name_or_array, *(args << options), &proc)
+      end
+    end
 
-    [:form_for, :fields_for].each do |meth|
+    [:form_for, :fields_for, :remote_form_for].each do |meth|
       module_eval <<-END_SRC, __FILE__, __LINE__ + 1
         def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options = args.extract_options!
@@ -1712,13 +1757,16 @@ module Formtastic #:nodoc:
             else ActionController::RecordIdentifier.singular_class_name(record_or_name_or_array.class)                  # @post => "post"
           end
           options[:html][:class] = class_names.join(" ")
-
+          
           with_custom_field_error_proc do
             #{meth}(record_or_name_or_array, *(args << options), &proc)
           end
         end
       END_SRC
     end
-
+    alias :semantic_remote_form_for_real :semantic_remote_form_for
+    alias :semantic_remote_form_for :semantic_remote_form_for_wrapper    
+    alias :semantic_form_remote_for :semantic_remote_form_for
+    
   end
 end