airbrake-ruby 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26dc2614a9b7f3853bf504c7bf59e87844c0d319
-  data.tar.gz: ab91d35ff054319c4c15b97f7286cb80748410b7
+  metadata.gz: 872e5dbd662f107ff1edc407c3e0464816884252
+  data.tar.gz: ad9561bb25b64fe45eaab08f8e53860dd26d92dd
 SHA512:
-  metadata.gz: 8be384f5265c4232b4ef0f4239b41837ef9b5974bb95361a5d554a100d393a37314aa7fbe7e586953159f3ab7dc860a02938be41a9bc2cf4dd7c5ce015cd6400
-  data.tar.gz: 6b1086df37f5f2dbbf29f09caa4e3b1205bc41e323ec046868d528d1fa07f2e47a9de078f4878d6bf8d2bb085a3efbc9c401be3fba51d7de09de63c468ef39f4
+  metadata.gz: 7026eac93af682eb7885c62ca608507cc66273da5341fda6d145ad0b692dfa866195ffb3331cea33e8b276199608b0f706fb67db08a64ba8477f0300a9557ecf
+  data.tar.gz: 2f6d1b674f9342088ddb4cc0231d5fc923814a99077131ab67abcf121d66ac96dccbc4eaad3a16dc758148dd4e8caffec193c08436a8dac356fd1827220ea32b

data/lib/airbrake-ruby/config.rb

@@ -125,6 +125,22 @@ module Airbrake
       self
     end
 
+    ##
+    # @return [Boolean] true if the config meets the requirements, false
+    #   otherwise
+    def valid?
+      return true if ignored_environment?
+      return false unless project_id.is_a?(Integer)
+      project_key.is_a?(String) && !project_key.empty?
+    end
+
+    ##
+    # @return [Boolean] true if the config ignores current environment, false
+    #   otherwise
+    def ignored_environment?
+      ignore_environments.include?(environment)
+    end
+
     private
 
     def set_option(option, value)

data/lib/airbrake-ruby/notifier.rb

@@ -30,7 +30,7 @@ module Airbrake
     def initialize(user_config)
       @config = (user_config.is_a?(Config) ? user_config : Config.new(user_config))
 
-      unless [@config.project_id, @config.project_key].all?
+      unless @config.valid?
         raise Airbrake::Error, 'both :project_id and :project_key are required'
       end
 
@@ -143,9 +143,7 @@ module Airbrake
     end
 
     def send_notice(exception, params, sender = default_sender)
-      if @config.ignore_environments.any?
-        return if @config.ignore_environments.include?(@config.environment)
-      end
+      return if @config.ignored_environment?
 
       notice = build_notice(exception, params)
       @filter_chain.refine(notice)

data/lib/airbrake-ruby/version.rb

@@ -3,5 +3,5 @@
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '1.3.2'.freeze
+  AIRBRAKE_RUBY_VERSION = '1.4.0'.freeze
 end

data/spec/config_spec.rb

@@ -76,4 +76,75 @@ RSpec.describe Airbrake::Config do
       end
     end
   end
+
+  describe "#valid?" do
+    context "when project_id is nil" do
+      it "returns false" do
+        config.project_id = nil
+        config.project_key = '123'
+
+        expect(config).not_to be_valid
+      end
+    end
+
+    context "when project_key is nil" do
+      it "returns false" do
+        config.project_id = 123
+        config.project_key = nil
+
+        expect(config).not_to be_valid
+      end
+    end
+
+    context "when the current environment is ignored" do
+      context "and when the notifier misconfigures configure project_key & project_id" do
+        it "returns true" do
+          config.project_id = Object.new
+          config.project_key = Object.new
+          config.environment = :bingo
+          config.ignore_environments = [:bingo]
+
+          expect(config).to be_valid
+        end
+      end
+
+      context "and when the notifier configures project_key & project_id" do
+        it "returns true" do
+          config.project_id = 123
+          config.project_key = '321'
+          config.environment = :bingo
+          config.ignore_environments = [:bingo]
+
+          expect(config).to be_valid
+        end
+      end
+    end
+
+    context "when the project_id value is not an Integer" do
+      it "returns false" do
+        config.project_id = '123'
+        config.project_key = '321'
+
+        expect(config).not_to be_valid
+      end
+    end
+
+    context "when the project_key value is not a String" do
+      it "returns false" do
+        config.project_id = 123
+        config.project_key = 321
+
+        expect(config).not_to be_valid
+      end
+    end
+
+    context "when the project_key value is an empty String" do
+      it "returns false" do
+        config.project_id = 123
+        config.project_key = ''
+
+        expect(config).not_to be_valid
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec