actionpack 1.12.5 → 1.13.0

data/lib/action_view/helpers/url_helper.rb

@@ -1,22 +1,21 @@
 require File.dirname(__FILE__) + '/javascript_helper'
 
 module ActionView
-  module Helpers
-    # Provides a set of methods for making easy links and getting urls that depend on the controller and action. This means that
-    # you can use the same format for links in the views that you do in the controller. The different methods are even named
-    # synchronously, so link_to uses that same url as is generated by url_for, which again is the same url used for
-    # redirection in redirect_to.
+  module Helpers #:nodoc:
+    # Provides a set of methods for making easy links and getting urls that 
+    # depend on the controller and action. This means that you can use the 
+    # same format for links in the views that you do in the controller.
     module UrlHelper
       include JavaScriptHelper
       
-      # Returns the URL for the set of +options+ provided. This takes the same options 
-      # as url_for. For a list, see the documentation for ActionController::Base#url_for.
-      # Note that it'll set :only_path => true so you'll get /controller/action instead of the 
-      # http://example.com/controller/action part (makes it harder to parse httpd log files)
-      # 
-      # When called from a view, url_for returns an HTML escaped url. If you need an unescaped
-      # url, pass :escape => false to url_for.
-      # 
+      # Returns the URL for the set of +options+ provided. This takes the 
+      # same options as url_for in action controller. For a list, see the 
+      # documentation for ActionController::Base#url_for. Note that it'll 
+      # set :only_path => true so you'll get the relative /controller/action 
+      # instead of the fully qualified http://example.com/controller/action.
+      #  
+      # When called from a view, url_for returns an HTML escaped url. If you 
+      # need an unescaped url, pass :escape => false in the +options+.
       def url_for(options = {}, *parameters_for_method_reference)
         if options.kind_of? Hash
           options = { :only_path => true }.update(options.symbolize_keys)
@@ -24,30 +23,46 @@ module ActionView
         else
           escape = true
         end
+
         url = @controller.send(:url_for, options, *parameters_for_method_reference)
         escape ? html_escape(url) : url
       end
 
-      # Creates a link tag of the given +name+ using an URL created by the set of +options+. See the valid options in
-      # the documentation for ActionController::Base#url_for. It's also possible to pass a string instead of an options hash to
-      # get a link tag that just points without consideration. If nil is passed as a name, the link itself will become the name.
+      # Creates a link tag of the given +name+ using a URL created by the set 
+      # of +options+. See the valid options in the documentation for 
+      # ActionController::Base#url_for. It's also possible to pass a string instead 
+      # of an options hash to get a link tag that uses the value of the string as the 
+      # href for the link. If nil is passed as a name, the link itself will become 
+      # the name.
       #
-      # The html_options has three special features. One for creating javascript confirm alerts where if you pass :confirm => 'Are you sure?',
-      # the link will be guarded with a JS popup asking that question. If the user accepts, the link is processed, otherwise not.
+      # The +html_options+ will accept a hash of html attributes for the link tag.
+      # It also accepts 3 modifiers that specialize the link behavior. 
       #
-      # Another for creating a popup window, which is done by either passing :popup with true or the options of the window in 
-      # Javascript form.
+      # * <tt>:confirm => 'question?'</tt>: This will add a JavaScript confirm 
+      #   prompt with the question specified. If the user accepts, the link is 
+      #   processed normally, otherwise no action is taken.
+      # * <tt>:popup => true || array of window options</tt>: This will force the 
+      #   link to open in a popup window. By passing true, a default browser window 
+      #   will be opened with the URL. You can also specify an array of options 
+      #   that are passed-thru to JavaScripts window.open method.
+      # * <tt>:method => symbol of HTTP verb</tt>: This modifier will dynamically
+      #   create an HTML form and immediately submit the form for processing using 
+      #   the HTTP verb specified. Useful for having links perform a POST operation
+      #   in dangerous actions like deleting a record (which search bots can follow
+      #   while spidering your site). Supported verbs are :post, :delete and :put.
+      #   Note that if the user has JavaScript disabled, the request will fall back 
+      #   to using GET. If you are relying on the POST behavior, your should check
+      #   for it in your controllers action by using the request objects methods
+      #   for post?, delete? or put?.
       #
-      # And a third for making the link do a POST request (instead of the regular GET) through a dynamically added form element that
-      # is instantly submitted. Note that if the user has turned off Javascript, the request will fall back on the GET. So its
-      # your responsibility to determine what the action should be once it arrives at the controller. The POST form is turned on by
-      # passing :post as true. Note, it's not possible to use POST requests and popup targets at the same time (an exception will be thrown).
+      # You can mix and match the +html_options+ with the exception of
+      # :popup and :method which will raise an ActionView::ActionViewError
+      # exception.
       #
-      # Examples:
-      #   link_to "Delete this page", { :action => "destroy", :id => @page.id }, :confirm => "Are you sure?"
+      #   link_to "Visit Other Site", "http://www.rubyonrails.org/", :confirm => "Are you sure?"
       #   link_to "Help", { :action => "help" }, :popup => true
-      #   link_to "Busy loop", { :action => "busy" }, :popup => ['new_window', 'height=300,width=600']
-      #   link_to "Destroy account", { :action => "destroy" }, :confirm => "Are you sure?", :post => true
+      #   link_to "View Image", { :action => "view" }, :popup => ['new_window_name', 'height=300,width=600']
+      #   link_to "Delete Image", { :action => "delete", :id => @image.id }, :confirm => "Are you sure?", :method => :delete
       def link_to(name, options = {}, html_options = nil, *parameters_for_method_reference)
         if html_options
           html_options = html_options.stringify_keys
@@ -56,76 +71,77 @@ module ActionView
         else
           tag_options = nil
         end
+
         url = options.is_a?(String) ? options : self.url_for(options, *parameters_for_method_reference)
         "<a href=\"#{url}\"#{tag_options}>#{name || url}</a>"
       end
 
-      # Generates a form containing a sole button that submits to the
-      # URL given by _options_.  Use this method instead of +link_to+
-      # for actions that do not have the safe HTTP GET semantics
-      # implied by using a hypertext link.
+      # Generates a form containing a single button that submits to the URL created
+      # by the set of +options+. This is the safest method to ensure links that
+      # cause changes to your data are not triggered by search bots or accelerators.
+      # If the HTML button does not work with your layout, you can also consider
+      # using the link_to method with the <tt>:method</tt> modifier as described in
+      # the link_to documentation.
       #
-      # The parameters are the same as for +link_to+.  Any _html_options_
-      # that you pass will be applied to the inner +input+ element.
-      # In particular, pass
-      # 
-      #   :disabled => true/false
-      #
-      # as part of _html_options_ to control whether the button is
-      # disabled.  The generated form element is given the class
-      # 'button-to', to which you can attach CSS styles for display
-      # purposes.
-      #
-      # Example 1:
+      # The generated FORM element has a class name of <tt>button-to</tt>
+      # to allow styling of the form itself and its children. You can control
+      # the form submission and input element behavior using +html_options+.
+      # This method accepts the <tt>:method</tt> and <tt>:confirm</tt> modifiers
+      # described in the link_to documentation. If no <tt>:method</tt> modifier
+      # is given, it will default to performing a POST operation. You can also 
+      # disable the button by passing <tt>:disabled => true</tt> in +html_options+.
       #
-      #   # inside of controller for "feeds"
-      #   button_to "Edit", :action => 'edit', :id => 3
+      #   button_to "New", :action => "new"
       #
-      # Generates the following HTML (sans formatting):
+      # Generates the following HTML:
       #
-      #   <form method="post" action="/feeds/edit/3" class="button-to">
-      #     <div><input value="Edit" type="submit" /></div>
+      #   <form method="post" action="/controller/new" class="button-to">
+      #     <div><input value="New" type="submit" /></div>
       #   </form>
       #
-      # Example 2:
+      # If you are using RESTful routes, you can pass the <tt>:method</tt>
+      # to change the HTTP verb used to submit the form.
       #
-      #   button_to "Destroy", { :action => 'destroy', :id => 3 },
-      #             :confirm => "Are you sure?"
+      #   button_to "Delete Image", { :action => "delete", :id => @image.id },
+      #             :confirm => "Are you sure?", :method => :delete
       #
-      # Generates the following HTML (sans formatting):
+      # Which generates the following HTML:
       #
-      #   <form method="post" action="/feeds/destroy/3" class="button-to">
-      #     <div><input onclick="return confirm('Are you sure?');"
-      #                 value="Destroy" type="submit" />
+      #   <form method="post" action="/images/delete/1" class="button-to">
+      #     <div>
+      #       <input type="hidden" name="_method" value="delete" />
+      #       <input onclick="return confirm('Are you sure?');"
+      #                 value="Delete" type="submit" />
       #     </div>
       #   </form>
-      #
-      # *NOTE*: This method generates HTML code that represents a form.
-      # Forms are "block" content, which means that you should not try to
-      # insert them into your HTML where only inline content is expected.
-      # For example, you can legally insert a form inside of a +div+ or
-      # +td+ element or in between +p+ elements, but not in the middle of
-      # a run of text, nor can you place a form within another form.
-      # (Bottom line: Always validate your HTML before going public.)
-      def button_to(name, options = {}, html_options = nil)
-        html_options = (html_options || {}).stringify_keys
+      def button_to(name, options = {}, html_options = {})
+        html_options = html_options.stringify_keys
         convert_boolean_attributes!(html_options, %w( disabled ))
-        
+
+        method_tag = ''
+        if (method = html_options.delete('method')) && %w{put delete}.include?(method.to_s)
+          method_tag = tag('input', :type => 'hidden', :name => '_method', :value => method.to_s)
+        end
+
+        form_method = method.to_s == 'get' ? 'get' : 'post'
+
         if confirm = html_options.delete("confirm")
           html_options["onclick"] = "return #{confirm_javascript_function(confirm)};"
         end
-        
-        url = options.is_a?(String) ? options : url_for(options)
+
+        url = options.is_a?(String) ? options : self.url_for(options)
         name ||= url
-        
-        html_options.merge!("type" => "submit", "value" => name)
 
-        "<form method=\"post\" action=\"#{h url}\" class=\"button-to\"><div>" +
-          tag("input", html_options) + "</div></form>"
+        html_options.merge!("type" => "submit", "value" => name)
+        
+        "<form method=\"#{form_method}\" action=\"#{escape_once url}\" class=\"button-to\"><div>" + 
+          method_tag + tag("input", html_options) + "</div></form>"
       end
 
 
-      # This tag is deprecated. Combine the link_to and AssetTagHelper::image_tag yourself instead, like:
+      # DEPRECATED. It is reccommended to use the AssetTagHelper::image_tag within
+      # a link_to method to generate a linked image.
+      # 
       #   link_to(image_tag("rss", :size => "30x45", :border => 0), "http://www.example.com")
       def link_image_to(src, options = {}, html_options = {}, *parameters_for_method_reference)
         image_options = { "src" => src.include?("/") ? src : "/images/#{src}" }
@@ -157,18 +173,42 @@ module ActionView
         link_to(tag("img", image_options), options, html_options, *parameters_for_method_reference)
       end
 
-      alias_method :link_to_image, :link_image_to # deprecated name
+      alias_method :link_to_image, :link_image_to
+      deprecate :link_to_image => "use link_to(image_tag(...), url)",
+        :link_image_to => "use link_to(image_tag(...), url)"
 
-      # Creates a link tag of the given +name+ using an URL created by the set of +options+, unless the current
-      # request uri is the same as the link's, in which case only the name is returned (or the
-      # given block is yielded, if one exists). This is useful for creating link bars where you don't want to link
-      # to the page currently being viewed.
+      # Creates a link tag of the given +name+ using a URL created by the set of
+      # +options+ unless the current request uri is the same as the links, in 
+      # which case only the name is returned (or the given block is yielded, if
+      # one exists). Refer to the documentation for link_to_unless for block usage.
+      #
+      #   <ul id="navbar">
+      #     <li><%= link_to_unless_current("Home", { :action => "index" }) %></li>
+      #     <li><%= link_to_unless_current("About Us", { :action => "about" }) %></li>
+      #   </ul>
+      #
+      # This will render the following HTML when on the about us page:
+      #
+      #   <ul id="navbar">
+      #     <li><a href="/controller/index">Home</a></li>
+      #     <li>About Us</li>
+      #   </ul>
       def link_to_unless_current(name, options = {}, html_options = {}, *parameters_for_method_reference, &block)
         link_to_unless current_page?(options), name, options, html_options, *parameters_for_method_reference, &block
       end
 
-      # Create a link tag of the given +name+ using an URL created by the set of +options+, unless +condition+
-      # is true, in which case only the name is returned (or the given block is yielded, if one exists). 
+      # Creates a link tag of the given +name+ using a URL created by the set of
+      # +options+ unless +condition+ is true, in which case only the name is 
+      # returned. To specialize the default behavior, you can pass a block that
+      # accepts the name or the full argument list for link_to_unless (see the example).
+      #
+      #   <%= link_to_unless(@current_user.nil?, "Reply", { :action => "reply" }) %>
+      #
+      # This example uses a block to modify the link if the condition isn't met.
+      #
+      #   <%= link_to_unless(@current_user.nil?, "Reply", { :action => "reply" }) do |name|
+      #      link_to(name, { :controller => "accounts", :action => "signup" })
+      #    end %>     
       def link_to_unless(condition, name, options = {}, html_options = {}, *parameters_for_method_reference, &block)
         if condition
           if block_given?
@@ -181,30 +221,56 @@ module ActionView
         end  
       end
       
-      # Create a link tag of the given +name+ using an URL created by the set of +options+, if +condition+
-      # is true, in which case only the name is returned (or the given block is yielded, if one exists). 
+      # Creates a link tag of the given +name+ using a URL created by the set of
+      # +options+ if +condition+ is true, in which case only the name is 
+      # returned. To specialize the default behavior, you can pass a block that
+      # accepts the name or the full argument list for link_to_unless (see the examples
+      # in link_to_unless).
       def link_to_if(condition, name, options = {}, html_options = {}, *parameters_for_method_reference, &block)
         link_to_unless !condition, name, options, html_options, *parameters_for_method_reference, &block
       end
 
-      # Creates a link tag for starting an email to the specified <tt>email_address</tt>, which is also used as the name of the
-      # link unless +name+ is specified. Additional HTML options, such as class or id, can be passed in the <tt>html_options</tt> hash.
+      # Creates a mailto link tag to the specified +email_address+, which is
+      # also used as the name of the link unless +name+ is specified. Additional
+      # html attributes for the link can be passed in +html_options+.
+      #
+      # mail_to has several methods for hindering email harvestors and customizing
+      # the email itself by passing special keys to +html_options+.
+      #
+      # Special HTML Options:
+      #
+      # * <tt>:encode</tt>  - This key will accept the strings "javascript" or "hex".
+      #   Passing "javascript" will dynamically create and encode the mailto: link then
+      #   eval it into the DOM of the page. This method will not show the link on
+      #   the page if the user has JavaScript disabled. Passing "hex" will hex
+      #   encode the +email_address+ before outputting the mailto: link.
+      # * <tt>:replace_at</tt>  - When the link +name+ isn't provided, the
+      #   +email_address+ is used for the link label. You can use this option to
+      #   obfuscate the +email_address+ by substituting the @ sign with the string
+      #   given as the value.
+      # * <tt>:replace_dot</tt>  - When the link +name+ isn't provided, the
+      #   +email_address+ is used for the link label. You can use this option to
+      #   obfuscate the +email_address+ by substituting the . in the email with the
+      #   string given as the value.
+      # * <tt>:subject</tt>  - Preset the subject line of the email.
+      # * <tt>:body</tt> - Preset the body of the email.
+      # * <tt>:cc</tt>  - Carbon Copy addition recipients on the email.
+      # * <tt>:bcc</tt>  - Blind Carbon Copy additional recipients on the email.
       #
-      # You can also make it difficult for spiders to harvest email address by obfuscating them.
       # Examples:
+      #   mail_to "me@domain.com"  # => <a href="mailto:me@domain.com">me@domain.com</a>
       #   mail_to "me@domain.com", "My email", :encode => "javascript"  # =>
-      #     <script type="text/javascript" language="javascript">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>
+      #     <script type="text/javascript">eval(unescape('%64%6f%63...%6d%65%6e'))</script>
       #
       #   mail_to "me@domain.com", "My email", :encode => "hex"  # =>
       #     <a href="mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">My email</a>
       #
-      # You can also specify the cc address, bcc address, subject, and body parts of the message header to create a complex e-mail using the
-      # corresponding +cc+, +bcc+, +subject+, and +body+ <tt>html_options</tt> keys. Each of these options are URI escaped and then appended to
-      # the <tt>email_address</tt> before being output. <b>Be aware that javascript keywords will not be escaped and may break this feature
-      # when encoding with javascript.</b>
-      # Examples:
-      #   mail_to "me@domain.com", "My email", :cc => "ccaddress@domain.com", :bcc => "bccaddress@domain.com", :subject => "This is an example email", :body => "This is the body of the message."   # =>
-      #     <a href="mailto:me@domain.com?cc="ccaddress@domain.com"&bcc="bccaddress@domain.com"&body="This%20is%20the%20body%20of%20the%20message."&subject="This%20is%20an%20example%20email">My email</a>
+      #   mail_to "me@domain.com", nil, :replace_at => "_at_", :replace_dot => "_dot_", :class => "email"  # =>
+      #     <a href="mailto:me@domain.com" class="email">me_at_domain_dot_com</a>
+      #
+      #   mail_to "me@domain.com", "My email", :cc => "ccaddress@domain.com", 
+      #            :subject => "This is an example email"  # =>
+      #     <a href="mailto:me@domain.com?cc=ccaddress@domain.com&subject=This%20is%20an%20example%20email">My email</a>
       def mail_to(email_address, name = nil, html_options = {})
         html_options = html_options.stringify_keys
         encode = html_options.delete("encode")
@@ -218,17 +284,19 @@ module ActionView
         extras << "subject=#{CGI.escape(subject).gsub("+", "%20")}&" unless subject.nil?
         extras = "?" << extras.gsub!(/&?$/,"") unless extras.empty?
 
+        email_address = email_address.to_s
+
         email_address_obfuscated = email_address.dup
         email_address_obfuscated.gsub!(/@/, html_options.delete("replace_at")) if html_options.has_key?("replace_at")
         email_address_obfuscated.gsub!(/\./, html_options.delete("replace_dot")) if html_options.has_key?("replace_dot")
 
-        if encode == 'javascript'
-          tmp = "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address.to_s+extras }))}');"
+        if encode == "javascript"
+          tmp = "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');"
           for i in 0...tmp.length
             string << sprintf("%%%x",tmp[i])
           end
           "<script type=\"text/javascript\">eval(unescape('#{string}'))</script>"
-        elsif encode == 'hex'
+        elsif encode == "hex"
           for i in 0...email_address.length
             if email_address[i,1] =~ /\w/
               string << sprintf("%%%x",email_address[i])
@@ -242,26 +310,42 @@ module ActionView
         end
       end
 
-      # Returns true if the current page uri is generated by the options passed (in url_for format).
+      # True if the current request uri was generated by the given +options+.
       def current_page?(options)
-        CGI.escapeHTML(url_for(options)) == @controller.request.request_uri
+        url_string = CGI.escapeHTML(url_for(options))
+        request = @controller.request
+        if url_string =~ /^\w+:\/\//
+          url_string == "#{request.protocol}#{request.host_with_port}#{request.request_uri}"
+        else
+          url_string == request.request_uri
+        end
       end
 
       private
         def convert_options_to_javascript!(html_options)
-          confirm, popup, post = html_options.delete("confirm"), html_options.delete("popup"), html_options.delete("post")
+          confirm, popup = html_options.delete("confirm"), html_options.delete("popup")
+
+          # post is deprecated, but if its specified and method is not, assume that method = :post
+          method, post   = html_options.delete("method"), html_options.delete("post")
+          if !method && post
+            ActiveSupport::Deprecation.warn(
+              "Passing :post as a link modifier is deprecated. " +
+              "Use :method => \"post\" instead. :post will be removed in Rails 2.0."
+            )
+            method = :post
+          end
         
           html_options["onclick"] = case
-            when popup && post
+            when popup && method
               raise ActionView::ActionViewError, "You can't use :popup and :post in the same link"
             when confirm && popup
               "if (#{confirm_javascript_function(confirm)}) { #{popup_javascript_function(popup)} };return false;"
-            when confirm && post
-              "if (#{confirm_javascript_function(confirm)}) { #{post_javascript_function} };return false;"
+            when confirm && method
+              "if (#{confirm_javascript_function(confirm)}) { #{method_javascript_function(method)} };return false;"
             when confirm
               "return #{confirm_javascript_function(confirm)};"
-            when post
-              "#{post_javascript_function}return false;"
+            when method
+              "#{method_javascript_function(method)}return false;"
             when popup
               popup_javascript_function(popup) + 'return false;'
             else
@@ -277,8 +361,17 @@ module ActionView
           popup.is_a?(Array) ? "window.open(this.href,'#{popup.first}','#{popup.last}');" : "window.open(this.href);"
         end
         
-        def post_javascript_function
-          "var f = document.createElement('form'); this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit();"
+        def method_javascript_function(method)
+          submit_function = 
+            "var f = document.createElement('form'); f.style.display = 'none'; " +
+            "this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;"
+          
+          unless method == :post
+            submit_function << "var m = document.createElement('input'); m.setAttribute('type', 'hidden'); "
+            submit_function << "m.setAttribute('name', '_method'); m.setAttribute('value', '#{method}'); f.appendChild(m);"
+          end
+          
+          submit_function << "f.submit();"
         end
 
         # Processes the _html_options_ hash, converting the boolean

data/lib/action_view/template_error.rb

@@ -6,16 +6,22 @@ module ActionView
 
     attr_reader :original_exception
 
-    def initialize(base_path, file_name, assigns, source, original_exception)
-      @base_path, @assigns, @source, @original_exception = 
-        base_path, assigns, source, original_exception
-      @file_name = file_name
+    def initialize(base_path, file_path, assigns, source, original_exception)
+      @base_path, @assigns, @source, @original_exception =
+        base_path, assigns.dup, source, original_exception
+      @file_path = file_path
+
+      remove_deprecated_assigns!
     end
-  
+
     def message
-      original_exception.message
+      ActiveSupport::Deprecation.silence { original_exception.message }
+    end
+
+    def clean_backtrace
+      original_exception.clean_backtrace
     end
-  
+
     def sub_template_message
       if @sub_templates
         "Trace of template inclusion: " +
@@ -24,63 +30,81 @@ module ActionView
         ""
       end
     end
-  
-    def source_extract(indention = 0)
-      source_code = IO.readlines(@file_name)
-      
-      start_on_line = [ line_number - SOURCE_CODE_RADIUS - 1, 0 ].max
-      end_on_line   = [ line_number + SOURCE_CODE_RADIUS - 1, source_code.length].min
 
+    def source_extract(indentation = 0)
+      return unless num = line_number
+      num = num.to_i
+
+      source_code = IO.readlines(@file_path)
+
+      start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
+      end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
+
+      indent = ' ' * indentation
       line_counter = start_on_line
-      extract = source_code[start_on_line..end_on_line].collect do |line| 
+
+      source_code[start_on_line..end_on_line].sum do |line|
         line_counter += 1
-        "#{' ' * indention}#{line_counter}: " + line
+        "#{indent}#{line_counter}: #{line}"
       end
-
-      extract.join
     end
 
-    def sub_template_of(file_name)
+    def sub_template_of(template_path)
       @sub_templates ||= []
-      @sub_templates << file_name
+      @sub_templates << template_path
     end
-  
+
     def line_number
-      if file_name
-        regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
-        [@original_exception.message, @original_exception.clean_backtrace].flatten.each do |line|
-          return $1.to_i if regexp =~ line
+      @line_number ||=
+        if file_name
+          regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
+
+          $1 if message =~ regexp or clean_backtrace.find { |line| line =~ regexp }
         end
-      end
-      0
     end
-  
+
     def file_name
-      stripped = strip_base_path(@file_name)
-      stripped[0] == ?/ ? stripped[1..-1] : stripped
+      stripped = strip_base_path(@file_path)
+      stripped.slice!(0,1) if stripped[0] == ?/
+      stripped
     end
-    
+
     def to_s
-      "\n\n#{self.class} (#{message}) on line ##{line_number} of #{file_name}:\n" + 
-      source_extract + "\n    " +
-      original_exception.clean_backtrace.join("\n    ") +
-      "\n\n"
+      "\n\n#{self.class} (#{message}) #{source_location}:\n" +
+        "#{source_extract}\n    #{clean_backtrace.join("\n    ")}\n\n"
     end
 
     def backtrace
-      [ 
-        "On line ##{line_number} of #{file_name}\n\n#{source_extract(4)}\n    " + 
-        original_exception.clean_backtrace.join("\n    ")
+      [
+        "#{source_location.capitalize}\n\n#{source_extract(4)}\n    " +
+        clean_backtrace.join("\n    ")
       ]
     end
 
     private
-      def strip_base_path(file_name)
-        file_name = File.expand_path(file_name).gsub(/^#{Regexp.escape File.expand_path(RAILS_ROOT)}/, '')
-        file_name.gsub(@base_path, "")
+      def remove_deprecated_assigns!
+        ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |ivar|
+          @assigns.delete(ivar)
+        end
+      end
+
+      def strip_base_path(path)
+        File.expand_path(path).
+          gsub(/^#{Regexp.escape File.expand_path(RAILS_ROOT)}/, '').
+          gsub(@base_path, "")
+      end
+
+      def source_location
+        if line_number
+          "on line ##{line_number} of "
+        else
+          'in '
+        end + file_name
       end
   end
 end
 
-Exception::TraceSubstitutions << [/:in\s+`_run_(html|xml).*'\s*$/, ''] if defined?(Exception::TraceSubstitutions)
-Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}}, '#{RAILS_ROOT}'] if defined?(RAILS_ROOT)
+if defined?(Exception::TraceSubstitutions)
+  Exception::TraceSubstitutions << [/:in\s+`_run_(html|xml).*'\s*$/, '']
+  Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}}, '#{RAILS_ROOT}'] if defined?(RAILS_ROOT)
+end