airbrake-ruby 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd52bfc797145037c7aa2c4ba9193b860b6a48f4
-  data.tar.gz: 2314e4ba463a99416df04c209c2af159e6b384c8
+  metadata.gz: abc8e8ee3aac5103d60b365927bb65426a3118d4
+  data.tar.gz: 3b6721865f222b5dc2fd26c4456de385a0761ddf
 SHA512:
-  metadata.gz: da90297990ebb7d1b8ba092750a666ef9324cdd6149195d4d143fb9d74d0963793a9696a403bc5011b8675bab3b8ff5c0c881061d89568e225ef0575a0ad0597
-  data.tar.gz: e18299029cd90b600fab49d0867874a3e66f6950c3f882dc1b1c2ab3930846d9de59cb3673afb539926eb1c56c019955d1d3834b51b16d7dea366627e4836b6d
+  metadata.gz: 54a86bed42a190518bf82281abb3354fc74b951ffde54cc9b83c796c0d0cd8c8960bac7e1a635b614c6eebc8b985495646006c0ccfde4ed0f2df2221ba2c31c9
+  data.tar.gz: 20e077993ec39e48f2d548b5978f4815a181bd1ca51e23b88054d1f4d249dabfc5cb0247d9b9a5efb3800b2a6397d91b33865e0379548ae745d18356a56eab09

data/lib/airbrake-ruby.rb

@@ -115,26 +115,20 @@ module Airbrake
     #   existing notifier
     # @note There's no way to reconfigure a notifier
     # @note There's no way to read config values outside of this library
-    def configure(notifier = :default)
+    def configure(notifier_name = :default)
       yield config = Airbrake::Config.new
 
-      if configured?(notifier)
+      if @notifiers.key?(notifier_name)
         raise Airbrake::Error,
-              "the '#{notifier}' notifier was already configured"
+              "the '#{notifier_name}' notifier was already configured"
       else
-        @notifiers[notifier] = Notifier.new(config)
+        @notifiers[notifier_name] = Notifier.new(config)
       end
     end
 
-    # @!macro proxy_method
-    #   @param [Symbol] notifier The name of the notifier
-    #   @raise [Airbrake::Error] if +notifier+ doesn't exist
-    #   @see Airbrake::Notifier#$0
-
     ##
     # Sends an exception to Airbrake asynchronously.
     #
-    # @macro proxy_method
     # @example Sending an exception
     #   Airbrake.notify(RuntimeError.new('Oops!'))
     # @example Sending a string
@@ -151,24 +145,21 @@ module Airbrake
     #   tab in your project's dashboard
     # @return [Airbrake::Promise]
     # @see .notify_sync
-    def notify(exception, params = {}, notifier = (no_arg = true && :default))
-      deprecation_warn(__method__, notifier) unless no_arg
-      call_notifier(notifier, __method__, exception, params)
+    def notify(exception, params = {})
+      @notifiers[:default] && @notifiers[:default].notify(exception, params)
     end
 
     ##
     # Sends an exception to Airbrake synchronously.
     #
-    # @macro proxy_method
     # @example
     #   Airbrake.notify_sync('App crashed!')
     #   #=> {"id"=>"123", "url"=>"https://airbrake.io/locate/321"}
     #
     # @return [Hash{String=>String}] the reponse from the server
     # @see .notify
-    def notify_sync(exception, params = {}, notifier = (no_arg = true && :default))
-      deprecation_warn(__method__, notifier) unless no_arg
-      call_notifier(notifier, __method__, exception, params)
+    def notify_sync(exception, params = {})
+      @notifiers[:default] && @notifiers[:default].notify_sync(exception, params)
     end
 
     ##
@@ -176,7 +167,6 @@ module Airbrake
     # useful if you want to ignore specific notices or filter the data the
     # notice contains.
     #
-    # @macro proxy_method
     # @example Ignore all notices
     #   Airbrake.add_filter(&:ignore!)
     # @example Ignore based on some condition
@@ -198,9 +188,8 @@ module Airbrake
     # @yieldreturn [void]
     # @return [void]
     # @note Once a filter was added, there's no way to delete it
-    def add_filter(filter = nil, notifier = (no_arg = true && :default), &block)
-      deprecation_warn(__method__, notifier) unless no_arg
-      call_notifier(notifier, __method__, filter, &block)
+    def add_filter(filter = nil, &block)
+      @notifiers[:default] && @notifiers[:default].add_filter(filter, &block)
     end
 
     ##
@@ -208,7 +197,6 @@ module Airbrake
     # value only for a specific notice. When you're done modifying the notice,
     # send it with {.notify} or {.notify_sync}.
     #
-    # @macro proxy_method
     # @example
     #   notice = airbrake.build_notice('App crashed!')
     #   notice[:params][:username] = user.name
@@ -219,9 +207,8 @@ module Airbrake
     # @param [Hash] params The additional params attached to the notice
     # @return [Airbrake::Notice] the notice built with help of the given
     #   arguments
-    def build_notice(exception, params = {}, notifier = (no_arg = true && :default))
-      deprecation_warn(__method__, notifier) unless no_arg
-      call_notifier(notifier, __method__, exception, params)
+    def build_notice(exception, params = {})
+      @notifiers[:default] && @notifiers[:default].build_notice(exception, params)
     end
 
     ##
@@ -229,22 +216,19 @@ module Airbrake
     # {.notify_sync} methods anymore. It also stops the notifier's worker
     # threads.
     #
-    # @macro proxy_method
     # @example
     #   Airbrake.close
     #   Airbrake.notify('App crashed!') #=> raises Airbrake::Error
     #
     # @return [void]
-    def close(notifier = (no_arg = true && :default))
-      deprecation_warn(__method__, notifier) unless no_arg
-      call_notifier(notifier, __method__)
+    def close
+      @notifiers[:default] && @notifiers[:default].close
     end
 
     ##
     # Pings the Airbrake Deploy API endpoint about the occurred deploy. This
     # method is used by the airbrake gem for various integrations.
     #
-    # @macro proxy_method
     # @param [Hash{Symbol=>String}] deploy_params The params for the API
     # @option deploy_params [Symbol] :environment
     # @option deploy_params [Symbol] :username
@@ -252,33 +236,8 @@ module Airbrake
     # @option deploy_params [Symbol] :revision
     # @option deploy_params [Symbol] :version
     # @return [void]
-    def create_deploy(deploy_params, notifier = (no_arg = true && :default))
-      deprecation_warn(__method__, notifier) unless no_arg
-      call_notifier(notifier, __method__, deploy_params)
-    end
-
-    private
-
-    ##
-    # Calls +method+ on +notifier+ with provided +args+. If +notifier+ is not
-    # configured, returns nil.
-    def call_notifier(notifier, method, *args, &block)
-      return unless configured?(notifier)
-      @notifiers[notifier].__send__(method, *args, &block)
-    end
-
-    def configured?(notifier)
-      @notifiers.key?(notifier)
-    end
-
-    def deprecation_warn(method, notifier)
-      warn(
-        "#{LOG_LABEL} `Airbrake.#{method}` method signature was changed. " \
-        "Passing `notifier_name` is deprecated and will be removed in the " \
-        "next MAJOR release.\n" \
-        "Use `Airbrake[:#{notifier}]` to access the :#{notifier} notifier " \
-        "and call same methods directly on it."
-      )
+    def create_deploy(deploy_params)
+      @notifiers[:default] && @notifiers[:default].create_deploy(deploy_params)
     end
   end
 end

data/lib/airbrake-ruby/backtrace.rb

@@ -128,8 +128,14 @@ module Airbrake
     # @param [Exception] exception
     # @return [Boolean]
     def self.java_exception?(exception)
-      defined?(Java::JavaLang::Throwable) &&
-        exception.is_a?(Java::JavaLang::Throwable)
+      if defined?(Java::JavaLang::Throwable) &&
+         exception.is_a?(Java::JavaLang::Throwable)
+        return true
+      end
+
+      return false unless exception.respond_to?(:backtrace)
+
+      (Patterns::JAVA =~ exception.backtrace.first) != nil
     end
 
     class << self

data/lib/airbrake-ruby/config.rb

@@ -96,9 +96,9 @@ module Airbrake
       self.blacklist_keys = []
       self.whitelist_keys = []
 
-      self.root_directory = (
+      self.root_directory = File.realpath(
         (defined?(Bundler) && Bundler.root) ||
-        File.expand_path(Dir.pwd)
+        Dir.pwd
       )
 
       merge(user_config)

data/lib/airbrake-ruby/notice.rb

@@ -67,7 +67,7 @@ module Airbrake
 
       @payload = {
         errors: NestedException.new(exception, @config.logger).as_json,
-        context: context(params),
+        context: context,
         environment: {},
         session: {},
         params: params
@@ -148,19 +148,8 @@ module Airbrake
 
     private
 
-    def context(params)
-      # DEPRECATION: remove the following code in the next MINOR release.
-      if params.key?(:component) || params.key?(:action)
-        @config.logger.warn(
-          "#{LOG_LABEL} passing component/action keys in the params hash is " \
-          "deprecated and will be removed soon. Please update your code to use " \
-          "`Airbrake.build_notice` and set these keys like this:\n" \
-          "  notice[:context][:component] = 'mycomponent'\n" \
-          "  notice[:context][:action] = 'myaction'"
-        )
-      end
-
-      ctx = {
+    def context
+      {
         version: @config.app_version,
         # We ensure that root_directory is always a String, so it can always be
         # converted to JSON in a predictable manner (when it's a Pathname and in
@@ -168,16 +157,9 @@ module Airbrake
         rootDirectory: @config.root_directory.to_s,
         environment: @config.environment,
 
-        # DEPRECATION: remove the following code in the next MINOR release.
-        # Legacy Airbrake v4 behaviour.
-        component: params.delete(:component),
-        action: params.delete(:action),
-
         # Make sure we always send hostname.
         hostname: HOSTNAME
-      }
-
-      ctx.merge(CONTEXT).delete_if { |_key, val| val.nil? || val.empty? }
+      }.merge(CONTEXT).delete_if { |_key, val| val.nil? || val.empty? }
     end
 
     def raise_if_ignored

data/lib/airbrake-ruby/promise.rb

@@ -9,8 +9,10 @@ module Airbrake
   # @since v1.7.0
   class Promise
     ##
+    # @api private
     # @return [Hash<String,String>] either successful response containing the
-    #   `id` key or unsuccessful response containing the `error` key
+    #   +id+ key or unsuccessful response containing the +error+ key
+    # @note This is a non-blocking call!
     attr_reader :value
 
     def initialize

data/lib/airbrake-ruby/version.rb

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

data/spec/airbrake_spec.rb

@@ -45,31 +45,6 @@ RSpec.describe Airbrake do
       expect(a_request(:post, endpoint)).to have_been_made.once
     end
 
-    context "given the notifier argument" do
-      it "sends exceptions via that notifier, ignoring other ones" do
-        bingo_string = StringIO.new
-        bango_string = StringIO.new
-
-        described_class.configure(:bingo) do |c|
-          c.project_id = 113743
-          c.project_key = 'fd04e13d806a90f96614ad8e529b2822'
-          c.logger = Logger.new(bingo_string)
-        end
-
-        described_class.configure(:bango) do |c|
-          c.project_id = 113743
-          c.project_key = 'fd04e13d806a90f96614ad8e529b2822'
-          c.logger = Logger.new(bango_string)
-        end
-
-        stub_request(:post, endpoint).to_return(status: 201, body: '{"id":1}')
-
-        described_class.notify_sync('bango', {}, :bango)
-        expect(bingo_string.string).to be_empty
-        expect(bango_string.string).to match(/\*\*Airbrake: {"id"=>1}/)
-      end
-    end
-
     describe "clean backtrace" do
       shared_examples 'backtrace building' do |msg, argument|
         it(msg) do
@@ -106,26 +81,6 @@ RSpec.describe Airbrake do
         )
       end
     end
-
-    context "special params" do
-      it "sends context/component and doesn't contain params/component" do
-        described_class.notify_sync('bingo', component: 'bango')
-
-        expect(
-          a_request(:post, endpoint).
-          with(body: /"context":{.*"component":"bango".+"params":{}/)
-        ).to have_been_made.once
-      end
-
-      it "sends context/action and doesn't contain params/action" do
-        described_class.notify_sync('bingo', action: 'bango')
-
-        expect(
-          a_request(:post, endpoint).
-          with(body: /"context":{.*"action":"bango".+"params":{}/)
-        ).to have_been_made.once
-      end
-    end
   end
 
   describe ".configure" do

data/spec/backtrace_spec.rb

@@ -106,6 +106,32 @@ RSpec.describe Airbrake::Backtrace do
       end
     end
 
+    context "JRuby non-throwable exceptions" do
+      let(:backtrace) do
+        # rubocop:disable Metrics/LineLength
+        ['org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(org/postgresql/core/v3/ConnectionFactoryImpl.java:257)',
+         'org.postgresql.core.ConnectionFactory.openConnection(org/postgresql/core/ConnectionFactory.java:65)',
+         'org.postgresql.jdbc2.AbstractJdbc2Connection.<init>(org/postgresql/jdbc2/AbstractJdbc2Connection.java:149)']
+        # rubocop:enable Metrics/LineLength
+      end
+
+      let(:parsed_backtrace) do
+        # rubocop:disable Metrics/LineLength
+        [{ file: 'org/postgresql/core/v3/ConnectionFactoryImpl.java', line: 257, function: 'org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl' },
+         { file: 'org/postgresql/core/ConnectionFactory.java', line: 65, function: 'org.postgresql.core.ConnectionFactory.openConnection' },
+         { file: 'org/postgresql/jdbc2/AbstractJdbc2Connection.java', line: 149, function: 'org.postgresql.jdbc2.AbstractJdbc2Connection.<init>' }]
+        # rubocop:enable Metrics/LineLength
+      end
+
+      let(:ex) { AirbrakeTestError.new.tap { |e| e.set_backtrace(backtrace) } }
+
+      it "returns a properly formatted array of hashes" do
+        expect(
+          described_class.parse(ex, Logger.new('/dev/null'))
+        ).to eq(parsed_backtrace)
+      end
+    end
+
     context "generic backtrace" do
       context "when function is absent" do
         # rubocop:disable Metrics/LineLength

data/spec/config_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Airbrake::Config do
       end
 
       it "sets the default root_directory" do
-        expect(config.root_directory).to eq Bundler.root
+        expect(config.root_directory).to eq Bundler.root.realpath.to_s
       end
 
       it "doesn't set the default environment" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec