bugsnag 1.3.2 → 1.3.3

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.3.3
+-----
+-   Support windows-style paths in backtraces
+-   Fix bug with `before_bugsnag_notify` in Rails 2
+
 1.3.2
 -----
 -   Notify will now build exceptions if a non-exception is passed in.

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/bugsnag.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{bugsnag}
-  s.version = "1.3.2"
+  s.name = "bugsnag"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = %q{2013-04-18}
-  s.description = %q{Ruby notifier for bugsnag.com}
-  s.email = %q{james@bugsnag.com}
+  s.date = "2013-04-23"
+  s.description = "Ruby notifier for bugsnag.com"
+  s.email = "james@bugsnag.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -59,32 +59,31 @@ Gem::Specification.new do |s|
     "spec/rack_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/bugsnag/bugsnag-ruby}
+  s.homepage = "http://github.com/bugsnag/bugsnag-ruby"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Ruby notifier for bugsnag.com}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Ruby notifier for bugsnag.com"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
+      s.add_runtime_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
       s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<multi_json>, ["~> 1.0"])
-      s.add_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
+      s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
       s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
     s.add_dependency(%q<multi_json>, ["~> 1.0"])
-    s.add_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
+    s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
     s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

data/lib/bugsnag/notification.rb

@@ -11,6 +11,7 @@ module Bugsnag
     NOTIFIER_URL = "http://www.bugsnag.com"
 
     API_KEY_REGEX = /[0-9a-f]{32}/i
+    BACKTRACE_LINE_REGEX = /^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$/
 
     MAX_EXCEPTIONS_TO_UNWRAP = 5
 
@@ -246,13 +247,17 @@ module Bugsnag
 
     def stacktrace(exception)
       (exception.backtrace || caller).map do |trace|
-        method = nil
-        file, line_str, method_str = trace.split(":")
+        # Parse the stacktrace line
+        _, file, line_str, method = trace.match(BACKTRACE_LINE_REGEX).to_a
 
+        # Skip stacktrace lines inside lib/bugsnag
         next(nil) if file =~ %r{lib/bugsnag}
 
         # Expand relative paths
-        file = Pathname.new(file).realpath.to_s rescue file
+        p = Pathname.new(file)
+        if p.relative?
+          file = p.realpath.to_s rescue file
+        end
 
         # Generate the stacktrace line hash
         trace_hash = {}
@@ -272,10 +277,6 @@ module Bugsnag
         trace_hash[:file] = file
 
         # Add a method if we have it
-        if method_str
-          method_match = /in `([^']+)'/.match(method_str)
-          method = method_match.captures.first if method_match
-        end
         trace_hash[:method] = method if method && (method =~ /^__bind/).nil?
 
         if trace_hash[:file] && !trace_hash[:file].empty?

data/lib/bugsnag/rails/controller_methods.rb

@@ -24,7 +24,7 @@ module Bugsnag::Rails
           # Set up "method symbol" callbacks
           methods.each do |method_symbol|
             request_data[callback_key] << lambda { |notification|
-              self.send(method_symbol, notification)
+              controller.send(method_symbol, notification)
             }
           end
 

data/spec/notification_spec.rb

@@ -418,13 +418,11 @@ describe Bugsnag::Notification do
   it "should call to_exception on i18n error objects" do
     Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
       exception = get_exception_from_payload(payload)
-      exception[:errorClass].should be == "I18n::MissingTranslationData"
+      exception[:errorClass].should be == "BugsnagTestException"
+      exception[:message].should be == "message"
     end
 
-    I18n.exception_handler = lambda do |exception, locale, key, options|
-      Bugsnag.notify exception
-    end
-    I18n.t(:test)
+    Bugsnag.notify(OpenStruct.new(:to_exception => BugsnagTestException.new("message")))
   end
 
   it "should generate runtimeerror for non exceptions" do
@@ -436,4 +434,54 @@ describe Bugsnag::Notification do
 
     Bugsnag.notify("test message")
   end
+
+  it "should support unix-style paths in backtraces" do
+    ex = BugsnagTestException.new("It crashed")
+    ex.set_backtrace([
+      "/Users/james/app/spec/notification_spec.rb:419",
+      "/Some/path/rspec/example.rb:113:in `instance_eval'"
+    ])
+
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      exception = get_exception_from_payload(payload)
+      exception[:stacktrace].length.should be == 2
+
+      line = exception[:stacktrace][0]
+      line[:file].should be == "/Users/james/app/spec/notification_spec.rb"
+      line[:lineNumber].should be == 419
+      line[:method].should be nil
+
+      line = exception[:stacktrace][1]
+      line[:file].should be == "/Some/path/rspec/example.rb"
+      line[:lineNumber].should be == 113
+      line[:method].should be == "instance_eval"
+    end
+
+    Bugsnag.notify(ex)
+  end
+
+  it "should support windows-style paths in backtraces" do
+    ex = BugsnagTestException.new("It crashed")
+    ex.set_backtrace([
+      "C:/projects/test/app/controllers/users_controller.rb:13:in `index'",
+      "C:/ruby/1.9.1/gems/actionpack-2.3.10/filters.rb:638:in `block in run_before_filters'"
+    ])
+
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      exception = get_exception_from_payload(payload)
+      exception[:stacktrace].length.should be == 2
+
+      line = exception[:stacktrace][0]
+      line[:file].should be == "C:/projects/test/app/controllers/users_controller.rb"
+      line[:lineNumber].should be == 13
+      line[:method].should be == "index"
+
+      line = exception[:stacktrace][1]
+      line[:file].should be == "C:/ruby/1.9.1/gems/actionpack-2.3.10/filters.rb"
+      line[:lineNumber].should be == 638
+      line[:method].should be == "block in run_before_filters"
+    end
+
+    Bugsnag.notify(ex)
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'bugsnag'
-require 'i18n'
 
 class BugsnagTestException < RuntimeError; end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - James Smith
@@ -14,82 +15,92 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-18 00:00:00 -07:00
-default_executable: 
+date: 2013-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: multi_json
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id001
   prerelease: false
   type: :runtime
-  name: httparty
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: multi_json
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
     - - <
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  version_requirements: *id002
   prerelease: false
-  type: :development
-  name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: httparty
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 2
         - 11
         - 0
         version: 2.11.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id003
   prerelease: false
   type: :development
-  name: rdoc
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 3
         - 12
         version: "3.12"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id004
   prerelease: false
   type: :development
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: rdoc
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 1
         - 8
         - 4
         version: 1.8.4
-  requirement: *id005
+  version_requirements: *id005
+  prerelease: false
+  type: :development
+  name: jeweler
 description: Ruby notifier for bugsnag.com
 email: james@bugsnag.com
 executables: []
@@ -141,7 +152,6 @@ files:
 - spec/notification_spec.rb
 - spec/rack_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/bugsnag/bugsnag-ruby
 licenses: 
 - MIT
@@ -151,23 +161,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby notifier for bugsnag.com