airbrake-ruby 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec071c8c6dc94827a5094f345a3e04f6e14d403
-  data.tar.gz: f70b0927dcb8a948890cbe1f08f440dbffa832ea
+  metadata.gz: 14a1f47941cce7fb05a4606b830dad7d5021a808
+  data.tar.gz: 0c3bfcea4c50a6bfe983e15432bab8fe966ed327
 SHA512:
-  metadata.gz: 23da1628abcb6f3db15af6988c346f102ebda373ee6ac30212981680cd76014de7c15cdf4e877e81ef7f6fbd7e7996f5c07501cf1472c4c9b9cb8f9e4be22a6d
-  data.tar.gz: 5df62237f843c6521677c6e8f5ceb98547ef76d8931334fb6e611ca489dcb7337cb03044cad51d76375a4339ab426b750a5dd63e2d6addeda80c3f7cb1e0dc31
+  metadata.gz: 38deadf6ffea07e915398e08258766b86ab8b22a276622326c6ebd66b792da1f97beccaec485da2dc6edef81193b028926c539aac2966f2dffd436721fe6bac0
+  data.tar.gz: 6fa74b32ceb3907eaf1e0173c3d78fca7fefe3b0e94d9cad44b092abfafb7d0d57c2d81ed861d7c833e0b46689c3b81b1de1a74ac54203e80f6e9318b1526f8e

data/lib/airbrake-ruby/notice.rb

@@ -75,18 +75,18 @@ module Airbrake
     # notice's payload. Truncates notices, JSON representation of which is
     # bigger than {MAX_NOTICE_SIZE}.
     #
-    # @return [Hash{String=>String}]
+    # @return [Hash{String=>String}, nil]
     def to_json
       loop do
         begin
           json = payload.to_json
         rescue *JSON_EXCEPTIONS => ex
-          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.to_s.chomp}")
+          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")
         else
           return json if json && json.bytesize <= MAX_NOTICE_SIZE
         end
 
-        truncate_payload
+        break if truncate_payload.zero?
       end
     end
 
@@ -188,7 +188,16 @@ module Airbrake
         @truncator.truncate_object(@modifiable_payload[key])
       end
 
-      @truncator.reduce_max_size
+      new_max_size = @truncator.reduce_max_size
+      if new_max_size.zero?
+        @config.logger.error(
+          "#{LOG_LABEL} truncation failed. File an issue at " \
+          "https://github.com/airbrake/airbrake-ruby " \
+          "and attach the following payload: #{payload}"
+        )
+      end
+
+      new_max_size
     end
   end
 end

data/lib/airbrake-ruby/sync_sender.rb

@@ -23,6 +23,14 @@ module Airbrake
     def send(notice, endpoint = @config.endpoint)
       response = nil
       req = build_post_request(endpoint, notice)
+
+      if req.body.nil?
+        @config.logger.error(
+          "#{LOG_LABEL} notice was not sent because of missing body"
+        )
+        return
+      end
+
       https = build_https(endpoint)
 
       begin

data/lib/airbrake-ruby/version.rb

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

data/spec/notice_spec.rb

@@ -65,6 +65,27 @@ RSpec.describe Airbrake::Notice do
         include_examples 'payloads', 300, small_msg
       end
 
+      context "when truncation failed" do
+        it "returns nil" do
+          expect_any_instance_of(Airbrake::PayloadTruncator).
+            to receive(:reduce_max_size).and_return(0)
+
+          encoded = Base64.encode64("\xD3\xE6\xBC\x9D\xBA").encode!('ASCII-8BIT')
+          bad_string = Base64.decode64(encoded)
+
+          ex = AirbrakeTestError.new
+
+          backtrace = []
+          10.times { backtrace << "bin/rails:3:in `<#{bad_string}>'" }
+          ex.set_backtrace(backtrace)
+
+          config = Airbrake::Config.new(logger: Logger.new('/dev/null'))
+          notice = described_class.new(config, ex)
+
+          expect(notice.to_json).to be_nil
+        end
+      end
+
       describe "object replacement with its string version" do
         let(:klass) { Class.new {} }
         let(:ex) { AirbrakeTestError.new }

data/spec/payload_truncator_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Airbrake::PayloadTruncator do
     @truncator = described_class.new(max_size, Logger.new('/dev/null'))
   end
 
-  describe ".truncate_error" do
+  describe "#truncate_error" do
     let(:error) do
       { type: 'AirbrakeTestError', message: 'App crashed!', backtrace: [] }
     end
@@ -89,7 +89,7 @@ RSpec.describe Airbrake::PayloadTruncator do
     end
   end
 
-  describe ".truncate_object" do
+  describe "#truncate_object" do
     describe "given a hash with short values" do
       let(:params) do
         { bingo: 'bango', bongo: 'bish', bash: 'bosh' }

data/spec/sync_sender_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Airbrake::SyncSender do
     it "catches exceptions raised when sending" do
       stdout = StringIO.new
       config = Airbrake::Config.new(logger: Logger.new(stdout))
-      sender = described_class.new config
+      sender = described_class.new(config)
       notice = Airbrake::Notice.new(config, AirbrakeTestError.new)
       https = double("foo")
       allow(sender).to receive(:build_https).and_return(https)
@@ -23,5 +23,29 @@ RSpec.describe Airbrake::SyncSender do
       expect(sender.send(notice)).to be_nil
       expect(stdout.string).to match(/ERROR -- : .+ HTTP error: foo/)
     end
+
+    context "when request body is nil" do
+      it "doesn't send a notice" do
+        expect_any_instance_of(Airbrake::PayloadTruncator).
+          to receive(:reduce_max_size).and_return(0)
+
+        encoded = Base64.encode64("\xD3\xE6\xBC\x9D\xBA").encode!('ASCII-8BIT')
+        bad_string = Base64.decode64(encoded)
+
+        ex = AirbrakeTestError.new
+        backtrace = []
+        10.times { backtrace << "bin/rails:3:in `<#{bad_string}>'" }
+        ex.set_backtrace(backtrace)
+
+        stdout = StringIO.new
+        config = Airbrake::Config.new(logger: Logger.new(stdout))
+
+        sender = described_class.new(config)
+        notice = Airbrake::Notice.new(config, ex)
+
+        expect(sender.send(notice)).to be_nil
+        expect(stdout.string).to match(/ERROR -- : .+ notice was not sent/)
+      end
+    end
   end
 end

metadata

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