airbrake-ruby 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaad02409926687bb224ce9b635ba755d70ae2ca
-  data.tar.gz: 4cf429a9c5cfc4f440ee674ab8c06105447e08a2
+  metadata.gz: cf59f6fb5b27ba10198dbb6c0dd4581239535ac3
+  data.tar.gz: 3d046a2369cfb7eabf7765e1728f81482ae0f039
 SHA512:
-  metadata.gz: 4ad0da44bc123bb6c14387d14772796bfefdbbdf8f143285ba839867051771939faf3a2d9ff328f5f3f89231b4a0c7560038eec45601731ec8e6d32d9bd05530
-  data.tar.gz: 26199fd126b11a6ea0a7449ff41591760ffd9642b8eef9c20f7f0e3cb041acb13ba0d1be70d40526a470458374896f086dd3b0c4a7cff657204eb189a02cb165
+  metadata.gz: 981beea055633c18d1ccfe83f1e1651abb308536c155f18960103f00447d6572351281cd8992db7d1ea2ca8dce935480805916f86af5f964ef1a915fdc96f2aa
+  data.tar.gz: db5f9c67510d7a09d985ab4411edd8b148cf03e96c171e22dd2528a6189c5809722c4c555e1c3aeb76101a7ecdf91bf2dafe951d22a7a901cc02a6ce87bb7661

data/lib/airbrake-ruby/backtrace.rb

@@ -64,6 +64,22 @@ module Airbrake
       )
     \z/x
 
+    ##
+    # @return [Regexp] the template that matches CoffeeScript backtraces
+    #   usually coming from Rails & ExecJS
+    EXECJS_STACKFRAME_REGEXP = /\A
+      (?:
+        # Matches 'compile ((execjs):6692:19)'
+        (?<function>.+)\s\((?<file>.+):(?<line>\d+):\d+\)
+      |
+        # Matches 'bootstrap_node.js:467:3'
+        (?<file>.+):(?<line>\d+):\d+(?<function>)
+      |
+        # Matches the Ruby part of the backtrace
+        #{RUBY_STACKFRAME_REGEXP}
+      )
+    \z/x
+
     ##
     # Parses an exception's backtrace.
     #
@@ -73,13 +89,7 @@ module Airbrake
     def self.parse(exception, logger)
       return [] if exception.backtrace.nil? || exception.backtrace.none?
 
-      regexp = if java_exception?(exception)
-                 JAVA_STACKFRAME_REGEXP
-               elsif oci_exception?(exception)
-                 OCI_STACKFRAME_REGEXP
-               else
-                 RUBY_STACKFRAME_REGEXP
-               end
+      regexp = best_regexp_for(exception)
 
       exception.backtrace.map do |stackframe|
         frame = match_frame(regexp, stackframe)
@@ -109,10 +119,30 @@ module Airbrake
     class << self
       private
 
+      def best_regexp_for(exception)
+        if java_exception?(exception)
+          JAVA_STACKFRAME_REGEXP
+        elsif oci_exception?(exception)
+          OCI_STACKFRAME_REGEXP
+        elsif execjs_exception?(exception)
+          EXECJS_STACKFRAME_REGEXP
+        else
+          RUBY_STACKFRAME_REGEXP
+        end
+      end
+
       def oci_exception?(exception)
         defined?(OCIError) && exception.is_a?(OCIError)
       end
 
+      def execjs_exception?(exception)
+        return false unless defined?(ExecJS::RuntimeError)
+        return true if exception.is_a?(ExecJS::RuntimeError)
+        return true if exception.cause && exception.cause.is_a?(ExecJS::RuntimeError)
+
+        false
+      end
+
       def stack_frame(match)
         { file: match[:file],
           line: (Integer(match[:line]) if match[:line]),

data/lib/airbrake-ruby/version.rb

@@ -1,7 +1,8 @@
 ##
-# Defines version.
+# We use Semantic Versioning v2.0.0
+# More information: http://semver.org/
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '1.4.4'.freeze
+  AIRBRAKE_RUBY_VERSION = '1.4.5'.freeze
 end

data/spec/backtrace_spec.rb

@@ -190,5 +190,40 @@ RSpec.describe Airbrake::Backtrace do
         ).to eq(parsed_backtrace)
       end
     end
+
+    context "given an ExecJS backtrace" do
+      let(:bt) do
+        ['compile ((execjs):6692:19)',
+         'eval (<anonymous>:1:10)',
+         '(execjs):6703:8',
+         'require../helpers.exports ((execjs):1:102)',
+         'Object.<anonymous> ((execjs):1:120)',
+         'Object.Module._extensions..js (module.js:550:10)',
+         'bootstrap_node.js:467:3',
+         "/opt/rubies/ruby-2.3.1/lib/ruby/2.3.0/benchmark.rb:308:in `realtime'"]
+      end
+
+      let(:ex) { ExecJS::RuntimeError.new.tap { |e| e.set_backtrace(bt) } }
+
+      let(:parsed_backtrace) do
+        [{ file: '(execjs)', line: 6692, function: 'compile' },
+         { file: '<anonymous>', line: 1, function: 'eval' },
+         { file: '(execjs)', line: 6703, function: '' },
+         { file: '(execjs)', line: 1, function: 'require../helpers.exports' },
+         { file: '(execjs)', line: 1, function: 'Object.<anonymous>' },
+         { file: 'module.js', line: 550, function: 'Object.Module._extensions..js' },
+         { file: 'bootstrap_node.js', line: 467, function: '' },
+         { file: '/opt/rubies/ruby-2.3.1/lib/ruby/2.3.0/benchmark.rb',
+           line: 308,
+           function: 'realtime' }]
+      end
+
+      it "returns a properly formatted array of hashes" do
+        stub_const('ExecJS::RuntimeError', AirbrakeTestError)
+        expect(
+          described_class.parse(ex, Logger.new('/dev/null'))
+        ).to eq(parsed_backtrace)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -160,4 +160,3 @@ test_files:
 - spec/payload_truncator_spec.rb
 - spec/spec_helper.rb
 - spec/sync_sender_spec.rb
-has_rdoc: