radiant 0.6.9 → 0.7.0

data/vendor/rails/actionpack/lib/action_view/helpers/record_tag_helper.rb

@@ -2,7 +2,7 @@ module ActionView
   module Helpers
     module RecordTagHelper
       # Produces a wrapper DIV element with id and class parameters that
-      # relate to the specified ActiveRecord object. Usage example:
+      # relate to the specified Active Record object. Usage example:
       #
       #    <% div_for(@person, :class => "foo") do %>
       #       <%=h @person.name %>
@@ -17,14 +17,14 @@ module ActionView
       end
   
       # content_tag_for creates an HTML element with id and class parameters
-      # that relate to the specified ActiveRecord object. For example:
+      # that relate to the specified Active Record object. For example:
       #
       #    <% content_tag_for(:tr, @person) do %>
       #      <td><%=h @person.first_name %></td>
       #      <td><%=h @person.last_name %></td>
       #    <% end %>
       #
-      # would produce hthe following HTML (assuming @person is an instance of
+      # would produce the following HTML (assuming @person is an instance of
       # a Person object, with an id value of 123):
       #
       #    <tr id="person_123" class="person">....</tr>

data/vendor/rails/actionpack/lib/action_view/helpers/sanitize_helper.rb

@@ -10,7 +10,7 @@ module ActionView
         base.extend(ClassMethods)
       end
       
-      # This #sanitize helper will html encode all tags and strip all attributes that aren't specifically allowed.  
+      # This +sanitize+ helper will html encode all tags and strip all attributes that aren't specifically allowed.
       # It also strips href/src tags with invalid protocols, like javascript: especially.  It does its best to counter any
       # tricks that hackers may use, like throwing in unicode/ascii/hex values to get past the javascript: filters.  Check out
       # the extensive test suite.
@@ -18,7 +18,7 @@ module ActionView
       #   <%= sanitize @article.body %>
       # 
       # You can add or remove tags/attributes if you want to customize it a bit.  See ActionView::Base for full docs on the
-      # available options.  You can add tags/attributes for single uses of #sanitize by passing either the :attributes or :tags options:
+      # available options.  You can add tags/attributes for single uses of +sanitize+ by passing either the <tt>:attributes</tt> or <tt>:tags</tt> options:
       #
       # Normal Use
       #
@@ -48,11 +48,16 @@ module ActionView
       #     config.action_view.sanitized_allowed_attributes = 'id', 'class', 'style'
       #   end
       # 
+      # Please note that sanitizing user-provided text does not guarantee that the
+      # resulting markup is valid (conforming to a document type) or even well-formed.
+      # The output may still contain e.g. unescaped '<', '>', '&' characters and
+      # confuse browsers.
+      #
       def sanitize(html, options = {})
         self.class.white_list_sanitizer.sanitize(html, options)
       end
 
-      # Sanitizes a block of css code.  Used by #sanitize when it comes across a style attribute
+      # Sanitizes a block of CSS code. Used by +sanitize+ when it comes across a style attribute.
       def sanitize_css(style)
         self.class.white_list_sanitizer.sanitize_css(style)
       end
@@ -106,8 +111,8 @@ module ActionView
           end
         end
         
-        # Gets the HTML::FullSanitizer instance used by strip_tags.  Replace with
-        # any object that responds to #sanitize
+        # Gets the HTML::FullSanitizer instance used by +strip_tags+.  Replace with
+        # any object that responds to +sanitize+.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.full_sanitizer = MySpecialSanitizer.new
@@ -117,8 +122,8 @@ module ActionView
           @full_sanitizer ||= HTML::FullSanitizer.new
         end
 
-        # Gets the HTML::LinkSanitizer instance used by strip_links.  Replace with
-        # any object that responds to #sanitize
+        # Gets the HTML::LinkSanitizer instance used by +strip_links+.  Replace with
+        # any object that responds to +sanitize+.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.link_sanitizer = MySpecialSanitizer.new
@@ -128,8 +133,8 @@ module ActionView
           @link_sanitizer ||= HTML::LinkSanitizer.new
         end
 
-        # Gets the HTML::WhiteListSanitizer instance used by sanitize and sanitize_css.
-        # Replace with any object that responds to #sanitize
+        # Gets the HTML::WhiteListSanitizer instance used by sanitize and +sanitize_css+.
+        # Replace with any object that responds to +sanitize+.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.white_list_sanitizer = MySpecialSanitizer.new
@@ -139,7 +144,7 @@ module ActionView
           @white_list_sanitizer ||= HTML::WhiteListSanitizer.new
         end
 
-        # Adds valid HTML attributes that the #sanitize helper checks for URIs.
+        # Adds valid HTML attributes that the +sanitize+ helper checks for URIs.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_uri_attributes = 'lowsrc', 'target'
@@ -149,7 +154,7 @@ module ActionView
           HTML::WhiteListSanitizer.uri_attributes.merge(attributes)
         end
 
-        # Adds to the Set of 'bad' tags for the #sanitize helper.
+        # Adds to the Set of 'bad' tags for the +sanitize+ helper.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_bad_tags = 'embed', 'object'
@@ -158,7 +163,8 @@ module ActionView
         def sanitized_bad_tags=(attributes)
           HTML::WhiteListSanitizer.bad_tags.merge(attributes)
         end
-        # Adds to the Set of allowed tags for the #sanitize helper.
+
+        # Adds to the Set of allowed tags for the +sanitize+ helper.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
@@ -168,7 +174,7 @@ module ActionView
           HTML::WhiteListSanitizer.allowed_tags.merge(attributes)
         end
 
-        # Adds to the Set of allowed html attributes for the #sanitize helper.
+        # Adds to the Set of allowed HTML attributes for the +sanitize+ helper.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_allowed_attributes = 'onclick', 'longdesc'
@@ -178,7 +184,7 @@ module ActionView
           HTML::WhiteListSanitizer.allowed_attributes.merge(attributes)
         end
 
-        # Adds to the Set of allowed css properties for the #sanitize and #sanitize_css heleprs.
+        # Adds to the Set of allowed CSS properties for the #sanitize and +sanitize_css+ heleprs.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_allowed_css_properties = 'expression'
@@ -188,7 +194,7 @@ module ActionView
           HTML::WhiteListSanitizer.allowed_css_properties.merge(attributes)
         end
 
-        # Adds to the Set of allowed css keywords for the #sanitize and #sanitize_css helpers.
+        # Adds to the Set of allowed CSS keywords for the +sanitize+ and +sanitize_css+ helpers.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_allowed_css_keywords = 'expression'
@@ -198,7 +204,7 @@ module ActionView
           HTML::WhiteListSanitizer.allowed_css_keywords.merge(attributes)
         end
 
-        # Adds to the Set of allowed shorthand css properties for the #sanitize and #sanitize_css helpers.
+        # Adds to the Set of allowed shorthand CSS properties for the +sanitize+ and +sanitize_css+ helpers.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_shorthand_css_properties = 'expression'
@@ -208,7 +214,7 @@ module ActionView
           HTML::WhiteListSanitizer.shorthand_css_properties.merge(attributes)
         end
 
-        # Adds to the Set of allowed protocols for the #sanitize helper.
+        # Adds to the Set of allowed protocols for the +sanitize+ helper.
         #
         #   Rails::Initializer.run do |config|
         #     config.action_view.sanitized_allowed_protocols = 'ssh', 'feed'

data/vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb

@@ -26,17 +26,17 @@ module ActionView
       #         :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
+      # 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:
+      # used for example with +drop_receiving_element+:
       #
       #   <%= drop_receiving_element (...), :loading => visual_effect(:fade) %>
       #
       # This would fade the element that was dropped on the drop receiving 
       # element.
       #
-      # For toggling visual effects, you can use :toggle_appear, :toggle_slide, and
-      # :toggle_blind which will alternate between appear/fade, slidedown/slideup, and
+      # For toggling visual effects, you can use <tt>:toggle_appear</tt>, <tt>:toggle_slide</tt>, and
+      # <tt>:toggle_blind</tt> which will alternate between appear/fade, slidedown/slideup, and
       # blinddown/blindup respectively.
       #
       # You can change the behaviour with various options, see
@@ -67,6 +67,7 @@ module ActionView
       # element as parameters.
       #
       # Example:
+      #
       #   <%= sortable_element("my_list", :url => { :action => "order" }) %>
       #
       # In the example, the action gets a "my_list" array parameter 
@@ -79,60 +80,56 @@ module ActionView
       # 
       # Additional +options+ are:
       #
-      # <tt>:format</tt>::               A regular expression to determine what to send
-      #                                  as the serialized id to the server (the default
-      #                                  is <tt>/^[^_]*_(.*)$/</tt>).
-      #                                  
-      # <tt>:constraint</tt>::           Whether to constrain the dragging to either <tt>:horizontal</tt>
-      #                                  or <tt>:vertical</tt> (or false to make it unconstrained).
-      #                                   
-      # <tt>:overlap</tt>::              Calculate the item overlap in the <tt>:horizontal</tt> or 
-      #                                  <tt>:vertical</tt> direction.
-      #                                   
-      # <tt>:tag</tt>::                  Which children of the container element to treat as
-      #                                  sortable (default is <tt>li</tt>).
-      #                                  
-      # <tt>:containment</tt>::          Takes an element or array of elements to treat as
-      #                                  potential drop targets (defaults to the original
-      #                                  target element).
-      #                                  
-      # <tt>:only</tt>::                 A CSS class name or arry of class names used to filter
-      #                                  out child elements as candidates.
-      #                                  
-      # <tt>:scroll</tt>::               Determines whether to scroll the list during drag
-      #                                  operationsif the list runs past the visual border.
-      #                                  
-      # <tt>:tree</tt>::                 Determines whether to treat nested lists as part of the
-      #                                  main sortable list. This means that you can create multi-
-      #                                  layer lists, and not only sort items at the same level,
-      #                                  but drag and sort items between levels.
-      #                                  
-      # <tt>:hoverclass</tt>::           If set, the Droppable will have this additional CSS class
-      #                                  when an accepted Draggable is hovered over it.                         
-      #                                 
-      # <tt>:handle</tt>::               Sets whether the element should only be draggable by an
-      #                                  embedded handle. The value may be a string referencing a
-      #                                  CSS class value (as of script.aculo.us V1.5). The first
-      #                                  child/grandchild/etc. element found within the element
-      #                                  that has this CSS class value will be used as the handle.
-      #
-      # <tt>:ghosting</tt>::             Clones the element and drags the clone, leaving the original
-      #                                  in place until the clone is dropped (defaut is <tt>false</tt>).
-      #       
-      # <tt>:dropOnEmpty</tt>::          If set to true, the Sortable container will be made into
-      #                                  a Droppable, that can receive a Draggable (as according to
-      #                                  the containment rules) as a child element when there are no
-      #                                  more elements inside (defaut is <tt>false</tt>).
-      #       
-      # <tt>:onChange</tt>::             Called whenever the sort order changes while dragging. When
-      #                                  dragging from one Sortable to another, the callback is
-      #                                  called once on each Sortable. Gets the affected element as
-      #                                  its parameter.
-      #                                 
-      # <tt>:onUpdate</tt>::             Called when the drag ends and the Sortable's order is
-      #                                  changed in any way. When dragging from one Sortable to
-      #                                  another, the callback is called once on each Sortable. Gets
-      #                                  the container as its parameter.
+      # * <tt>:format</tt> - A regular expression to determine what to send as the
+      #   serialized id to the server (the default is <tt>/^[^_]*_(.*)$/</tt>).
+      #                           
+      # * <tt>:constraint</tt> - Whether to constrain the dragging to either
+      #   <tt>:horizontal</tt> or <tt>:vertical</tt> (or false to make it unconstrained).
+      #                            
+      # * <tt>:overlap</tt> - Calculate the item overlap in the <tt>:horizontal</tt>
+      #   or <tt>:vertical</tt> direction.
+      #                            
+      # * <tt>:tag</tt> - Which children of the container element to treat as
+      #   sortable (default is <tt>li</tt>).
+      #                          
+      # * <tt>:containment</tt> - Takes an element or array of elements to treat as
+      #   potential drop targets (defaults to the original target element).
+      #                          
+      # * <tt>:only</tt> - A CSS class name or arry of class names used to filter
+      #   out child elements as candidates.
+      #                          
+      # * <tt>:scroll</tt> - Determines whether to scroll the list during drag
+      #   operations if the list runs past the visual border.
+      #                          
+      # * <tt>:tree</tt> - Determines whether to treat nested lists as part of the
+      #   main sortable list. This means that you can create multi-layer lists,
+      #   and not only sort items at the same level, but drag and sort items
+      #   between levels.
+      #                          
+      # * <tt>:hoverclass</tt> - If set, the Droppable will have this additional CSS class
+      #   when an accepted Draggable is hovered over it.                         
+      #                          
+      # * <tt>:handle</tt> - Sets whether the element should only be draggable by an
+      #   embedded handle. The value may be a string referencing a CSS class value
+      #   (as of script.aculo.us V1.5). The first child/grandchild/etc. element
+      #   found within the element that has this CSS class value will be used as
+      #   the handle.
+      #                          
+      # * <tt>:ghosting</tt> - Clones the element and drags the clone, leaving
+      #   the original in place until the clone is dropped (default is <tt>false</tt>).
+      #                          
+      # * <tt>:dropOnEmpty</tt> - If true the Sortable container will be made into
+      #   a Droppable, that can receive a Draggable (as according to the containment
+      #   rules) as a child element when there are no more elements inside (default
+      #   is <tt>false</tt>).
+      #                          
+      # * <tt>:onChange</tt> - Called whenever the sort order changes while dragging. When
+      #   dragging from one Sortable to another, the callback is called once on each
+      #   Sortable. Gets the affected element as its parameter.
+      #                          
+      # * <tt>:onUpdate</tt> - Called when the drag ends and the Sortable's order is
+      #   changed in any way. When dragging from one Sortable to another, the callback
+      #   is called once on each Sortable. Gets the container as its parameter.
       #                                                                                         
       # See http://script.aculo.us for more documentation.
       def sortable_element(element_id, options = {})
@@ -170,8 +167,8 @@ module ActionView
       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 
+      # 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:
@@ -180,6 +177,32 @@ module ActionView
       #
       # You can change the behaviour with various options, see
       # http://script.aculo.us for more documentation.
+      #
+      # Some of these +options+ include:
+      # * <tt>:accept</tt> - Set this to a string or an array of strings describing the
+      #   allowable CSS classes that the +draggable_element+ must have in order 
+      #   to be accepted by this +drop_receiving_element+.
+      #                          
+      # * <tt>:confirm</tt> - Adds a confirmation dialog. Example:
+      #                     
+      #     :confirm => "Are you sure you want to do this?"
+      #                          
+      # * <tt>:hoverclass</tt> - If set, the +drop_receiving_element+ will have
+      #   this additional CSS class when an accepted +draggable_element+ is
+      #   hovered over it.                         
+      #                          
+      # * <tt>:onDrop</tt> - Called when a +draggable_element+ is dropped onto
+      #   this element. Override this callback with a JavaScript expression to 
+      #   change the default drop behavour. Example:
+      #                          
+      #     :onDrop => "function(draggable_element, droppable_element, event) { alert('I like bananas') }"
+      #                          
+      #   This callback gets three parameters: The Draggable element, the Droppable
+      #   element and the Event object. You can extract additional information about
+      #   the drop - like if the Ctrl or Shift keys were pressed - from the Event object.
+      #                          
+      # * <tt>:with</tt> - A JavaScript expression specifying the parameters for
+      #   the XMLHttpRequest. Any expressions should return a valid URL query string.
       def drop_receiving_element(element_id, options = {})
         javascript_tag(drop_receiving_element_js(element_id, options).chop!)
       end
@@ -192,6 +215,9 @@ module ActionView
         options[:accept] = array_or_string_for_javascript(options[:accept]) if options[:accept]    
         options[:hoverclass] = "'#{options[:hoverclass]}'" if options[:hoverclass]
         
+        # Confirmation happens during the onDrop callback, so it can be removed from the options
+        options.delete(:confirm) if options[:confirm]
+
         %(Droppables.add(#{element_id.to_json}, #{options_for_javascript(options)});)
       end
     end

data/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb

@@ -1,5 +1,6 @@
 require 'cgi'
 require 'erb'
+require 'set'
 
 module ActionView
   module Helpers #:nodoc:
@@ -8,7 +9,8 @@ module ActionView
     module TagHelper
       include ERB::Util
 
-      BOOLEAN_ATTRIBUTES = Set.new(%w(disabled readonly multiple))
+      BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple).to_set
+      BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map(&:to_sym))
 
       # Returns an empty HTML tag of type +name+ which by default is XHTML 
       # compliant. Set +open+ to true to create an open tag compatible 
@@ -37,7 +39,7 @@ module ActionView
       #   tag("img", { :src => "open & shut.png" }, false, false)
       #   # => <img src="open &amp; shut.png" />
       def tag(name, options = nil, open = false, escape = true)
-        "<#{name}#{tag_options(options, escape) if options}" + (open ? ">" : " />")
+        "<#{name}#{tag_options(options, escape) if options}#{open ? ">" : " />"}"
       end
 
       # Returns an HTML block tag of type +name+ surrounding the +content+. Add
@@ -114,7 +116,6 @@ module ActionView
             if escape
               options.each do |key, value|
                 next unless value
-                key = key.to_s
                 value = BOOLEAN_ATTRIBUTES.include?(key) ? key : escape_once(value)
                 attrs << %(#{key}="#{value}")
               end

data/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb

@@ -3,19 +3,19 @@ require 'html/document'
 
 module ActionView
   module Helpers #:nodoc:
-    # The TextHelper module provides a set of methods for filtering, formatting 
-    # and transforming strings, which can reduce the amount of inline Ruby code in 
-    # your views. These helper methods extend ActionView making them callable 
+    # The TextHelper module provides a set of methods for filtering, formatting
+    # and transforming strings, which can reduce the amount of inline Ruby code in
+    # your views. These helper methods extend ActionView making them callable
     # within your template files.
-    module TextHelper  
-      # The preferred method of outputting text in your views is to use the 
-      # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods 
-      # do not operate as expected in an eRuby code block. If you absolutely must 
+    module TextHelper
+      # The preferred method of outputting text in your views is to use the
+      # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods
+      # do not operate as expected in an eRuby code block. If you absolutely must
       # output text within a non-output code block (i.e., <% %>), you can use the concat method.
       #
       # ==== Examples
-      #   <% 
-      #       concat "hello", binding 
+      #   <%
+      #       concat "hello", binding
       #       # is the equivalent of <%= "hello" %>
       #
       #       if (logged_in == true):
@@ -29,43 +29,54 @@ module ActionView
         eval(ActionView::Base.erb_variable, binding) << string
       end
 
-      # If +text+ is longer than +length+, +text+ will be truncated to the length of 
-      # +length+ (defaults to 30) and the last characters will be replaced with the +truncate_string+
-      # (defaults to "...").
-      #
-      # ==== Examples
-      #   truncate("Once upon a time in a world far far away", 14)  
-      #   # => Once upon a...
-      #
-      #   truncate("Once upon a time in a world far far away")  
-      #   # => Once upon a time in a world f...
-      #
-      #   truncate("And they found that many people were sleeping better.", 25, "(clipped)")
-      #   # => And they found that many (clipped)
-      #
-      #   truncate("And they found that many people were sleeping better.", 15, "... (continued)")
-      #   # => And they found... (continued)
-      def truncate(text, length = 30, truncate_string = "...")
-        if text.nil? then return end
-        l = length - truncate_string.chars.length
-        (text.chars.length > length ? text.chars[0...l] + truncate_string : text).to_s
+      if RUBY_VERSION < '1.9'
+        # If +text+ is longer than +length+, +text+ will be truncated to the length of
+        # +length+ (defaults to 30) and the last characters will be replaced with the +truncate_string+
+        # (defaults to "...").
+        #
+        # ==== Examples
+        #   truncate("Once upon a time in a world far far away", 14)
+        #   # => Once upon a...
+        #
+        #   truncate("Once upon a time in a world far far away")
+        #   # => Once upon a time in a world f...
+        #
+        #   truncate("And they found that many people were sleeping better.", 25, "(clipped)")
+        #   # => And they found that many (clipped)
+        #
+        #   truncate("And they found that many people were sleeping better.", 15, "... (continued)")
+        #   # => And they found... (continued)
+        def truncate(text, length = 30, truncate_string = "...")
+          if text
+            l = length - truncate_string.chars.length
+            chars = text.chars
+            (chars.length > length ? chars[0...l] + truncate_string : text).to_s
+          end
+        end
+      else
+        def truncate(text, length = 30, truncate_string = "...") #:nodoc:
+          if text
+            l = length - truncate_string.length
+            (text.length > length ? text[0...l] + truncate_string : text).to_s
+          end
+        end
       end
 
       # Highlights one or more +phrases+ everywhere in +text+ by inserting it into
-      # a +highlighter+ string. The highlighter can be specialized by passing +highlighter+ 
+      # a +highlighter+ string. The highlighter can be specialized by passing +highlighter+
       # as a single-quoted string with \1 where the phrase is to be inserted (defaults to
       # '<strong class="highlight">\1</strong>')
       #
       # ==== Examples
-      #   highlight('You searched for: rails', 'rails')  
+      #   highlight('You searched for: rails', 'rails')
       #   # => You searched for: <strong class="highlight">rails</strong>
       #
       #   highlight('You searched for: ruby, rails, dhh', 'actionpack')
-      #   # => You searched for: ruby, rails, dhh 
+      #   # => You searched for: ruby, rails, dhh
       #
-      #   highlight('You searched for: rails', ['for', 'rails'], '<em>\1</em>')  
+      #   highlight('You searched for: rails', ['for', 'rails'], '<em>\1</em>')
       #   # => You searched <em>for</em>: <em>rails</em>
-      # 
+      #
       #   highlight('You searched for: rails', 'rails', "<a href='search?q=\1'>\1</a>")
       #   # => You searched for: <a href='search?q=rails>rails</a>
       def highlight(text, phrases, highlighter = '<strong class="highlight">\1</strong>')
@@ -77,71 +88,83 @@ module ActionView
         end
       end
 
-      # Extracts an excerpt from +text+ that matches the first instance of +phrase+. 
-      # The +radius+ expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
-      # defined in +radius+ (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
-      # then the +excerpt_string+ will be prepended/appended accordingly. If the +phrase+ 
-      # isn't found, nil is returned.
-      #
-      # ==== Examples
-      #   excerpt('This is an example', 'an', 5) 
-      #   # => "...s is an examp..."
-      #
-      #   excerpt('This is an example', 'is', 5) 
-      #   # => "This is an..."
-      #
-      #   excerpt('This is an example', 'is') 
-      #   # => "This is an example"
-      #
-      #   excerpt('This next thing is an example', 'ex', 2) 
-      #   # => "...next t..."
-      #
-      #   excerpt('This is also an example', 'an', 8, '<chop> ')
-      #   # => "<chop> is also an example"
-      def excerpt(text, phrase, radius = 100, excerpt_string = "...")
-        if text.nil? || phrase.nil? then return end
-        phrase = Regexp.escape(phrase)
+      if RUBY_VERSION < '1.9'
+        # Extracts an excerpt from +text+ that matches the first instance of +phrase+.
+        # The +radius+ expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
+        # defined in +radius+ (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
+        # then the +excerpt_string+ will be prepended/appended accordingly. The resulting string will be stripped in any case.
+        # If the +phrase+ isn't found, nil is returned.
+        #
+        # ==== Examples
+        #   excerpt('This is an example', 'an', 5)
+        #   # => "...s is an exam..."
+        #
+        #   excerpt('This is an example', 'is', 5)
+        #   # => "This is a..."
+        #
+        #   excerpt('This is an example', 'is')
+        #   # => "This is an example"
+        #
+        #   excerpt('This next thing is an example', 'ex', 2)
+        #   # => "...next..."
+        #
+        #   excerpt('This is also an example', 'an', 8, '<chop> ')
+        #   # => "<chop> is also an example"
+        def excerpt(text, phrase, radius = 100, excerpt_string = "...")
+          if text && phrase
+            phrase = Regexp.escape(phrase)
 
-        if found_pos = text.chars =~ /(#{phrase})/i
-          start_pos = [ found_pos - radius, 0 ].max
-          end_pos   = [ found_pos + phrase.chars.length + radius, text.chars.length ].min
+            if found_pos = text.chars =~ /(#{phrase})/i
+              start_pos = [ found_pos - radius, 0 ].max
+              end_pos   = [ [ found_pos + phrase.chars.length + radius - 1, 0].max, text.chars.length ].min
 
-          prefix  = start_pos > 0 ? excerpt_string : ""
-          postfix = end_pos < text.chars.length ? excerpt_string : ""
+              prefix  = start_pos > 0 ? excerpt_string : ""
+              postfix = end_pos < text.chars.length - 1 ? excerpt_string : ""
 
-          prefix + text.chars[start_pos..end_pos].strip + postfix
-        else
-          nil
+              prefix + text.chars[start_pos..end_pos].strip + postfix
+            else
+              nil
+            end
+          end
+        end
+      else
+        def excerpt(text, phrase, radius = 100, excerpt_string = "...") #:nodoc:
+          if text && phrase
+            phrase = Regexp.escape(phrase)
+
+            if found_pos = text =~ /(#{phrase})/i
+              start_pos = [ found_pos - radius, 0 ].max
+              end_pos   = [ [ found_pos + phrase.length + radius - 1, 0].max, text.length ].min
+
+              prefix  = start_pos > 0 ? excerpt_string : ""
+              postfix = end_pos < text.length - 1 ? excerpt_string : ""
+
+              prefix + text[start_pos..end_pos].strip + postfix
+            else
+              nil
+            end
+          end
         end
       end
 
-      # Attempts to pluralize the +singular+ word unless +count+ is 1. If +plural+
-      # is supplied, it will use that when count is > 1, if the ActiveSupport Inflector 
-      # is loaded, it will use the Inflector to determine the plural form, otherwise 
-      # it will just add an 's' to the +singular+ word.
+      # Attempts to pluralize the +singular+ word unless +count+ is 1. If
+      # +plural+ is supplied, it will use that when count is > 1, otherwise
+      # it will use the Inflector to determine the plural form
       #
       # ==== Examples
-      #   pluralize(1, 'person')           
+      #   pluralize(1, 'person')
       #   # => 1 person
       #
-      #   pluralize(2, 'person')           
+      #   pluralize(2, 'person')
       #   # => 2 people
       #
-      #   pluralize(3, 'person', 'users')  
+      #   pluralize(3, 'person', 'users')
       #   # => 3 users
       #
       #   pluralize(0, 'person')
       #   # => 0 people
       def pluralize(count, singular, plural = nil)
-         "#{count || 0} " + if count == 1 || count == '1'
-          singular
-        elsif plural
-          plural
-        elsif Object.const_defined?("Inflector")
-          Inflector.pluralize(singular)
-        else
-          singular + "s"
-        end
+        "#{count || 0} " + ((count == 1 || count == '1') ? singular : (plural || singular.pluralize))
       end
 
       # Wraps the +text+ into lines no longer than +line_width+ width. This method
@@ -197,7 +220,7 @@ module ActionView
           end
         end
 
-        # Returns the text with all the Textile codes turned into HTML tags, 
+        # Returns the text with all the Textile codes turned into HTML tags,
         # but without the bounding <p> tag that RedCloth adds.
         #
         # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
@@ -241,57 +264,62 @@ module ActionView
         #   # => "<p>We like to <em>write</em> <code>code</code>, not just <em>read</em> it!</p>"
         #
         #   markdown("The [Markdown website](http://daringfireball.net/projects/markdown/) has more information.")
-        #   # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a> 
+        #   # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a>
         #   #     has more information.</p>"
         #
         #   markdown('![The ROR logo](http://rubyonrails.com/images/rails.png "Ruby on Rails")')
-        #   # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'     
+        #   # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
         def markdown(text)
           text.blank? ? "" : BlueCloth.new(text).to_html
         end
       rescue LoadError
         # We can't really help what's not there
       end
-      
+
       # Returns +text+ transformed into HTML using simple formatting rules.
-      # Two or more consecutive newlines(<tt>\n\n</tt>) are considered as a 
+      # Two or more consecutive newlines(<tt>\n\n</tt>) are considered as a
       # paragraph and wrapped in <tt><p></tt> tags. One newline (<tt>\n</tt>) is
       # considered as a linebreak and a <tt><br /></tt> tag is appended. This
-      # method does not remove the newlines from the +text+. 
+      # method does not remove the newlines from the +text+.
       #
+      # You can pass any HTML attributes into <tt>html_options</tt>.  These
+      # will be added to all created paragraphs.
       # ==== Examples
-      #   my_text = """Here is some basic text...
-      #             ...with a line break."""
+      #   my_text = "Here is some basic text...\n...with a line break."
       #
       #   simple_format(my_text)
-      #   # => "<p>Here is some basic text...<br />...with a line break.</p>"
+      #   # => "<p>Here is some basic text...\n<br />...with a line break.</p>"
       #
-      #   more_text = """We want to put a paragraph...
-      #     
-      #               ...right there."""
+      #   more_text = "We want to put a paragraph...\n\n...right there."
       #
       #   simple_format(more_text)
-      #   # => "<p>We want to put a paragraph...</p><p>...right there.</p>"
-      def simple_format(text)
-        content_tag 'p', text.to_s.
-          gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
-          gsub(/\n\n+/, "</p>\n\n<p>").           # 2+ newline  -> paragraph
-          gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
+      #   # => "<p>We want to put a paragraph...</p>\n\n<p>...right there.</p>"
+      #
+      #   simple_format("Look ma! A class!", :class => 'description')
+      #   # => "<p class='description'>Look ma! A class!</p>"
+      def simple_format(text, html_options={})
+        start_tag = tag('p', html_options, true)
+        text = text.to_s.dup
+        text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
+        text.gsub!(/\n\n+/, "</p>\n\n#{start_tag}")  # 2+ newline  -> paragraph
+        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
+        text.insert 0, start_tag
+        text << "</p>"
       end
 
-      # Turns all URLs and e-mail addresses into clickable links. The +link+ parameter 
+      # Turns all URLs and e-mail addresses into clickable links. The +link+ parameter
       # will limit what should be linked. You can add HTML attributes to the links using
-      # +href_options+. Options for +link+ are <tt>:all</tt> (default), 
-      # <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and 
+      # +href_options+. Options for +link+ are <tt>:all</tt> (default),
+      # <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and
       # e-mail address is yielded and the result is used as the link text.
       #
       # ==== Examples
-      #   auto_link("Go to http://www.rubyonrails.org and say hello to david@loudthinking.com") 
+      #   auto_link("Go to http://www.rubyonrails.org and say hello to david@loudthinking.com")
       #   # => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> and
       #   #     say hello to <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
       #
       #   auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :urls)
-      #   # => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a> 
+      #   # => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a>
       #   #     or e-mail david@loudthinking.com"
       #
       #   auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :email_addresses)
@@ -301,9 +329,9 @@ module ActionView
       #   auto_link(post_body, :all, :target => '_blank') do |text|
       #     truncate(text, 15)
       #   end
-      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>.  
+      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>.
       #         Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
-      #   
+      #
       def auto_link(text, link = :all, href_options = {}, &block)
         return '' if text.blank?
         case link
@@ -312,15 +340,15 @@ module ActionView
           when :urls            then auto_link_urls(text, href_options, &block)
         end
       end
-      
+
       # Creates a Cycle object whose _to_s_ method cycles through elements of an
-      # array every time it is called. This can be used for example, to alternate 
-      # classes for table rows.  You can use named cycles to allow nesting in loops.  
-      # Passing a Hash as the last parameter with a <tt>:name</tt> key will create a 
-      # named cycle.  You can manually reset a cycle by calling reset_cycle and passing the 
+      # array every time it is called. This can be used for example, to alternate
+      # classes for table rows.  You can use named cycles to allow nesting in loops.
+      # Passing a Hash as the last parameter with a <tt>:name</tt> key will create a
+      # named cycle.  You can manually reset a cycle by calling reset_cycle and passing the
       # name of the cycle.
       #
-      # ==== Examples 
+      # ==== Examples
       #   # Alternate CSS classes for even and odd numbers...
       #   @items = [1,2,3,4]
       #   <table>
@@ -333,8 +361,8 @@ module ActionView
       #
       #
       #   # Cycle CSS classes for rows, and text colors for values within each row
-      #   @items = x = [{:first => 'Robert', :middle => 'Daniel', :last => 'James'}, 
-      #                {:first => 'Emily', :middle => 'Shannon', :maiden => 'Pike', :last => 'Hicks'}, 
+      #   @items = x = [{:first => 'Robert', :middle => 'Daniel', :last => 'James'},
+      #                {:first => 'Emily', :middle => 'Shannon', :maiden => 'Pike', :last => 'Hicks'},
       #               {:first => 'June', :middle => 'Dae', :last => 'Jones'}]
       #   <% @items.each do |item| %>
       #     <tr class="<%= cycle("even", "odd", :name => "row_class") -%>">
@@ -364,8 +392,8 @@ module ActionView
         end
         return cycle.to_s
       end
-      
-      # Resets a cycle so that it starts from the first element the next time 
+
+      # Resets a cycle so that it starts from the first element the next time
       # it is called. Pass in +name+ to reset a named cycle.
       #
       # ==== Example
@@ -391,12 +419,12 @@ module ActionView
 
       class Cycle #:nodoc:
         attr_reader :values
-        
+
         def initialize(first_value, *values)
           @values = values.unshift(first_value)
           reset
         end
-        
+
         def reset
           @index = 0
         end
@@ -416,7 +444,7 @@ module ActionView
           @_cycles = Hash.new unless defined?(@_cycles)
           return @_cycles[name]
         end
-        
+
         def set_cycle(name, cycle_object)
           @_cycles = Hash.new unless defined?(@_cycles)
           @_cycles[name] = cycle_object
@@ -425,22 +453,22 @@ module ActionView
         AUTO_LINK_RE = %r{
                         (                          # leading text
                           <\w+.*?>|                # leading HTML tag, or
-                          [^=!:'"/]|               # leading punctuation, or 
+                          [^=!:'"/]|               # leading punctuation, or
                           ^                        # beginning of line
                         )
                         (
                           (?:https?://)|           # protocol spec, or
                           (?:www\.)                # www.*
-                        ) 
+                        )
                         (
                           [-\w]+                   # subdomain or domain
                           (?:\.[-\w]+)*            # remaining subdomains or domain
                           (?::\d+)?                # port
-                          (?:/(?:(?:[~\w\+@%-]|(?:[,.;:][^\s$]))+)?)* # path
+                          (?:/(?:(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))+)?)* # path
                           (?:\?[\w\+@%&=.;-]+)?     # query string
                           (?:\#[\w\-]*)?           # trailing anchor
                         )
-                        ([[:punct:]]|\s|<|$)       # trailing text
+                        ([[:punct:]]|<|$|)       # trailing text
                        }x unless const_defined?(:AUTO_LINK_RE)
 
         # Turns all urls into clickable links.  If a block is given, each url
@@ -465,7 +493,7 @@ module ActionView
           body = text.dup
           text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
             text = $1
-            
+
             if body.match(/<a\b[^>]*>(.*)(#{Regexp.escape(text)})(.*)<\/a>/)
               text
             else