actionpack 1.8.1 → 1.9.0

data/lib/action_view/helpers/form_helper.rb

@@ -146,7 +146,7 @@ module ActionView
 
       DEFAULT_FIELD_OPTIONS     = { "size" => 30 }.freeze unless const_defined?(:DEFAULT_FIELD_OPTIONS)
       DEFAULT_RADIO_OPTIONS     = { }.freeze unless const_defined?(:DEFAULT_RADIO_OPTIONS)
-      DEFAULT_TEXT_AREA_OPTIONS = { "wrap" => "virtual", "cols" => 40, "rows" => 20 }.freeze unless const_defined?(:DEFAULT_TEXT_AREA_OPTIONS)
+      DEFAULT_TEXT_AREA_OPTIONS = { "cols" => 40, "rows" => 20 }.freeze unless const_defined?(:DEFAULT_TEXT_AREA_OPTIONS)
       DEFAULT_DATE_OPTIONS = { :discard_type => true }.freeze unless const_defined?(:DEFAULT_DATE_OPTIONS)
 
       def initialize(object_name, method_name, template_object, local_binding = nil)
@@ -175,6 +175,10 @@ module ActionView
         options["type"]     = "radio"
         options["value"]    = tag_value
         options["checked"]  = "checked" if value == tag_value
+        pretty_tag_value    = tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
+        options["id"]       = @auto_index ?             
+          "#{@object_name}_#{@auto_index}_#{@method_name}_#{pretty_tag_value}" :
+          "#{@object_name}_#{@method_name}_#{pretty_tag_value}"
         add_default_name_and_id(options)
         tag("input", options)
       end
@@ -196,6 +200,8 @@ module ActionView
             false
           when Integer
             value != 0
+          when String
+            value == checked_value
           else
             value.to_i != 0
           end

data/lib/action_view/helpers/form_options_helper.rb

@@ -22,6 +22,8 @@ module ActionView
     #     <option>poem</option>
     #   </select>
     #
+    # * <tt>:prompt</tt> - set to true or a prompt string. When the select element doesn't have a value yet, this prepends an option with a generic prompt -- "Please select" -- or the given prompt string.
+    #
     # Another common case is a select tag for an <tt>belongs_to</tt>-associated object. For example,
     #
     #   select("post", "person_id", Person.find_all.collect {|p| [ p.name, p.id ] })
@@ -251,7 +253,7 @@ module ActionView
             "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", 
             "Chad", "Chile", "China", "Christmas Island", "Cocos (Keeling) Islands", "Colombia", 
             "Comoros", "Congo", "Congo, the Democratic Republic of the", "Cook Islands", 
-            "Costa Rica", "Cote d'Ivoire", "Croatia", "Cyprus", "Czech Republic", "Denmark", 
+            "Costa Rica", "Cote d'Ivoire", "Croatia", "Cuba", "Cyprus", "Czech Republic", "Denmark", 
             "Djibouti", "Dominica", "Dominican Republic", "East Timor", "Ecuador", "Egypt", 
             "El Salvador", "England", "Equatorial Guinea", "Eritrea", "Espana", "Estonia", 
             "Ethiopia", "Falkland Islands", "Faroe Islands", "Fiji", "Finland", "France", 
@@ -259,7 +261,7 @@ module ActionView
             "Georgia", "Germany", "Ghana", "Gibraltar", "Great Britain", "Greece", "Greenland", 
             "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", 
             "Haiti", "Heard and Mc Donald Islands", "Honduras", "Hong Kong", "Hungary", "Iceland", 
-            "India", "Indonesia", "Ireland", "Israel", "Italy", "Iran", "Irak", "Jamaica", "Japan", "Jordan", 
+            "India", "Indonesia", "Ireland", "Israel", "Italy", "Iran", "Iraq", "Jamaica", "Japan", "Jordan", 
             "Kazakhstan", "Kenya", "Kiribati", "Korea, Republic of", "Korea (South)", "Kuwait", 
             "Kyrgyzstan", "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", 
             "Liberia", "Liechtenstein", "Lithuania", "Luxembourg", "Macau", "Macedonia", 
@@ -274,8 +276,8 @@ module ActionView
             "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russia", "Rwanda", 
             "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", 
             "Samoa (Independent)", "San Marino", "Sao Tome and Principe", "Saudi Arabia", 
-            "Scotland", "Senegal", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", 
-            "Slovenia", "Solomon Islands", "Somalia", "South Africa", 
+            "Scotland", "Senegal", "Serbia and Montenegro", "Seychelles", "Sierra Leone", "Singapore", 
+            "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", 
             "South Georgia and the South Sandwich Islands", "South Korea", "Spain", "Sri Lanka", 
             "St. Helena", "St. Pierre and Miquelon", "Suriname", "Svalbard and Jan Mayen Islands", 
             "Swaziland", "Sweden", "Switzerland", "Taiwan", "Tajikistan", "Tanzania", "Thailand", 
@@ -294,37 +296,43 @@ module ActionView
       def to_select_tag(choices, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
-        content_tag("select", add_blank_option(options_for_select(choices, value), options[:include_blank]), html_options)
+        content_tag("select", add_options(options_for_select(choices, value), options, value), html_options)
       end
 
       def to_collection_select_tag(collection, value_method, text_method, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         content_tag(
-          "select", add_blank_option(options_from_collection_for_select(collection, value_method, text_method, value), options[:include_blank]), html_options
+          "select", add_options(options_from_collection_for_select(collection, value_method, text_method, value), options, value), html_options
         )
       end
 
       def to_country_select_tag(priority_countries, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
-        content_tag("select", add_blank_option(country_options_for_select(value, priority_countries), options[:include_blank]), html_options)
+        content_tag("select", add_options(country_options_for_select(value, priority_countries), options, value), html_options)
       end
 
       def to_time_zone_select_tag(priority_zones, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         content_tag("select",
-          add_blank_option(
+          add_options(
             time_zone_options_for_select(value, priority_zones, options[:model] || TimeZone),
-            options[:include_blank]
+            options, value
           ), html_options
         )
       end
 
       private
-        def add_blank_option(option_tags, add_blank)
-          add_blank ? "<option value=\"\"></option>\n" + option_tags : option_tags
+        def add_options(option_tags, options, value = nil)
+          option_tags = "<option value=\"\"></option>\n" + option_tags if options[:include_blank]
+
+          if value.blank? && options[:prompt]
+            ("<option value=\"\">#{options[:prompt].kind_of?(String) ? options[:prompt] : 'Please select'}</option>\n") + option_tags
+          else
+            option_tags
+          end
         end
     end
   end

data/lib/action_view/helpers/form_tag_helper.rb

@@ -76,7 +76,11 @@ module ActionView
       end
 
       def submit_tag(value = "Save changes", options = {})
-        tag("input", { "type" => "submit", "name" => "submit", "value" => value }.update(convert_options(options)))
+        tag("input", { "type" => "submit", "name" => "commit", "value" => value }.update(convert_options(options)))
+      end
+      
+      def image_submit_tag(source, options = {})
+        tag("input", { "type" => "image", "src" => image_path(source) }.update(convert_options(options)))
       end
       
       private

data/lib/action_view/helpers/javascript_helper.rb

@@ -2,21 +2,24 @@ require File.dirname(__FILE__) + '/tag_helper'
 
 module ActionView
   module Helpers
-    # Provides a set of helpers for calling Javascript functions and, most importantly, to call remote methods using what has 
-    # been labelled Ajax[http://www.adaptivepath.com/publications/essays/archives/000385.php]. This means that you can call 
+    # Provides a set of helpers for calling JavaScript functions and, most importantly, to call remote methods using what has 
+    # been labelled AJAX[http://www.adaptivepath.com/publications/essays/archives/000385.php]. This means that you can call 
     # actions in your controllers without reloading the page, but still update certain parts of it using injections into the 
     # DOM. The common use case is having a form that adds a new element to a list without reloading the page.
     #
-    # To be able to use the Javascript helpers, you must either call <tt><%= define_javascript_functions %></tt> (which returns all
-    # the Javascript support functions in a <script> block) or reference the Javascript library using 
+    # To be able to use the JavaScript helpers, you must either call <tt><%= define_javascript_functions %></tt> (which returns all
+    # the JavaScript support functions in a <script> block) or reference the JavaScript library using 
     # <tt><%= javascript_include_tag "prototype" %></tt> (which looks for the library in /javascripts/prototype.js). The latter is
     # recommended as the browser can then cache the library instead of fetching all the functions anew on every request.
     #
-    # If you're the visual type, there's an Ajax movie[http://www.rubyonrails.com/media/video/rails-ajax.mov] demonstrating
+    # If you're the visual type, there's an AJAX movie[http://www.rubyonrails.com/media/video/rails-ajax.mov] demonstrating
     # the use of form_remote_tag.
-    module JavascriptHelper      
+    module JavaScriptHelper      
       unless const_defined? :CALLBACKS
-        CALLBACKS = [:uninitialized, :loading, :loaded, :interactive, :complete]
+        CALLBACKS       = 
+          [:uninitialized, :loading, :loaded, :interactive, :complete, :failure].push((100..599).to_a).flatten
+        AJAX_OPTIONS    = [ :before, :after, :condition, :url, :asynchronous, :method, 
+          :insertion, :position, :form, :with, :update, :script ].concat(CALLBACKS)
         JAVASCRIPT_PATH = File.join(File.dirname(__FILE__), 'javascripts')
       end
       
@@ -44,9 +47,25 @@ module ActionView
       #  link_to_remote "Delete this post", :update => "posts", :url => { :action => "destroy", :id => post.id }
       #  link_to_remote(image_tag("refresh"), :update => "emails", :url => { :action => "list_emails" })
       #
+      # You can also specify a hash for <tt>options[:update]</tt> to allow for
+      # easy redirection of output to an other DOM element if a server-side error occurs:
+      #
+      # Example:
+      #  link_to_remote "Delete this post",
+      #      :url => { :action => "destroy", :id => post.id },
+      #      :update => { :success => "posts", :failure => "error" }
+      #
+      # Optionally, you can use the <tt>options[:position]</tt> parameter to influence
+      # how the target DOM element is updated. It must be one of 
+      # <tt>:before</tt>, <tt>:top</tt>, <tt>:bottom</tt>, or <tt>:after</tt>.
+      #
       # By default, these remote requests are processed asynchronous during 
-      # which various callbacks can be triggered (for progress indicators and
-      # the likes).
+      # which various JavaScript callbacks can be triggered (for progress indicators and
+      # the likes). All callbacks get access to the <tt>request</tt> object,
+      # which holds the underlying XMLHttpRequest. 
+      #
+      # To access the server response, use <tt>request.responseText</tt>, to
+      # find out the HTTP status, use <tt>request.status</tt>.
       #
       # Example:
       #   link_to_remote word,
@@ -62,11 +81,38 @@ module ActionView
       # <tt>:interactive</tt>::   Called when the user can interact with the 
       #                           remote document, even though it has not 
       #                           finished loading.
-      # <tt>:complete</tt>::      Called when the XMLHttpRequest is complete.
+      # <tt>:complete</tt>::      Called when the XMLHttpRequest is complete,
+      #                           and the HTTP status code is 200 OK.
+      # <tt>:failure</tt>::       Called when the XMLHttpRequest is complete,
+      #                           and the HTTP status code is anything other than
+      #                           200 OK.
+      #
+      # You can further refine <tt>:failure</tt> by adding additional 
+      # callbacks for specific status codes:
+      #
+      # Example:
+      #   link_to_remote word,
+      #       :url => { :action => "action" },
+      #       404 => "alert('Not found...? Wrong URL...?')",
+      #       :failure => "alert('HTTP Error ' + request.status + '!')"
+      #
       #
       # If you for some reason or another need synchronous processing (that'll
       # block the browser while the request is happening), you can specify 
       # <tt>options[:type] = :synchronous</tt>.
+      #
+      # You can customize further browser side call logic by passing
+      # in JavaScript code snippets via some optional parameters. In
+      # their order of use these are:
+      #
+      # <tt>:confirm</tt>::      Adds confirmation dialog.
+      # <tt>:condition</tt>::    Perform remote request conditionally
+      #                          by this expression. Use this to
+      #                          describe browser-side conditions when
+      #                          request should not be initiated.
+      # <tt>:before</tt>::       Called before request is initiated.
+      # <tt>:after</tt>::        Called immediately after request was
+      #                          initiated and before <tt>:loading</tt>.
       def link_to_remote(name, options = {}, html_options = {})  
         link_to_function(name, remote_function(options), html_options)
       end
@@ -79,16 +125,24 @@ module ActionView
          code = "new PeriodicalExecuter(function() {#{remote_function(options)}}, #{frequency})"
          content_tag("script", code, options[:html_options] || {})
       end
-      
+
       # Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular 
-      # reloading POST arrangement. Even though it's using Javascript to serialize the form elements, the form submission 
+      # reloading POST arrangement. Even though it's using JavaScript to serialize the form elements, the form submission 
       # will work just like a regular submission as viewed by the receiving side (all elements available in @params).
       # The options for specifying the target with :url and defining callbacks is the same as link_to_remote.
+      #
+      # A "fall-through" target for browsers that doesn't do JavaScript can be specified with the :action/:method options on :html
+      #
+      #   form_remote_tag :html => { :action => url_for(:controller => "some", :action => "place") }
+      #
+      # By default the fall-through action is the same as the one specified in the :url (and the default method is :post).
       def form_remote_tag(options = {})
         options[:form] = true
 
         options[:html] ||= {}
         options[:html][:onsubmit] = "#{remote_function(options)}; return false;"
+        options[:html][:action] = options[:html][:action] || url_for(options[:url])
+        options[:html][:method] = options[:html][:method] || "post"
 
         tag("form", options[:html], true)
       end
@@ -106,27 +160,110 @@ module ActionView
 
         tag("input", options[:html], false)
       end
+      
+      # Returns a Javascript function (or expression) that'll update a DOM element according to the options passed.
+      #
+      # * <tt>:content</tt>: The content to use for updating. Can be left out if using block, see example.
+      # * <tt>:action</tt>: Valid options are :update (assumed by default), :empty, :remove
+      # * <tt>:position</tt> If the :action is :update, you can optionally specify one of the following positions: :before, :top, :bottom, :after.
+      #
+      # Examples:
+      #   <%= javascript_tag(update_element_function(
+      #         "products", :position => :bottom, :content => "<p>New product!</p>")) %>
+      #
+      #   <% replacement_function = update_element_function("products") do %>
+      #     <p>Product 1</p>
+      #     <p>Product 2</p>
+      #   <% end %>
+      #   <%= javascript_tag(replacement_function) %>
+      #
+      # This method can also be used in combination with remote method call where the result is evaluated afterwards to cause
+      # multiple updates on a page. Example:
+      #
+      #   # Calling view
+      #   <%= form_remote_tag :url => { :action => "buy" }, :complete => evaluate_remote_response %>
+      #   all the inputs here...
+      #
+      #   # Controller action
+      #   def buy
+      #     @product = Product.find(1)
+      #   end
+      #
+      #   # Returning view
+      #   <%= update_element_function(
+      #         "cart", :action => :update, :position => :bottom, 
+      #         :content => "<p>New Product: #{@product.name}</p>")) %>
+      #   <% update_element_function("status", :binding => binding) do %>
+      #     You've bought a new product!
+      #   <% end %>
+      #
+      # Notice how the second call doesn't need to be in an ERb output block since it uses a block and passes in the binding
+      # to render directly. This trick will however only work in ERb (not Builder or other template forms).
+      def update_element_function(element_id, options = {}, &block)
+        
+        content = escape_javascript(options[:content] || '')
+        content = escape_javascript(capture(&block)) if block
+        
+        javascript_function = case (options[:action] || :update)
+          when :update
+            if options[:position]
+              "new Insertion.#{options[:position].to_s.camelize}('#{element_id}','#{content}')"
+            else
+              "$('#{element_id}').innerHTML = '#{content}'"
+            end
+          
+          when :empty
+            "$('#{element_id}').innerHTML = ''"
+          
+          when :remove
+            "Element.remove('#{element_id}')"
+          
+          else
+            raise ArgumentError, "Invalid action, choose one of :update, :remove, :empty"
+        end
+        
+        javascript_function << ";\n"
+        options[:binding] ? concat(javascript_function, options[:binding]) : javascript_function
+      end
+      
+      # Returns 'eval(request.responseText)' which is the Javascript function that form_remote_tag can call in :complete to
+      # evaluate a multiple update return document using update_element_function calls.
+      def evaluate_remote_response
+        "eval(request.responseText)"
+      end
 
       def remote_function(options) #:nodoc: for now
         javascript_options = options_for_ajax(options)
 
-        function = options[:update] ? 
-          "new Ajax.Updater('#{options[:update]}', " :
-          "new Ajax.Request("
+        update = ''
+        if options[:update] and options[:update].is_a?Hash
+          update  = []
+          update << "success:'#{options[:update][:success]}'" if options[:update][:success]
+          update << "failure:'#{options[:update][:failure]}'" if options[:update][:failure]
+          update  = '{' + update.join(',') + '}'
+        elsif options[:update]
+          update << "'#{options[:update]}'"
+        end
+
+        function = update.empty? ? 
+          "new Ajax.Request(" :
+          "new Ajax.Updater(#{update}, "
 
         function << "'#{url_for(options[:url])}'"
         function << ", #{javascript_options})"
-        
+
         function = "#{options[:before]}; #{function}" if options[:before]
         function = "#{function}; #{options[:after]}"  if options[:after]
         function = "if (#{options[:condition]}) { #{function}; }" if options[:condition]
         function = "if (confirm('#{escape_javascript(options[:confirm])}')) { #{function}; }" if options[:confirm]
-	
+
         return function
       end
 
-      # Includes the Action Pack Javascript library inside a single <script> 
-      # tag.
+      # Includes the Action Pack JavaScript libraries inside a single <script> 
+      # tag. The function first includes prototype.js and then its core extensions,
+      # (determined by filenames starting with "prototype").
+      # Afterwards, any additional scripts will be included in random order.
       #
       # Note: The recommended approach is to copy the contents of
       # lib/action_view/helpers/javascripts/ into your application's
@@ -134,24 +271,36 @@ module ActionView
       # create remote <script> links.
       def define_javascript_functions
         javascript = '<script type="text/javascript">'
-        Dir.glob(File.join(JAVASCRIPT_PATH, '*')).each { |filename| javascript << "\n" << IO.read(filename) }
+        
+        # load prototype.js and its extensions first 
+        prototype_libs = Dir.glob(File.join(JAVASCRIPT_PATH, 'prototype*')).sort.reverse
+        prototype_libs.each do |filename| 
+          javascript << "\n" << IO.read(filename)
+        end
+        
+        # load other librairies
+        (Dir.glob(File.join(JAVASCRIPT_PATH, '*')) - prototype_libs).each do |filename| 
+          javascript << "\n" << IO.read(filename)
+        end
         javascript << '</script>'
       end
 
       # Observes the field with the DOM ID specified by +field_id+ and makes
-      # an Ajax when its contents have changed.
+      # an AJAX call when its contents have changed.
       # 
       # Required +options+ are:
-      # <tt>:frequency</tt>:: The frequency (in seconds) at which changes to
-      #                       this field will be detected.
       # <tt>:url</tt>::       +url_for+-style options for the action to call
       #                       when the field has changed.
       # 
       # Additional options are:
+      # <tt>:frequency</tt>:: The frequency (in seconds) at which changes to
+      #                       this field will be detected. Set this to a value
+      #                       greater than zero to use time based observation
+      #                       instead of event based observation.
       # <tt>:update</tt>::    Specifies the DOM ID of the element whose 
       #                       innerHTML should be updated with the
       #                       XMLHttpRequest response text.
-      # <tt>:with</tt>::      A Javascript expression specifying the
+      # <tt>:with</tt>::      A JavaScript expression specifying the
       #                       parameters for the XMLHttpRequest. This defaults
       #                       to 'value', which in the evaluated context 
       #                       refers to the new field value.
@@ -159,7 +308,11 @@ module ActionView
       # Additionally, you may specify any of the options documented in
       # +link_to_remote.
       def observe_field(field_id, options = {})
-        build_observer('Form.Element.Observer', field_id, options)
+        if options[:frequency]
+          build_observer('Form.Element.Observer', field_id, options)
+        else
+          build_observer('Form.Element.EventObserver', field_id, options)
+        end
       end
       
       # Like +observe_field+, but operates on an entire form identified by the
@@ -167,29 +320,212 @@ module ActionView
       # the default value of the <tt>:with</tt> option evaluates to the
       # serialized (request string) value of the form.
       def observe_form(form_id, options = {})
-        build_observer('Form.Observer', form_id, options)
+        if options[:frequency]
+          build_observer('Form.Observer', form_id, options)
+        else
+          build_observer('Form.EventObserver', form_id, options)
+        end
       end
+      
+           
+      # Adds AJAX autocomplete functionality to the text input field with the 
+      # DOM ID specified by +field_id+.
+      #
+      # This function expects that the called action returns a HTML <ul> list,
+      # or nothing if no entries should be displayed for autocompletion.
+      #
+      # You'll probably want to turn the browser's built-in autocompletion off,
+      # su be sure to include a autocomplete="off" attribute with your text
+      # input field.
+      # 
+      # Required +options+ are:
+      # <tt>:url</tt>::       Specifies the DOM ID of the element whose
+      #                       innerHTML should be updated with the autocomplete
+      #                       entries returned by XMLHttpRequest.
+      # 
+      # Addtional +options+ are:
+      # <tt>:update</tt>::    Specifies the DOM ID of the element whose 
+      #                       innerHTML should be updated with the autocomplete
+      #                       entries returned by the AJAX request. 
+      #                       Defaults to field_id + '_auto_complete'
+      # <tt>:with</tt>::      A JavaScript expression specifying the
+      #                       parameters for the XMLHttpRequest. This defaults
+      #                       to 'fieldname=value'.
+      # <tt>:indicator</tt>:: Specifies the DOM ID of an elment which will be
+      #                       displayed while autocomplete is running. 
+      def auto_complete_field(field_id, options = {})
+        function =  "new Ajax.Autocompleter("
+        function << "'#{field_id}', "
+        function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', "
+        function << "'#{url_for(options[:url])}'"
 
-      # Escape carrier returns and single and double quotes for Javascript segments.
+        js_options = {}
+        js_options[:callback]   = "function(element, value) { return #{options[:with]} }" if options[:with]
+        js_options[:indicator]  = "'#{options[:indicator]}'" if options[:indicator]
+        function << (', ' + options_for_javascript(js_options) + ')')
+
+        javascript_tag(function)
+      end
+      
+      # Use this method in your view to generate a return for the AJAX automplete requests.
+      #
+      # Example action:
+      #
+      #   def auto_complete_for_item_title
+      #     @items = Item.find(:all, 
+      #       :conditions => [ 'LOWER(description) LIKE ?', 
+      #       '%' + request.raw_post.downcase + '%' ])
+      #     render :inline => '<%= auto_complete_result(@items, 'description') %>'
+      #   end
+      #
+      # The auto_complete_result can of course also be called from a view belonging to the 
+      # auto_complete action if you need to decorate it further.
+      def auto_complete_result(entries, field, phrase = nil)
+        return unless entries
+        items = entries.map { |entry| content_tag("li", phrase ? highlight(entry[field], phrase) : h(entry[field])) }
+        content_tag("ul", items)
+      end
+      
+      # Wrapper for text_field with added AJAX autocompletion functionality.
+      #
+      # In your controller, you'll need to define an action called
+      # auto_complete_for_object_method to respond the AJAX calls,
+      # 
+      # See the RDoc on ActionController::AutoComplete to learn more about this.
+      def text_field_with_auto_complete(object, method, tag_options = {}, completion_options = {})
+        (completion_options[:skip_style] ? "" : auto_complete_stylesheet) +
+        text_field(object, method, { :autocomplete => "off" }.merge!(tag_options)) +
+        content_tag("div", "", :id => "#{object}_#{method}_auto_complete", :class => "auto_complete") +
+        auto_complete_field("#{object}_#{method}", { :url => { :action => "auto_complete_for_#{object}_#{method}" } }.update(completion_options))
+      end
+      
+      # Returns a JavaScript snippet to be used on the AJAX callbacks for starting
+      # visual effects.
+      #
+      # Example:
+      #   <%= link_to_remote "Reload", :update => "posts", 
+      #         :url => { :action => "reload" }, 
+      #         :complete => visual_effect(:highlight, "posts", :duration => 0.5 )
+      #
+      # If no element_id is given, it assumes "element" which should be a local
+      # variable in the generated JavaScript execution context. This can be used
+      # for example with drop_receiving_element:
+      #
+      #   <%= drop_receving_element (...), :loading => visual_effect(:fade) %>
+      #
+      # This would fade the element that was dropped on the drop receiving element.
+      #
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation.
+      def visual_effect(name, element_id = false, js_options = {})
+        element = element_id ? "'#{element_id}'" : "element"
+        "new Effect.#{name.to_s.capitalize}(#{element},#{options_for_javascript(js_options)});"
+      end
+      
+      # Makes the element with the DOM ID specified by +element_id+ sortable
+      # by drag-and-drop and make an AJAX call whenever the sort order has
+      # changed. By default, the action called gets the serialized sortable
+      # element as parameters.
+      #
+      # Example:
+      #   <%= sortable_element("my_list", :url => { :action => "order" }) %>
+      #
+      # In the example, the action gets a "my_list" array parameter 
+      # containing the values of the ids of elements the sortable consists 
+      # of, in the current order.
+      #
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation.
+      def sortable_element(element_id, options = {})
+        options[:with]     ||= "Sortable.serialize('#{element_id}')"
+        options[:onUpdate] ||= "function(){" + remote_function(options) + "}"
+        options.delete_if { |key, value| AJAX_OPTIONS.include?(key) }
+        
+        [:tag, :overlap, :constraint].each do |option|
+          options[option] = "'#{options[option]}'" if options[option]
+        end
+        
+        if options[:containment] and options[:containment].kind_of?(Array)
+          options[:containment] = "['#{options[:containment].join('\',\'')}']"
+        elsif options[:containment]
+          options[:containment] = "'#{options[:containment]}'" if options[:containment]
+        end
+        
+        javascript_tag("Sortable.create('#{element_id}', #{options_for_javascript(options)})")
+      end
+      
+      # Makes the element with the DOM ID specified by +element_id+ draggable.
+      #
+      # Example:
+      #   <%= draggable_element("my_image", :revert => true)
+      # 
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation. 
+      def draggable_element(element_id, options = {})
+        javascript_tag("new Draggable('#{element_id}', #{options_for_javascript(options)})")
+      end
+      
+      # Makes the element with the DOM ID specified by +element_id+ receive
+      # dropped draggable elements (created by draggable_element).
+      # and make an AJAX call  By default, the action called gets the DOM ID of the
+      # element as parameter.
+      #
+      # Example:
+      #   <%= drop_receiving_element("my_cart", :url => { :controller => "cart", :action => "add" }) %>
+      #
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation.
+      def drop_receiving_element(element_id, options = {})
+        options[:with]     ||= "'id=' + encodeURIComponent(element.id)"
+        options[:onDrop]   ||= "function(element){" + remote_function(options) + "}"
+        options.delete_if { |key, value| AJAX_OPTIONS.include?(key) }
+        
+        if options[:accept] and options[:accept].kind_of?(Array)
+          options[:accept] = "['#{options[:accept].join('\',\'')}']"
+        elsif options[:accept]
+          options[:accept] = "'#{options[:accept]}'" if options[:accept]
+        end
+        
+        options[:hoverclass] = "'#{options[:hoverclass]}'" if options[:hoverclass]
+        
+        javascript_tag("Droppables.add('#{element_id}', #{options_for_javascript(options)})")
+      end
+
+      # Escape carrier returns and single and double quotes for JavaScript segments.
       def escape_javascript(javascript)
         (javascript || '').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
       end
 
+      # Returns a JavaScript tag with the +content+ inside. Example:
+      #   javascript_tag "alert('All is good')" # => <script type="text/javascript">alert('All is good')</script>
+      def javascript_tag(content)
+        content_tag("script", content, :type => "text/javascript")
+      end
+
     private
+      def options_for_javascript(options)
+        '{' + options.map {|k, v| "#{k}:#{v}"}.join(', ') + '}'
+      end
+      
       def options_for_ajax(options)
         js_options = build_callbacks(options)
         
         js_options['asynchronous'] = options[:type] != :synchronous
-        js_options['method']       = options[:method] if options[:method]
+        js_options['method']       = method_option_to_s(options[:method]) if options[:method]
         js_options['insertion']    = "Insertion.#{options[:position].to_s.camelize}" if options[:position]
-	
+        js_options['evalScripts']  = options[:script].nil? || options[:script]
+
         if options[:form]
           js_options['parameters'] = 'Form.serialize(this)'
         elsif options[:with]
           js_options['parameters'] = options[:with]
         end
         
-        '{' + js_options.map {|k, v| "#{k}:#{v}"}.join(', ') + '}'
+        options_for_javascript(js_options)
+      end
+
+      def method_option_to_s(method) 
+        (method.is_a?(String) and !method.index("'").nil?) ? method : "'#{method}'"
       end
       
       def build_observer(klass, name, options = {})
@@ -197,20 +533,52 @@ module ActionView
         callback = remote_function(options)
         javascript = '<script type="text/javascript">'
         javascript << "new #{klass}('#{name}', "
-        javascript << "#{options[:frequency]}, function(element, value) {"
+        javascript << "#{options[:frequency]}, " if options[:frequency]
+        javascript << "function(element, value) {"
         javascript << "#{callback}})</script>"
       end
             
       def build_callbacks(options)
-        CALLBACKS.inject({}) do |callbacks, callback|
-          if options[callback]
+        callbacks = {}
+        options.each do |callback, code|
+          if CALLBACKS.include?(callback)
             name = 'on' + callback.to_s.capitalize
-            code = options[callback]
             callbacks[name] = "function(request){#{code}}"
           end
-          callbacks
         end
+        callbacks
+      end
+      
+      def auto_complete_stylesheet
+        content_tag("style", <<-EOT
+          div.auto_complete {
+            width: 350px;
+            background: #fff;
+          }
+          div.auto_complete ul {
+            border:1px solid #888;
+            margin:0;
+            padding:0;
+            width:100%;
+            list-style-type:none;
+          }
+          div.auto_complete ul li {
+            margin:0;
+            padding:3px;
+          }
+          div.auto_complete ul li.selected { 
+            background-color: #ffb; 
+          }
+          div.auto_complete ul strong.highlight { 
+            color: #800; 
+            margin:0;
+            padding:0;
+          }
+        EOT
+        )
       end
     end
+    
+    JavascriptHelper = JavaScriptHelper unless const_defined? :JavascriptHelper
   end
 end