airbrake-ruby 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02aed346e7f188d5b5da63e5f193510f43b94b27
-  data.tar.gz: e029092bdc54e5ead538ee74dbda4142e531e442
+  metadata.gz: e44217dd74500dcb6a84f67cd2f3804bc52bf597
+  data.tar.gz: 007ad1edd743e86514894f9535bb550370e26ca0
 SHA512:
-  metadata.gz: 254d23e27fc94213edc957aff6db744e05142024c6e7d3962ccac40c464b2450656b035b1e3261aa4bcbe923a777ae8fe55eeca4a2de8f6bb8d232f89e06cc9d
-  data.tar.gz: 2c417bfb7aca7750c0568e4f49da77c34c92e2b11600af44e66f2e2585d5cc06abe962fc8919ab4a1c70153038d70b504823d395ea8bdf2b5533a4617494fd3c
+  metadata.gz: 2305130e3028d248ff60ec68f730d3d6623ee830bba0cb7ab3f3977bc3faaa27cd9976936ed99c0747397291049f89654a89017e96d0ce4f10c9665c59165bab
+  data.tar.gz: 3ca66b9d6ca4790b520414e40fd76fb44e741361404e68213bae35fccb78dbdef3f4c3c8d8ebcc4044b6f3a32be31e2a6a9bc27def63903c22e4713d5f853712

data/lib/airbrake-ruby.rb

@@ -79,6 +79,18 @@ module Airbrake
   #   @see Airbrake.$0
 
   class << self
+    # @since v4.2.3
+    # @api private
+    attr_accessor :performance_notifier
+
+    # @since v4.2.3
+    # @api private
+    attr_accessor :notice_notifier
+
+    # @since v4.2.3
+    # @api private
+    attr_accessor :deploy_notifier
+
     # Configures the Airbrake notifier.
     #
     # @example
@@ -96,13 +108,16 @@ module Airbrake
     def configure
       yield config = Airbrake::Config.instance
       Airbrake::Loggable.instance = config.logger
+
+      return if performance_notifier && notice_notifier && deploy_notifier
+
       reset
     end
 
     # @return [Boolean] true if the notifier was configured, false otherwise
     # @since v2.3.0
     def configured?
-      @notice_notifier.configured?
+      notice_notifier.configured?
     end
 
     # Sends an exception to Airbrake asynchronously.
@@ -127,7 +142,7 @@ module Airbrake
     # @return [Airbrake::Promise]
     # @see .notify_sync
     def notify(exception, params = {}, &block)
-      @notice_notifier.notify(exception, params, &block)
+      notice_notifier.notify(exception, params, &block)
     end
 
     # Sends an exception to Airbrake synchronously.
@@ -147,7 +162,7 @@ module Airbrake
     # @return [Airbrake::Promise] the reponse from the server
     # @see .notify
     def notify_sync(exception, params = {}, &block)
-      @notice_notifier.notify_sync(exception, params, &block)
+      notice_notifier.notify_sync(exception, params, &block)
     end
 
     # Runs a callback before {.notify} or {.notify_sync} kicks in. This is
@@ -175,7 +190,7 @@ module Airbrake
     # @yieldreturn [void]
     # @return [void]
     def add_filter(filter = nil, &block)
-      @notice_notifier.add_filter(filter, &block)
+      notice_notifier.add_filter(filter, &block)
     end
 
     # Deletes a filter added via {Airbrake#add_filter}.
@@ -192,7 +207,7 @@ module Airbrake
     # @since v3.1.0
     # @note This method cannot delete filters assigned via the Proc form.
     def delete_filter(filter_class)
-      @notice_notifier.delete_filter(filter_class)
+      notice_notifier.delete_filter(filter_class)
     end
 
     # Builds an Airbrake notice. This is useful, if you want to add or modify a
@@ -210,7 +225,7 @@ module Airbrake
     # @return [Airbrake::Notice] the notice built with help of the given
     #   arguments
     def build_notice(exception, params = {})
-      @notice_notifier.build_notice(exception, params)
+      notice_notifier.build_notice(exception, params)
     end
 
     # Makes the notice notifier a no-op, which means you cannot use the
@@ -223,7 +238,7 @@ module Airbrake
     #
     # @return [void]
     def close
-      @notice_notifier.close
+      notice_notifier.close
     end
 
     # Pings the Airbrake Deploy API endpoint about the occurred deploy.
@@ -236,7 +251,7 @@ module Airbrake
     # @option deploy_info [Symbol] :version
     # @return [void]
     def notify_deploy(deploy_info)
-      @deploy_notifier.notify(deploy_info)
+      deploy_notifier.notify(deploy_info)
     end
 
     # Merges +context+ with the current context.
@@ -284,7 +299,7 @@ module Airbrake
     # @param [Hash{Symbol=>Object}] context
     # @return [void]
     def merge_context(context)
-      @notice_notifier.merge_context(context)
+      notice_notifier.merge_context(context)
     end
 
     # Increments request statistics of a certain +route+ that was invoked on
@@ -323,7 +338,7 @@ module Airbrake
     # @since v3.0.0
     # @see Airbrake::PerformanceNotifier#notify
     def notify_request(request_info)
-      @performance_notifier.notify(Request.new(request_info))
+      performance_notifier.notify(Request.new(request_info))
     end
 
     # Increments SQL statistics of a certain +query+ that was invoked on
@@ -354,7 +369,7 @@ module Airbrake
     # @since v3.2.0
     # @see Airbrake::PerformanceNotifier#notify
     def notify_query(query_info)
-      @performance_notifier.notify(Query.new(query_info))
+      performance_notifier.notify(Query.new(query_info))
     end
 
     # Increments performance breakdown statistics of a certain route.
@@ -378,7 +393,7 @@ module Airbrake
     # @return [void]
     # @since v4.2.0
     def notify_performance_breakdown(breakdown_info)
-      @performance_notifier.notify(PerformanceBreakdown.new(breakdown_info))
+      performance_notifier.notify(PerformanceBreakdown.new(breakdown_info))
     end
 
     # Runs a callback before {.notify_request} or {.notify_query} kicks in. This
@@ -413,7 +428,7 @@ module Airbrake
     # @since v3.2.0
     # @see Airbrake::PerformanceNotifier#add_filter
     def add_performance_filter(filter = nil, &block)
-      @performance_notifier.add_filter(filter, &block)
+      performance_notifier.add_filter(filter, &block)
     end
 
     # Deletes a filter added via {Airbrake#add_performance_filter}.
@@ -431,20 +446,22 @@ module Airbrake
     # @note This method cannot delete filters assigned via the Proc form.
     # @see Airbrake::PerformanceNotifier#delete_filter
     def delete_performance_filter(filter_class)
-      @performance_notifier.delete_filter(filter_class)
+      performance_notifier.delete_filter(filter_class)
     end
 
     # Resets all notifiers, including its filters
     # @return [void]
     # @since v4.2.2
     def reset
-      close if @notice_notifier && configured?
+      close if notice_notifier && configured?
 
-      @performance_notifier = PerformanceNotifier.new
-      @notice_notifier = NoticeNotifier.new
-      @deploy_notifier = DeployNotifier.new
+      self.performance_notifier = PerformanceNotifier.new
+      self.notice_notifier = NoticeNotifier.new
+      self.deploy_notifier = DeployNotifier.new
     end
   end
 end
 
-Airbrake.reset
+Airbrake.configure do
+  # Initialize Airbrake with default notifiers.
+end

data/lib/airbrake-ruby/version.rb

@@ -2,5 +2,5 @@
 # More information: http://semver.org/
 module Airbrake
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '4.2.2'.freeze
+  AIRBRAKE_RUBY_VERSION = '4.2.3'.freeze
 end

data/spec/airbrake_spec.rb

@@ -1,12 +1,24 @@
 RSpec.describe Airbrake do
-  before do
-    Airbrake::Config.instance = Airbrake::Config.new
-    described_class.reset
+  it "gets initialized with a performance notifier" do
+    expect(described_class.performance_notifier).not_to be_nil
   end
 
-  after { described_class.reset }
+  it "gets initialized with a notice notifier" do
+    expect(described_class.notice_notifier).not_to be_nil
+  end
+
+  it "gets initialized with a deploy notifier" do
+    expect(described_class.deploy_notifier).not_to be_nil
+  end
 
   describe ".configure" do
+    before do
+      Airbrake::Config.instance = Airbrake::Config.new
+      described_class.reset
+    end
+
+    after { described_class.reset }
+
     it "yields the config" do
       expect do |b|
         begin
@@ -41,18 +53,18 @@ RSpec.describe Airbrake do
 
     context "when a notifier was configured" do
       before do
-        expect(described_class).to receive(:configured?).twice.and_return(true)
+        expect(described_class).to receive(:configured?).and_return(true)
       end
 
       it "closes previously configured notice notifier" do
-        expect(described_class).to receive(:close).twice
+        expect(described_class).to receive(:close)
         described_class.configure {}
       end
     end
 
     context "when a notifier wasn't configured" do
       before do
-        expect(described_class).to receive(:configured?).twice.and_return(false)
+        expect(described_class).to receive(:configured?).and_return(false)
       end
 
       it "doesn't close previously configured notice notifier" do
@@ -60,16 +72,42 @@ RSpec.describe Airbrake do
         described_class.configure {}
       end
     end
+
+    context "when called multiple times" do
+      it "doesn't overwrite performance notifier" do
+        described_class.configure {}
+        performance_notifier = described_class.performance_notifier
+
+        described_class.configure {}
+        expect(described_class.performance_notifier).to eql(performance_notifier)
+      end
+
+      it "doesn't overwrite notice notifier" do
+        described_class.configure {}
+        notice_notifier = described_class.notice_notifier
+
+        described_class.configure {}
+        expect(described_class.notice_notifier).to eql(notice_notifier)
+      end
+
+      it "doesn't overwrite deploy notifier" do
+        described_class.configure {}
+        deploy_notifier = described_class.deploy_notifier
+
+        described_class.configure {}
+        expect(described_class.deploy_notifier).to eql(deploy_notifier)
+      end
+    end
   end
 
   describe "#reset" do
     context "when Airbrake was previously configured" do
       before do
-        expect(described_class).to receive(:configured?).twice.and_return(true)
+        expect(described_class).to receive(:configured?).and_return(true)
       end
 
       it "closes notice notifier" do
-        expect(described_class).to receive(:close).twice
+        expect(described_class).to receive(:close)
         subject.reset
       end
     end

data/spec/filters/git_revision_filter_spec.rb

@@ -1,7 +1,9 @@
 RSpec.describe Airbrake::Filters::GitRevisionFilter do
   subject { described_class.new('root/dir') }
 
-  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
+  # 'let!', not 'let' to make sure Notice doesn't call File.exist? with
+  # unexpected arguments.
+  let!(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   context "when context/revision is defined" do
     it "doesn't attach anything to context/revision" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree3