aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-04-28 15:57:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-04-28 15:57:29 +0000
commit70ac560e42644938392381ecd52efd7fb0260323 (patch)
treedbc0bc73d480bf3af99aef2f4be16afa183f4850 /actionpack
parent1d5c34c2c27370356e8cd1ef478111802b6a5af4 (diff)
downloadrails-70ac560e42644938392381ecd52efd7fb0260323.tar.gz
rails-70ac560e42644938392381ecd52efd7fb0260323.tar.bz2
rails-70ac560e42644938392381ecd52efd7fb0260323.zip
Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6611 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/rescue.rb24
-rw-r--r--actionpack/lib/action_controller/templates/rescues/_request_and_response.erb20
-rw-r--r--actionpack/test/abstract_unit.rb1
3 files changed, 0 insertions, 45 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index cd3a1b5650..225acd28f3 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -124,30 +124,6 @@ module ActionController #:nodoc:
def perform_action_with_rescue #:nodoc:
perform_action_without_rescue
rescue Exception => exception # errors from action performed
- if defined?(Breakpoint) && params["BP-RETRY"]
- msg = exception.backtrace.first
- if md = /^(.+?):(\d+)(?::in `(.+)')?$/.match(msg) then
- origin_file, origin_line = md[1], md[2].to_i
-
- set_trace_func(lambda do |type, file, line, method, context, klass|
- if file == origin_file and line == origin_line then
- set_trace_func(nil)
- params["BP-RETRY"] = false
-
- callstack = caller
- callstack.slice!(0) if callstack.first["rescue.rb"]
- file, line, method = *callstack.first.match(/^(.+?):(\d+)(?::in `(.*?)')?/).captures
-
- message = "Exception at #{file}:#{line}#{" in `#{method}'" if method}." # `´ ( for ruby-mode)
-
- Breakpoint.handle_breakpoint(context, message, file, line)
- end
- end)
-
- retry
- end
- end
-
rescue_action(exception)
end
diff --git a/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb b/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb
index fe60bfdd40..64b34650b1 100644
--- a/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb
@@ -5,26 +5,6 @@
<pre id="blame_trace" <%='style="display:none"' if hide %>><code><%=h @exception.describe_blame %></code></pre>
<% end %>
-<% if false %>
- <br /><br />
- <% begin %>
- <%= form_tag(request.request_uri, "method" => request.method) %>
- <input type="hidden" name="BP-RETRY" value="1" />
-
- <% for key, values in params %>
- <% next if key == "BP-RETRY" %>
- <% for value in Array(values) %>
- <input type="hidden" name="<%= key %>" value="<%= value %>" />
- <% end %>
- <% end %>
-
- <input type="submit" value="Retry with Breakpoint" />
- </form>
- <% rescue Exception => e %>
- <%=h "Couldn't render breakpoint link due to #{e.class} #{e.message}" %>
- <% end %>
-<% end %>
-
<%
clean_params = request.parameters.clone
clean_params.delete("action")
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 2733ed95da..e4b8b5b04a 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -5,7 +5,6 @@ $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
require 'yaml'
require 'test/unit'
require 'action_controller'
-require 'breakpoint'
require 'action_controller/test_process'
# Show backtraces for deprecated behavior for quicker cleanup.