airbrake-ruby 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf59f6fb5b27ba10198dbb6c0dd4581239535ac3
-  data.tar.gz: 3d046a2369cfb7eabf7765e1728f81482ae0f039
+  metadata.gz: 4e55d1ef72a4b324c33893e56abd9e92c661461c
+  data.tar.gz: 14b98e0a8ba23394efd7c967add4ce0bdc93042c
 SHA512:
-  metadata.gz: 981beea055633c18d1ccfe83f1e1651abb308536c155f18960103f00447d6572351281cd8992db7d1ea2ca8dce935480805916f86af5f964ef1a915fdc96f2aa
-  data.tar.gz: db5f9c67510d7a09d985ab4411edd8b148cf03e96c171e22dd2528a6189c5809722c4c555e1c3aeb76101a7ecdf91bf2dafe951d22a7a901cc02a6ce87bb7661
+  metadata.gz: 33b3db9de069c13caf56f7b63b423e4ef83730b6f40398e251e9bd075d043d5b1aada097884748394d315af95e76274841e616a610dfe3f99d8cb93eed22f83f
+  data.tar.gz: 5f99f46b2ad687d9f9b3a11505c8189620a2f18ac63f4bb7fe5436c7b9aa88b3880f7adb0ca8f88edee299d92619e410c31f2915bff5861d3148551253c339eb

data/lib/airbrake-ruby.rb

@@ -63,6 +63,11 @@ module Airbrake
   # @return [String] the label to be prepended to the log output
   LOG_LABEL = '**Airbrake:'.freeze
 
+  ##
+  # @return [Boolean] true if current Ruby is Ruby 1.9.*. The result is used
+  #   for special cases where we need to work around older implementations
+  RUBY_19 = RUBY_VERSION.start_with?('1.9')
+
   ##
   # A Hash that holds all notifiers. The keys of the Hash are notifier
   # names, the values are Airbrake::Notifier instances.

data/lib/airbrake-ruby/backtrace.rb

@@ -11,74 +11,81 @@ module Airbrake
   #     Backtrace.parse($!, Logger.new(STDOUT))
   #   end
   module Backtrace
-    ##
-    # @return [Regexp] the pattern that matches standard Ruby stack frames,
-    #   such as ./spec/notice_spec.rb:43:in `block (3 levels) in <top (required)>'
-    RUBY_STACKFRAME_REGEXP = %r{\A
-      (?<file>.+)       # Matches './spec/notice_spec.rb'
-      :
-      (?<line>\d+)      # Matches '43'
-      :in\s
-      `(?<function>.*)' # Matches "`block (3 levels) in <top (required)>'"
-    \z}x
-
-    ##
-    # @return [Regexp] the template that matches JRuby Java stack frames, such
-    #  as org.jruby.ast.NewlineNode.interpret(NewlineNode.java:105)
-    JAVA_STACKFRAME_REGEXP = /\A
-      (?<function>.+)  # Matches 'org.jruby.ast.NewlineNode.interpret
-      \(
-        (?<file>[^:]+) # Matches 'NewlineNode.java'
-        :?
-        (?<line>\d+)?  # Matches '105'
-      \)
-    \z/x
-
-    ##
-    # @return [Regexp] the template that tries to assume what a generic stack
-    #   frame might look like, when exception's backtrace is set manually.
-    GENERIC_STACKFRAME_REGEXP = %r{\A
-      (?:from\s)?
-      (?<file>.+)              # Matches '/foo/bar/baz.ext'
-      :
-      (?<line>\d+)?            # Matches '43' or nothing
-      (?:
-        in\s`(?<function>.+)'  # Matches "in `func'"
-      |
-        :in\s(?<function>.+)   # Matches ":in func"
-      )?                       # ... or nothing
-    \z}x
-
-    ##
-    # @return [Regexp] the template that matches exceptions from PL/SQL such as
-    #   ORA-06512: at "STORE.LI_LICENSES_PACK", line 1945
-    # @note This is raised by https://github.com/kubo/ruby-oci8
-    OCI_STACKFRAME_REGEXP = /\A
-      (?:
-        ORA-\d{5}
-        :\sat\s
-        (?:"(?<function>.+)",\s)?
-        line\s(?<line>\d+)
-      |
-        #{GENERIC_STACKFRAME_REGEXP}
-      )
-    \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
+    module Patterns
+      ##
+      # @return [Regexp] the pattern that matches standard Ruby stack frames,
+      #   such as ./spec/notice_spec.rb:43:in `block (3 levels) in <top (required)>'
+      RUBY = %r{\A
+        (?<file>.+)       # Matches './spec/notice_spec.rb'
+        :
+        (?<line>\d+)      # Matches '43'
+        :in\s
+        `(?<function>.*)' # Matches "`block (3 levels) in <top (required)>'"
+      \z}x
+
+      ##
+      # @return [Regexp] the pattern that matches JRuby Java stack frames, such
+      #  as org.jruby.ast.NewlineNode.interpret(NewlineNode.java:105)
+      JAVA = /\A
+        (?<function>.+)  # Matches 'org.jruby.ast.NewlineNode.interpret
+        \(
+          (?<file>[^:]+) # Matches 'NewlineNode.java'
+          :?
+          (?<line>\d+)?  # Matches '105'
+        \)
+      \z/x
+
+      ##
+      # @return [Regexp] the pattern that tries to assume what a generic stack
+      #   frame might look like, when exception's backtrace is set manually.
+      GENERIC = %r{\A
+        (?:from\s)?
+        (?<file>.+)              # Matches '/foo/bar/baz.ext'
+        :
+        (?<line>\d+)?            # Matches '43' or nothing
+        (?:
+          in\s`(?<function>.+)'  # Matches "in `func'"
+        |
+          :in\s(?<function>.+)   # Matches ":in func"
+        )?                       # ... or nothing
+      \z}x
+
+      ##
+      # @return [Regexp] the pattern that matches exceptions from PL/SQL such as
+      #   ORA-06512: at "STORE.LI_LICENSES_PACK", line 1945
+      # @note This is raised by https://github.com/kubo/ruby-oci8
+      OCI = /\A
+        (?:
+          ORA-\d{5}
+          :\sat\s
+          (?:"(?<function>.+)",\s)?
+          line\s(?<line>\d+)
+        |
+          #{GENERIC}
+        )
+      \z/x
+
+      ##
+      # @return [Regexp] the pattern that matches CoffeeScript backtraces
+      #   usually coming from Rails & ExecJS
+      EXECJS = /\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}
+        )
+      \z/x
+
+      ##
+      # @return [Regexp] +EXECJS+ pattern without named captures and
+      #   uncommon frames
+      EXECJS_SIMPLIFIED = /\A.+ \(.+:\d+:\d+\)\z/
+    end
 
     ##
     # Parses an exception's backtrace.
@@ -121,13 +128,13 @@ module Airbrake
 
       def best_regexp_for(exception)
         if java_exception?(exception)
-          JAVA_STACKFRAME_REGEXP
+          Patterns::JAVA
         elsif oci_exception?(exception)
-          OCI_STACKFRAME_REGEXP
+          Patterns::OCI
         elsif execjs_exception?(exception)
-          EXECJS_STACKFRAME_REGEXP
+          Patterns::EXECJS
         else
-          RUBY_STACKFRAME_REGEXP
+          Patterns::RUBY
         end
       end
 
@@ -135,13 +142,24 @@ module Airbrake
         defined?(OCIError) && exception.is_a?(OCIError)
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       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)
+
+        if Airbrake::RUBY_19
+          # Ruby 1.9 doesn't support Exception#cause. We work around this by
+          # parsing backtraces. It's slow, so we check only a few first frames.
+          exception.backtrace[0..2].each do |frame|
+            return true if frame =~ Patterns::EXECJS_SIMPLIFIED
+          end
+        elsif exception.cause && exception.cause.is_a?(ExecJS::RuntimeError)
+          return true
+        end
 
         false
       end
+      # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
       def stack_frame(match)
         { file: match[:file],
@@ -153,7 +171,7 @@ module Airbrake
         match = regexp.match(stackframe)
         return match if match
 
-        GENERIC_STACKFRAME_REGEXP.match(stackframe)
+        Patterns::GENERIC.match(stackframe)
       end
     end
   end

data/lib/airbrake-ruby/version.rb

@@ -4,5 +4,5 @@
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '1.4.5'.freeze
+  AIRBRAKE_RUBY_VERSION = '1.4.6'.freeze
 end

data/spec/backtrace_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe Airbrake::Backtrace do
       end
     end
 
-    context "given an ExecJS backtrace" do
+    context "given an ExecJS exception" do
       let(:bt) do
         ['compile ((execjs):6692:19)',
          'eval (<anonymous>:1:10)',
@@ -203,8 +203,6 @@ RSpec.describe Airbrake::Backtrace do
          "/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' },
@@ -218,11 +216,35 @@ RSpec.describe Airbrake::Backtrace do
            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)
+      context "when not on Ruby 1.9" do
+        let(:ex) { ExecJS::RuntimeError.new.tap { |e| e.set_backtrace(bt) } }
+
+        it "returns a properly formatted array of hashes" do
+          stub_const('ExecJS::RuntimeError', AirbrakeTestError)
+          stub_const('Airbrake::RUBY_19', false)
+
+          expect(
+            described_class.parse(ex, Logger.new('/dev/null'))
+          ).to eq(parsed_backtrace)
+        end
+      end
+
+      context "when on Ruby 1.9" do
+        context "and when exception's class isn't ExecJS" do
+          let(:ex) do
+            ActionView::Template::Error.new.tap { |e| e.set_backtrace(bt) }
+          end
+
+          it "returns a properly formatted array of hashes" do
+            stub_const('ActionView::Template::Error', AirbrakeTestError)
+            stub_const('ExecJS::RuntimeError', NameError)
+            stub_const('Airbrake::RUBY_19', true)
+
+            expect(
+              described_class.parse(ex, Logger.new('/dev/null'))
+            ).to eq(parsed_backtrace)
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec