airbrake-ruby 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abc8e8ee3aac5103d60b365927bb65426a3118d4
-  data.tar.gz: 3b6721865f222b5dc2fd26c4456de385a0761ddf
+  metadata.gz: d83d667d85784f12930d891e4a40f33ff5021d32
+  data.tar.gz: 27abbb08a24e1f5037134d779e1cd00bb6b2c6b9
 SHA512:
-  metadata.gz: 54a86bed42a190518bf82281abb3354fc74b951ffde54cc9b83c796c0d0cd8c8960bac7e1a635b614c6eebc8b985495646006c0ccfde4ed0f2df2221ba2c31c9
-  data.tar.gz: 20e077993ec39e48f2d548b5978f4815a181bd1ca51e23b88054d1f4d249dabfc5cb0247d9b9a5efb3800b2a6397d91b33865e0379548ae745d18356a56eab09
+  metadata.gz: 97bde22452bbf79d34d127de8972799f482ee9476a02760de6f9089d02e548a75fa73657f02dd1a93e99ee3ae27b85f176b00d9c362b3d78c837dc49ae2ab6d6
+  data.tar.gz: 9aa4f9c47307cf45339ebabfad298e1217498318029a5423e47a2f4f91d63b14022a41f39940bccd1b67de4f5f54fae8a2dc4dd00b97912ad2c454bfcc60d63e

data/lib/airbrake-ruby.rb

@@ -20,6 +20,10 @@ require 'airbrake-ruby/filters'
 require 'airbrake-ruby/filters/keys_filter'
 require 'airbrake-ruby/filters/keys_whitelist'
 require 'airbrake-ruby/filters/keys_blacklist'
+require 'airbrake-ruby/filters/gem_root_filter'
+require 'airbrake-ruby/filters/system_exit_filter'
+require 'airbrake-ruby/filters/root_directory_filter'
+require 'airbrake-ruby/filters/thread_filter'
 require 'airbrake-ruby/filter_chain'
 require 'airbrake-ruby/notifier'
 
@@ -71,10 +75,16 @@ module Airbrake
   #   for special cases where we need to work around older implementations
   RUBY_20 = RUBY_VERSION.start_with?('2.0')
 
+  ##
+  # @return [Boolean] true if current Ruby is JRuby. The result is used for
+  #  special cases where we need to work around older implementations
+  JRUBY = (RUBY_ENGINE == 'jruby')
+
   ##
   # A Hash that holds all notifiers. The keys of the Hash are notifier
-  # names, the values are Airbrake::Notifier instances.
-  @notifiers = {}
+  # names, the values are Airbrake::Notifier instances. If a notifier is not
+  # assigned to the hash, then it returns a null object (NilNotifier).
+  @notifiers = Hash.new(NilNotifier.new)
 
   class << self
     ##
@@ -107,7 +117,7 @@ module Airbrake
     #     c.project_key = '91ac5e4a37496026c6837f63276ed2b6'
     #   end
     #
-    # @param [Symbol] notifier the name to be associated with the notifier
+    # @param [Symbol] notifier_name the name to be associated with the notifier
     # @yield [config] The configuration object
     # @yieldparam config [Airbrake::Config]
     # @return [void]
@@ -146,7 +156,7 @@ module Airbrake
     # @return [Airbrake::Promise]
     # @see .notify_sync
     def notify(exception, params = {})
-      @notifiers[:default] && @notifiers[:default].notify(exception, params)
+      @notifiers[:default].notify(exception, params)
     end
 
     ##
@@ -159,7 +169,7 @@ module Airbrake
     # @return [Hash{String=>String}] the reponse from the server
     # @see .notify
     def notify_sync(exception, params = {})
-      @notifiers[:default] && @notifiers[:default].notify_sync(exception, params)
+      @notifiers[:default].notify_sync(exception, params)
     end
 
     ##
@@ -189,7 +199,7 @@ module Airbrake
     # @return [void]
     # @note Once a filter was added, there's no way to delete it
     def add_filter(filter = nil, &block)
-      @notifiers[:default] && @notifiers[:default].add_filter(filter, &block)
+      @notifiers[:default].add_filter(filter, &block)
     end
 
     ##
@@ -208,7 +218,7 @@ module Airbrake
     # @return [Airbrake::Notice] the notice built with help of the given
     #   arguments
     def build_notice(exception, params = {})
-      @notifiers[:default] && @notifiers[:default].build_notice(exception, params)
+      @notifiers[:default].build_notice(exception, params)
     end
 
     ##
@@ -222,7 +232,7 @@ module Airbrake
     #
     # @return [void]
     def close
-      @notifiers[:default] && @notifiers[:default].close
+      @notifiers[:default].close
     end
 
     ##
@@ -237,7 +247,7 @@ module Airbrake
     # @option deploy_params [Symbol] :version
     # @return [void]
     def create_deploy(deploy_params)
-      @notifiers[:default] && @notifiers[:default].create_deploy(deploy_params)
+      @notifiers[:default].create_deploy(deploy_params)
     end
   end
 end

data/lib/airbrake-ruby/filter_chain.rb

@@ -8,22 +8,9 @@ module Airbrake
   # @since v1.0.0
   class FilterChain
     ##
-    # Replaces paths to gems with a placeholder.
-    # @return [Proc]
-    GEM_ROOT_FILTER = proc do |notice|
-      return unless defined?(Gem)
-
-      notice[:errors].each do |error|
-        Gem.path.each do |gem_path|
-          error[:backtrace].each do |frame|
-            # If the frame is unparseable, then 'file' is nil, thus nothing to
-            # filter (all frame's data is in 'function' instead).
-            next unless (file = frame[:file])
-            file.sub!(/\A#{gem_path}/, '[GEM_ROOT]'.freeze)
-          end
-        end
-      end
-    end
+    # @return [String] the namespace for filters, which are executed first,
+    #   before any other filters
+    LIB_NAMESPACE = '#<Airbrake::'.freeze
 
     ##
     # Filters to be executed last. By this time all permutations on a notice
@@ -34,35 +21,35 @@ module Airbrake
       Airbrake::Filters::KeysWhitelist
     ].freeze
 
-    ##
-    # Skip over SystemExit exceptions, because they're just noise.
-    # @return [Proc]
-    SYSTEM_EXIT_FILTER = proc do |notice|
-      if notice[:errors].any? { |error| error[:type] == 'SystemExit' }
-        notice.ignore!
-      end
-    end
-
     ##
     # @param [Airbrake::Config] config
     def initialize(config)
       @filters = []
       @keys_filters = []
 
-      [SYSTEM_EXIT_FILTER, GEM_ROOT_FILTER].each do |filter|
-        add_filter(filter)
+      [Airbrake::Filters::SystemExitFilter,
+       Airbrake::Filters::GemRootFilter,
+       Airbrake::Filters::ThreadFilter].each do |filter|
+        @filters << filter.new
       end
 
       root_directory = config.root_directory
-      add_filter(root_directory_filter(root_directory)) if root_directory
+      return unless root_directory
+
+      @filters << Airbrake::Filters::RootDirectoryFilter.new(root_directory)
     end
 
     ##
     # Adds a filter to the filter chain.
+    #
     # @param [#call] filter The filter object (proc, class, module, etc)
+    # @return [void]
     def add_filter(filter)
       return @keys_filters << filter if KEYS_FILTERS.include?(filter.class)
-      @filters << filter
+      return @filters << filter unless filter.to_s.start_with?(LIB_NAMESPACE)
+
+      i = @filters.rindex { |f| f.to_s.start_with?(LIB_NAMESPACE) }
+      @filters.insert(i + 1, filter) if i
     end
 
     ##
@@ -77,18 +64,5 @@ module Airbrake
         filter.call(notice)
       end
     end
-
-    private
-
-    def root_directory_filter(root_directory)
-      proc do |notice|
-        notice[:errors].each do |error|
-          error[:backtrace].each do |frame|
-            next unless (file = frame[:file])
-            file.sub!(/\A#{root_directory}/, '[PROJECT_ROOT]'.freeze)
-          end
-        end
-      end
-    end
   end
 end

data/lib/airbrake-ruby/filters.rb

@@ -5,6 +5,6 @@ module Airbrake
     ##
     # @return [Array<Symbol>] parts of a Notice's payload that can be modified
     #   by various filters
-    FILTERABLE_KEYS = [:environment, :session, :params].freeze
+    FILTERABLE_KEYS = %i[environment session params].freeze
   end
 end

data/lib/airbrake-ruby/filters/gem_root_filter.rb

@@ -0,0 +1,26 @@
+module Airbrake
+  module Filters
+    ##
+    # Replaces paths to gems with a placeholder.
+    class GemRootFilter
+      ##
+      # @return [String]
+      GEM_ROOT_LABEL = '[GEM_ROOT]'.freeze
+
+      def call(notice)
+        return unless defined?(Gem)
+
+        notice[:errors].each do |error|
+          Gem.path.each do |gem_path|
+            error[:backtrace].each do |frame|
+              # If the frame is unparseable, then 'file' is nil, thus nothing to
+              # filter (all frame's data is in 'function' instead).
+              next unless (file = frame[:file])
+              file.sub!(/\A#{gem_path}/, GEM_ROOT_LABEL)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/airbrake-ruby/filters/root_directory_filter.rb

@@ -0,0 +1,24 @@
+module Airbrake
+  module Filters
+    ##
+    # Replaces root directory with a label.
+    class RootDirectoryFilter
+      ##
+      # @return [String]
+      PROJECT_ROOT_LABEL = '[PROJECT_ROOT]'.freeze
+
+      def initialize(root_directory)
+        @root_directory = root_directory
+      end
+
+      def call(notice)
+        notice[:errors].each do |error|
+          error[:backtrace].each do |frame|
+            next unless (file = frame[:file])
+            file.sub!(/\A#{@root_directory}/, PROJECT_ROOT_LABEL)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/airbrake-ruby/filters/system_exit_filter.rb

@@ -0,0 +1,16 @@
+module Airbrake
+  module Filters
+    ##
+    # Skip over SystemExit exceptions, because they're just noise.
+    class SystemExitFilter
+      ##
+      # @return [String]
+      SYSTEM_EXIT_TYPE = 'SystemExit'.freeze
+
+      def call(notice)
+        return if notice[:errors].none? { |error| error[:type] == SYSTEM_EXIT_TYPE }
+        notice.ignore!
+      end
+    end
+  end
+end

data/lib/airbrake-ruby/filters/thread_filter.rb

@@ -0,0 +1,50 @@
+module Airbrake
+  module Filters
+    ##
+    # Attaches thread & fiber local variables along with general thread
+    # information.
+    class ThreadFilter
+      def call(notice)
+        th = Thread.current
+        thread_info = {}
+
+        if (vars = thread_variables(th)).any?
+          thread_info[:thread_variables] = vars
+        end
+
+        if (vars = fiber_variables(th)).any?
+          thread_info[:fiber_variables] = vars
+        end
+
+        # Present in Ruby 2.3+.
+        if th.respond_to?(:name) && (name = th.name)
+          thread_info[:name] = name
+        end
+
+        add_thread_info(th, thread_info)
+
+        notice[:params][:thread] = thread_info
+      end
+
+      private
+
+      def thread_variables(th)
+        th.thread_variables.map.with_object({}) do |var, h|
+          h[var] = th.thread_variable_get(var).inspect
+        end
+      end
+
+      def fiber_variables(th)
+        th.keys.map.with_object({}) { |key, h| h[key] = th[key].inspect }
+      end
+
+      def add_thread_info(th, thread_info)
+        thread_info[:self] = th.inspect
+        thread_info[:group] = th.group.list.map(&:inspect)
+        thread_info[:priority] = th.priority
+
+        thread_info[:safe_level] = th.safe_level unless Airbrake::JRUBY
+      end
+    end
+  end
+end

data/lib/airbrake-ruby/notice.rb

@@ -44,12 +44,12 @@ module Airbrake
 
     # @return [Array<Symbol>] the list of keys that can be be overwritten with
     #   {Airbrake::Notice#[]=}
-    WRITABLE_KEYS = [
-      :notifier,
-      :context,
-      :environment,
-      :session,
-      :params
+    WRITABLE_KEYS = %i[
+      notifier
+      context
+      environment
+      session
+      params
     ].freeze
 
     ##

data/lib/airbrake-ruby/notifier.rb

@@ -89,12 +89,9 @@ module Airbrake
     # @macro see_public_api_method
     def create_deploy(deploy_params)
       deploy_params[:environment] ||= @config.environment
-
-      host = @config.endpoint.to_s.split(@config.endpoint.path).first
-      path = "/api/v4/projects/#{@config.project_id}/deploys?key=#{@config.project_key}"
-
+      path = "api/v4/projects/#{@config.project_id}/deploys?key=#{@config.project_key}"
       promise = Airbrake::Promise.new
-      @sync_sender.send(deploy_params, promise, URI.join(host, path))
+      @sync_sender.send(deploy_params, promise, URI.join(@config.host, path))
       promise
     end
 
@@ -159,4 +156,23 @@ module Airbrake
       add_filter(Filters::KeysWhitelist.new(@config.logger, *@config.whitelist_keys))
     end
   end
+
+  ##
+  # NilNotifier is a no-op notifier, which mimics +Airbrake::Notifier+ and
+  # serves only for the purpose of making the library API easier to use.
+  #
+  # @since 2.1.0
+  class NilNotifier
+    def notify(_exception, _params = {}); end
+
+    def notify_sync(_exception, _params); end
+
+    def add_filter(_filter = nil, &_block); end
+
+    def build_notice(_exception, _params); end
+
+    def close; end
+
+    def create_deploy(_deploy_params); end
+  end
 end

data/lib/airbrake-ruby/version.rb

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

data/spec/airbrake_spec.rb

@@ -17,12 +17,18 @@ RSpec.describe Airbrake do
   end
 
   after do
-    described_class.instance_variable_set(:@notifiers, {})
+    described_class.instance_variable_set(
+      :@notifiers,
+      Hash.new(Airbrake::NilNotifier.new)
+    )
   end
 
   shared_examples 'non-configured notifier handling' do |method|
     it "returns nil if there is no configured notifier when using #{method}" do
-      described_class.instance_variable_set(:@notifiers, {})
+      described_class.instance_variable_set(
+        :@notifiers,
+        Hash.new(Airbrake::NilNotifier.new)
+      )
       expect(described_class.__send__(method, 'bingo')).to be_nil
     end
   end
@@ -94,7 +100,7 @@ RSpec.describe Airbrake do
         notifiers = described_class.instance_variable_get(:@notifiers)
 
         expect(notifiers).to be_a(Hash)
-        expect(notifiers.keys).to eq([:default, :bingo])
+        expect(notifiers.keys).to eq(%i[default bingo])
         expect(notifiers.values).to all(satisfy { |v| v.is_a?(Airbrake::Notifier) })
       end
 
@@ -122,11 +128,11 @@ RSpec.describe Airbrake do
       filter_chain = notifier.instance_variable_get(:@filter_chain)
       filters = filter_chain.instance_variable_get(:@filters)
 
-      expect(filters.size).to eq(3)
+      expect(filters.size).to eq(4)
 
       described_class.add_filter {}
 
-      expect(filters.size).to eq(4)
+      expect(filters.size).to eq(5)
       expect(filters.last).to be_a(Proc)
     end
   end

data/spec/config/validator_spec.rb

@@ -12,9 +12,9 @@ RSpec.describe Airbrake::Config::Validator do
       end
 
       it "sets correct error message" do
-        expect { subject.valid_project_id? }.
-          to change { subject.error_message }.
-          to(/:project_id is required/)
+        expect { subject.valid_project_id? }.to(
+          change { subject.error_message }.to(/:project_id is required/)
+        )
       end
     end
 
@@ -28,8 +28,9 @@ RSpec.describe Airbrake::Config::Validator do
 
         it "sets correct error message" do
           expect { subject.valid_project_id? }.
-            to change { subject.error_message }.
-            to(/:project_id is required/)
+            to(
+              change { subject.error_message }.to(/:project_id is required/)
+            )
         end
       end
 
@@ -41,9 +42,9 @@ RSpec.describe Airbrake::Config::Validator do
         end
 
         it "sets correct error message" do
-          expect { subject.valid_project_id? }.
-            to change { subject.error_message }.
-            to(/:project_id is required/)
+          expect { subject.valid_project_id? }.to(
+            change { subject.error_message }.to(/:project_id is required/)
+          )
         end
       end
 
@@ -55,7 +56,7 @@ RSpec.describe Airbrake::Config::Validator do
         end
 
         it "doesn't set the error message" do
-          expect { subject.valid_project_id? }.not_to change { subject.error_message }
+          expect { subject.valid_project_id? }.not_to(change { subject.error_message })
         end
       end
     end
@@ -68,7 +69,7 @@ RSpec.describe Airbrake::Config::Validator do
       end
 
       it "doesn't set the error message" do
-        expect { subject.valid_project_id? }.not_to change { subject.error_message }
+        expect { subject.valid_project_id? }.not_to(change { subject.error_message })
       end
     end
   end
@@ -97,7 +98,7 @@ RSpec.describe Airbrake::Config::Validator do
         end
 
         it "doesn't set the error message" do
-          expect { subject.valid_project_key? }.not_to change { subject.error_message }
+          expect { subject.valid_project_key? }.not_to(change { subject.error_message })
         end
       end
     end
@@ -110,9 +111,9 @@ RSpec.describe Airbrake::Config::Validator do
       end
 
       it "sets correct error message" do
-        expect { subject.valid_project_key? }.
-          to change { subject.error_message }.
-          to(/:project_key is required/)
+        expect { subject.valid_project_key? }.to(
+          change { subject.error_message }.to(/:project_key is required/)
+        )
       end
     end
   end
@@ -126,7 +127,7 @@ RSpec.describe Airbrake::Config::Validator do
       end
 
       it "doesn't set the error message" do
-        expect { subject.valid_environment? }.not_to change { subject.error_message }
+        expect { subject.valid_environment? }.not_to(change { subject.error_message })
       end
     end
 
@@ -139,9 +140,10 @@ RSpec.describe Airbrake::Config::Validator do
         end
 
         it "sets the error message" do
-          expect { subject.valid_environment? }.
-            to change { subject.error_message }.
-            to(/the 'environment' option must be configured with a Symbol/)
+          expect { subject.valid_environment? }.to(
+            change { subject.error_message }.
+              to(/the 'environment' option must be configured with a Symbol/)
+          )
         end
       end
 
@@ -153,7 +155,7 @@ RSpec.describe Airbrake::Config::Validator do
         end
 
         it "doesn't set the error message" do
-          expect { subject.valid_environment? }.not_to change { subject.error_message }
+          expect { subject.valid_environment? }.not_to(change { subject.error_message })
         end
       end
 
@@ -165,7 +167,7 @@ RSpec.describe Airbrake::Config::Validator do
         end
 
         it "doesn't set the error message" do
-          expect { subject.valid_environment? }.not_to change { subject.error_message }
+          expect { subject.valid_environment? }.not_to(change { subject.error_message })
         end
       end
 
@@ -181,7 +183,7 @@ RSpec.describe Airbrake::Config::Validator do
         end
 
         it "doesn't set the error message" do
-          expect { subject.valid_environment? }.not_to change { subject.error_message }
+          expect { subject.valid_environment? }.not_to(change { subject.error_message })
         end
       end
     end

data/spec/config_spec.rb

@@ -221,7 +221,7 @@ RSpec.describe Airbrake::Config do
         context "and when 'ignore_environments' contains Strings" do
           it "returns true" do
             config.environment = :bango
-            config.ignore_environments = %w(bango)
+            config.ignore_environments = %w[bango]
 
             expect(config.ignored_environment?).to be_truthy
           end

data/spec/filter_chain_spec.rb

@@ -54,6 +54,22 @@ RSpec.describe Airbrake::FilterChain do
         @chain.refine(notice)
         expect(notice[:params][:bingo]).to eq('[Filtered]')
       end
+
+      it "executes library filters before user ones" do
+        nums = []
+
+        @chain.add_filter(proc { nums << 2 })
+
+        priority_filter = proc { nums << 1 }
+        def priority_filter.to_s
+          '#<Airbrake::'
+        end
+        @chain.add_filter(priority_filter)
+
+        @chain.refine(notice)
+
+        expect(nums).to eq([1, 2])
+      end
     end
 
     describe "default backtrace filters" do
@@ -181,7 +197,7 @@ RSpec.describe Airbrake::FilterChain do
 
           expect(notice[:errors].first[:file]).to be_nil
           expect { @chain.refine(notice) }.
-            not_to change { notice[:errors].first[:file] }
+            not_to(change { notice[:errors].first[:file] })
         end
       end
 
@@ -200,7 +216,7 @@ RSpec.describe Airbrake::FilterChain do
 
           expect(notice[:errors].first[:file]).to be_nil
           expect { filter_chain.refine(notice) }.
-            not_to change { notice[:errors].first[:file] }
+            not_to(change { notice[:errors].first[:file] })
         end
       end
     end

data/spec/filters/thread_filter_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+RSpec.describe Airbrake::Filters::ThreadFilter do
+  subject { described_class.new }
+
+  let(:notice) { Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new) }
+  let(:th) { Thread.current }
+
+  it "appends thread variables" do
+    th.thread_variable_set(:bingo, :bango)
+    subject.call(notice)
+    th.thread_variable_set(:bingo, nil)
+
+    expect(notice[:params][:thread][:thread_variables][:bingo]).to eq(':bango')
+  end
+
+  it "appends fiber variables" do
+    th[:bingo] = :bango
+    subject.call(notice)
+    th[:bingo] = nil
+
+    expect(notice[:params][:thread][:fiber_variables][:bingo]).to eq(':bango')
+  end
+
+  it "appends name", skip: !Thread.current.respond_to?(:name) do
+    th.name = 'bingo'
+    subject.call(notice)
+    th.name = nil
+
+    expect(notice[:params][:thread][:name]).to eq('bingo')
+  end
+
+  it "appends thread inspect (self)" do
+    subject.call(notice)
+    expect(notice[:params][:thread][:self]).to match(/\A#<Thread:.+ run>\z/)
+  end
+
+  it "appends thread group" do
+    subject.call(notice)
+    expect(notice[:params][:thread][:group][0]).to match(/\A#<Thread:.+ run>\z/)
+  end
+
+  it "appends priority" do
+    subject.call(notice)
+    expect(notice[:params][:thread][:priority]).to eq(0)
+  end
+
+  it "appends safe_level", skip: Airbrake::JRUBY do
+    subject.call(notice)
+    expect(notice[:params][:thread][:safe_level]).to eq(0)
+  end
+end

data/spec/notifier_spec.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'spec_helper'
 
 RSpec.describe Airbrake::Notifier do
@@ -153,9 +154,13 @@ RSpec.describe Airbrake::Notifier do
 
         it "features 'params'" do
           expect_a_request_with_body(
-            /"params":{"bingo":\["bango"\],"bongo":"bish"}/
+            /"params":{"bingo":\["bango"\],"bongo":"bish".*}/
           )
         end
+
+        it "features 'params/thread'" do
+          expect_a_request_with_body(/"params":{.*"thread":{.*}/)
+        end
       end
     end
 
@@ -359,7 +364,7 @@ RSpec.describe Airbrake::Notifier do
           include_examples(
             'truncation',
             params,
-            /"params":{"bingo":{"bango":{"bongo":".+ObjectWithIoIvars.+"}}}/
+            /"params":{"bingo":{"bango":{"bongo":".+ObjectWithIoIvars.+"}}.*}/
           )
         end
 
@@ -368,7 +373,7 @@ RSpec.describe Airbrake::Notifier do
           include_examples(
             'truncation',
             params,
-            /"params":{"bingo":\[\[".+ObjectWithIoIvars.+"\]\]}/
+            /"params":{"bingo":\[\[".+ObjectWithIoIvars.+"\]\].*}/
           )
         end
       end
@@ -381,7 +386,7 @@ RSpec.describe Airbrake::Notifier do
 
       sleep 1
 
-      expect_a_request_with_body(/params":{"bingo":"bango"}/)
+      expect_a_request_with_body(/params":{"bingo":"bango".*}/)
     end
 
     it "returns a promise" do
@@ -405,7 +410,7 @@ RSpec.describe Airbrake::Notifier do
       notifier.close
     end
 
-    it "respawns workers on fork()", skip: %w(jruby rbx).include?(RUBY_ENGINE) do
+    it "respawns workers on fork()", skip: %w[jruby rbx].include?(RUBY_ENGINE) do
       out = StringIO.new
       notifier = described_class.new(airbrake_params.merge(logger: Logger.new(out)))
 
@@ -440,12 +445,12 @@ RSpec.describe Airbrake::Notifier do
 
       expect(
         a_request(:post, endpoint).
-        with(body: /params":{"password":"\[Filtered\]"}/)
+        with(body: /params":{"password":"\[Filtered\]".*}/)
       ).to have_been_made.once
     end
 
     it "accepts multiple filters" do
-      [:bingo, :bongo, :bash].each do |key|
+      %i[bingo bongo bash].each do |key|
         @airbrake.add_filter do |notice|
           notice[:params][key] = '[Filtered]'.freeze if notice[:params][key]
         end
@@ -454,7 +459,7 @@ RSpec.describe Airbrake::Notifier do
       @airbrake.notify_sync(ex, bingo: ['bango'], bongo: 'bish', bash: 'bosh')
 
       # rubocop:disable Metrics/LineLength
-      body = /"params":{"bingo":"\[Filtered\]","bongo":"\[Filtered\]","bash":"\[Filtered\]"}/
+      body = /"params":{"bingo":"\[Filtered\]","bongo":"\[Filtered\]","bash":"\[Filtered\]".*}/
       # rubocop:enable Metrics/LineLength
 
       expect(
@@ -538,10 +543,27 @@ RSpec.describe Airbrake::Notifier do
       "https://airbrake.io/api/v4/projects/#{project_id}/deploys?key=#{project_key}"
     end
 
-    it "sends a request to the deploy API" do
+    before do
       stub_request(:post, deploy_endpoint).to_return(status: 201, body: '{"id":"123"}')
+    end
+
+    it "sends a request to the deploy API" do
       @airbrake.create_deploy({})
       expect(a_request(:post, deploy_endpoint)).to have_been_made.once
     end
+
+    context "when a host contains paths" do
+      let(:deploy_host) { "https://example.net/errbit/" }
+
+      let(:deploy_endpoint) do
+        "#{deploy_host}api/v4/projects/#{project_id}/deploys?key=#{project_key}"
+      end
+
+      it "sends a request to the deploy API" do
+        airbrake = described_class.new(airbrake_params.merge(host: deploy_host))
+        airbrake.create_deploy({})
+        expect(a_request(:post, deploy_endpoint)).to have_been_made.once
+      end
+    end
   end
 end

data/spec/notifier_spec/blacklist_keys_spec.rb

@@ -49,28 +49,28 @@ RSpec.describe "Airbrake::Notifier blacklist_keys" do
   end
 
   context "when blacklisting with a Regexp" do
-    let(:expected_body) { /"params":{"bingo":"\[Filtered\]"}/ }
+    let(:expected_body) { /"params":{"bingo":"\[Filtered\]".*}/ }
     include_examples('blacklisting', [/\Abin/], bingo: 'bango')
   end
 
   context "when blacklisting with a Symbol" do
-    let(:expected_body) { /"params":{"bingo":"\[Filtered\]"}/ }
+    let(:expected_body) { /"params":{"bingo":"\[Filtered\]".*}/ }
     include_examples('blacklisting', [:bingo], bingo: 'bango')
   end
 
   context "when blacklisting with a String" do
-    let(:expected_body) { /"params":{"bingo":"\[Filtered\]"}/ }
+    let(:expected_body) { /"params":{"bingo":"\[Filtered\]".*}/ }
     include_examples('blacklisting', ['bingo'], bingo: 'bango')
   end
 
   context "when payload has a hash" do
     context "and it is a non-recursive hash" do
-      let(:expected_body) { /"params":{"bongo":{"bish":"\[Filtered\]"}}/ }
+      let(:expected_body) { /"params":{"bongo":{"bish":"\[Filtered\]"}.*}/ }
       include_examples('blacklisting', ['bish'], bongo: { bish: 'bash' })
     end
 
     context "and it is a recursive hash" do
-      let(:expected_body) { /"params":{"bingo":{"bango":"\[Filtered\]"}}/ }
+      let(:expected_body) { /"params":{"bingo":{"bango":"\[Filtered\]"}.*}/ }
 
       bongo = { bingo: {} }
       bongo[:bingo][:bango] = bongo
@@ -88,13 +88,13 @@ RSpec.describe "Airbrake::Notifier blacklist_keys" do
   end
 
   context "when there was a proc provided, which returns an array of keys" do
-    let(:expected_body) { /"params":{"bingo":"\[Filtered\]","bongo":"bish"}/ }
+    let(:expected_body) { /"params":{"bingo":"\[Filtered\]","bongo":"bish".*}/ }
     include_examples('blacklisting', [proc { 'bingo' }], bingo: 'bango', bongo: 'bish')
   end
 
   context "when there was a proc provided along with normal keys" do
     let(:expected_body) do
-      /"params":{"bingo":"bango","bongo":"\[Filtered\]","bash":"\[Filtered\]"}/
+      /"params":{"bingo":"bango","bongo":"\[Filtered\]","bash":"\[Filtered\]".*}/
     end
 
     include_examples(
@@ -117,7 +117,7 @@ RSpec.describe "Airbrake::Notifier blacklist_keys" do
 
       notifier.notify_sync(ex, bingo: 'bango', bongo: 'bish')
 
-      expect_a_request_with_body(/"params":{"bingo":"bango","bongo":"bish"}/)
+      expect_a_request_with_body(/"params":{"bingo":"bango","bongo":"bish".*}/)
     end
   end
 
@@ -139,7 +139,7 @@ RSpec.describe "Airbrake::Notifier blacklist_keys" do
         notifier.notify_sync(ex, bingo: 'bango', bongo: 'bish')
 
         expect_a_request_with_body(
-          /"params":{"bingo":"\[Filtered\]","bongo":"bish"}/
+          /"params":{"bingo":"\[Filtered\]","bongo":"bish".*}/
         )
       end
     end

data/spec/notifier_spec/options_spec.rb

@@ -201,7 +201,7 @@ RSpec.describe Airbrake::Notifier do
       context "when the current env and notify envs are the same" do
         params = {
           environment: :development,
-          ignore_environments: [:production, :development]
+          ignore_environments: %i[production development]
         }
 
         include_examples 'ignored notice', params
@@ -217,7 +217,7 @@ RSpec.describe Airbrake::Notifier do
       end
 
       context "when the current env is not set and notify envs are present" do
-        params = { ignore_environments: [:production, :development] }
+        params = { ignore_environments: %i[production development] }
 
         include_examples 'sent notice', params
       end

data/spec/notifier_spec/whitelist_keys_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
 
   context "when whitelisting with a Regexp" do
     let(:expected_body) do
-      /"params":{"bingo":"bango","bongo":"\[Filtered\]","bash":"\[Filtered\]"}/
+      /"params":{"bingo":"bango","bongo":"\[Filtered\]","bash":"\[Filtered\]".*}/
     end
 
     include_examples(
@@ -62,7 +62,7 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
 
   context "when whitelisting with a Symbol" do
     let(:expected_body) do
-      /"params":{"bingo":"\[Filtered\]","bongo":"bish","bash":"\[Filtered\]"}/
+      /"params":{"bingo":"\[Filtered\]","bongo":"bish","bash":"\[Filtered\]".*}/
     end
 
     include_examples(
@@ -75,7 +75,7 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
   context "when whitelisting with a String" do
     let(:expected_body) do
       /"params":{"bingo":"\[Filtered\]","bongo":"\[Filtered\]",
-         "bash":"bosh","bbashh":"\[Filtered\]"}/x
+         "bash":"bosh","bbashh":"\[Filtered\]".*}/x
     end
 
     include_examples(
@@ -87,18 +87,20 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
 
   context "when payload has a hash" do
     context "and it is a non-recursive hash" do
-      let(:expected_body) { /"params":{"bingo":"\[Filtered\]","bongo":{"bish":"bash"}}/ }
+      let(:expected_body) do
+        /"params":{"bingo":"\[Filtered\]","bongo":{"bish":"bash"}.*}/
+      end
 
       include_examples(
         'whitelisting',
-        %w(bongo bish),
+        %w[bongo bish],
         bingo: 'bango', bongo: { bish: 'bash' }
       )
     end
 
     context "and it is a recursive hash" do
       it "errors when nested hashes are not filtered" do
-        whitelist = airbrake_params.merge(whitelist_keys: %w(bingo bango))
+        whitelist = airbrake_params.merge(whitelist_keys: %w[bingo bango])
         notifier = Airbrake::Notifier.new(whitelist)
 
         bongo = { bingo: {} }
@@ -129,7 +131,7 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
 
   context "when there was a proc provided, which returns an array of keys" do
     let(:expected_body) do
-      /"params":{"bingo":"\[Filtered\]","bongo":"bish","bash":"\[Filtered\]"}/
+      /"params":{"bingo":"\[Filtered\]","bongo":"bish","bash":"\[Filtered\]".*}/
     end
 
     include_examples(
@@ -141,7 +143,7 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
 
   context "when there was a proc provided along with normal keys" do
     let(:expected_body) do
-      /"params":{"bingo":"\[Filtered\]","bongo":"bish","bash":"bosh"}/
+      /"params":{"bingo":"\[Filtered\]","bongo":"bish","bash":"bosh".*}/
     end
 
     include_examples(
@@ -169,7 +171,7 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
         notifier.notify_sync(ex, bingo: 'bango', bongo: 'bish')
 
         expect_a_request_with_body(
-          /"params":{"bingo":"bango","bongo":"\[Filtered\]"}/
+          /"params":{"bingo":"bango","bongo":"\[Filtered\]".*}/
         )
       end
     end
@@ -189,14 +191,14 @@ RSpec.describe "Airbrake::Notifier whitelist_keys" do
       notifier.notify_sync(ex, bingo: 'bango', bongo: 'bish')
 
       expect_a_request_with_body(
-        /"params":{"bingo":"\[Filtered\]","bongo":"\[Filtered\]"}/
+        /"params":{"bingo":"\[Filtered\]","bongo":"\[Filtered\]".*}/
       )
     end
   end
 
   describe "context/url" do
     let(:notifier) do
-      Airbrake::Notifier.new(airbrake_params.merge(whitelist_keys: %w(bish)))
+      Airbrake::Notifier.new(airbrake_params.merge(whitelist_keys: %w[bish]))
     end
 
     context "given a standard URL" do

data/spec/payload_truncator_spec.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'spec_helper'
 
 RSpec.describe Airbrake::PayloadTruncator do
@@ -216,13 +217,13 @@ RSpec.describe Airbrake::PayloadTruncator do
 
         context "of short strings" do
           let(:params) do
-            { bingo: %w(foo bar baz), bango: 'bongo', bish: 'bash' }
+            { bingo: %w[foo bar baz], bango: 'bongo', bish: 'bash' }
           end
 
           it "truncates long strings in the array, but not short ones" do
             @truncator.truncate_object(params)
             expect(params).
-              to eq(bingo: %w(foo bar baz), bango: 'bongo', bish: 'bash')
+              to eq(bingo: %w[foo bar baz], bango: 'bongo', bish: 'bash')
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,9 +116,13 @@ files:
 - lib/airbrake-ruby/config/validator.rb
 - lib/airbrake-ruby/filter_chain.rb
 - lib/airbrake-ruby/filters.rb
+- lib/airbrake-ruby/filters/gem_root_filter.rb
 - lib/airbrake-ruby/filters/keys_blacklist.rb
 - lib/airbrake-ruby/filters/keys_filter.rb
 - lib/airbrake-ruby/filters/keys_whitelist.rb
+- lib/airbrake-ruby/filters/root_directory_filter.rb
+- lib/airbrake-ruby/filters/system_exit_filter.rb
+- lib/airbrake-ruby/filters/thread_filter.rb
 - lib/airbrake-ruby/nested_exception.rb
 - lib/airbrake-ruby/notice.rb
 - lib/airbrake-ruby/notifier.rb
@@ -133,6 +137,7 @@ files:
 - spec/config/validator_spec.rb
 - spec/config_spec.rb
 - spec/filter_chain_spec.rb
+- spec/filters/thread_filter_spec.rb
 - spec/nested_exception_spec.rb
 - spec/notice_spec.rb
 - spec/notifier_spec.rb
@@ -174,6 +179,7 @@ test_files:
 - spec/config/validator_spec.rb
 - spec/config_spec.rb
 - spec/filter_chain_spec.rb
+- spec/filters/thread_filter_spec.rb
 - spec/nested_exception_spec.rb
 - spec/notice_spec.rb
 - spec/notifier_spec/blacklist_keys_spec.rb