method has been renamed to method_name

errbit · Apr 4, 2013 · bd2e780 · bd2e780
1 parent 20c1c9b
commit bd2e780
Show file tree

Hide file tree

Showing 13 changed files with 232 additions and 229 deletions.
diff --git a/app/models/backtrace_line.rb b/app/models/backtrace_line.rb
@@ -6,7 +6,10 @@ class BacktraceLine
   field :number, :type => Integer
   field :column, :type => Integer
   field :file
-  field :method
+  field :method_name
+
+  # TODO: remove me when the support for Airbrake 3.1.10 is removed 
+  alias :method :method_name
 
   embedded_in :backtrace
 

diff --git a/app/views/issue_trackers/bitbucket_issues_body.txt.erb b/app/views/issue_trackers/bitbucket_issues_body.txt.erb
@@ -45,7 +45,7 @@
 ----
 
   == Backtrace ==
-  <% notice.backtrace_lines.each do |line| %>| <%= line['number'] %>: | <%= line['file'].to_s.sub(/^\[PROJECT_ROOT\]/, '') %> -> **<%= line['method'] %>** |
+  <% notice.backtrace_lines.each do |line| %>| <%= line['number'] %>: | <%= line['file'].to_s.sub(/^\[PROJECT_ROOT\]/, '') %> -> **<%= line['method_name'] %>** |
   <% end %>
 
 ----

diff --git a/app/views/issue_trackers/github_issues_body.txt.erb b/app/views/issue_trackers/github_issues_body.txt.erb
@@ -27,7 +27,7 @@
 
 ## Backtrace ##
 ```
-<% notice.backtrace_lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method %>**
+<% notice.backtrace_lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method_name %>**
 <% end %>
 ```
 

diff --git a/app/views/issue_trackers/gitlab_body.txt.erb b/app/views/issue_trackers/gitlab_body.txt.erb
@@ -11,7 +11,7 @@
 
 ## Backtrace ##
 ```
-<% notice.backtrace_lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method %>**
+<% notice.backtrace_lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method_name %>**
 <% end %>
 ```
 

diff --git a/app/views/issue_trackers/lighthouseapp_body.txt.erb b/app/views/issue_trackers/lighthouseapp_body.txt.erb
@@ -23,7 +23,7 @@
 
   ## Backtrace ##
   <code>
-  <% notice.backtrace_lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method %>**
+  <% notice.backtrace_lines.each do |line| %><%= line.number %>:  <%= line.file_relative %> -> **<%= line.method_name %>**
   <% end %>
   </code>
 

diff --git a/app/views/issue_trackers/pivotal_body.txt.erb b/app/views/issue_trackers/pivotal_body.txt.erb
@@ -12,6 +12,6 @@ See this exception on Errbit: <%= app_problem_url problem.app, problem %>
     <%= pretty_hash notice.session %>
 
     Backtrace:
-    <%= notice.backtrace_lines[0..4].map { |line| "#{line.number}: #{line.file_relative} -> *#{line.method}*" }.join "\n" %>
+    <%= notice.backtrace_lines[0..4].map { |line| "#{line.number}: #{line.file_relative} -> *#{line.method_name}*" }.join "\n" %>
 <% end %>
 
diff --git a/app/views/issue_trackers/textile_body.txt.erb b/app/views/issue_trackers/textile_body.txt.erb
@@ -32,7 +32,7 @@ h2. Session
 h2. Backtrace
 
 | Line | File | Method |
-<% notice.backtrace_lines.each do |line| %>| <%= line.number %> | <%= line.file_relative %> | *<%= line.method %>* |
+<% notice.backtrace_lines.each do |line| %>| <%= line.number %> | <%= line.file_relative %> | *<%= line.method_name %>* |
 <% end %>
 
 h2. Environment

diff --git a/app/views/notices/_atom_entry.atom.haml b/app/views/notices/_atom_entry.atom.haml
@@ -28,7 +28,7 @@
         = "#{line.number}:"
         &nbsp;&nbsp;
       %td
-        = raw "#{h line.file_relative} -> #{content_tag :strong, h(line.method)}"
+        = raw "#{h line.file_relative} -> #{content_tag :strong, h(line.method_name)}"
 
 %h3 Environment
 %table

diff --git a/app/views/notices/_backtrace_line.html.haml b/app/views/notices/_backtrace_line.html.haml
@@ -8,4 +8,4 @@
       - if line.column.present?
         %span.number>= ":#{line.column}"
     &rarr;
-    %span.method= line.method
+    %span.method= line.method_name
diff --git a/spec/fixtures/hoptoad_test_notice.xml b/spec/fixtures/hoptoad_test_notice.xml
diff --git a/spec/fixtures/hoptoad_test_notice_with_one_line_of_backtrace.xml b/spec/fixtures/hoptoad_test_notice_with_one_line_of_backtrace.xml
@@ -10,7 +10,7 @@
     <class>HoptoadTestingException</class>
     <message>HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.</message>
     <backtrace>
-      <line number="425" file="[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb" method="_run__2115867319__process_action__262109504__callbacks"/>
+      <line number="425" file="[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb" method_name="_run__2115867319__process_action__262109504__callbacks"/>
     </backtrace>
   </error>
   <request>

diff --git a/spec/fixtures/hoptoad_test_notice_with_wrong_version.xml b/spec/fixtures/hoptoad_test_notice_with_wrong_version.xml
diff --git a/spec/fixtures/hoptoad_test_notice_without_request_section.xml b/spec/fixtures/hoptoad_test_notice_without_request_section.xml