airbrake-ruby 2.5.0.rc.1 → 2.5.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5554bbef3980de04e9ba1028bb6378434e027bae
-  data.tar.gz: 2b676212734c40e4952bdf00646052bec77fbd36
+  metadata.gz: 9aff45eea602c2f6f86609e6625146b33f91aa33
+  data.tar.gz: 51c9fb9f2f4e8d5df50832fbbfca92fda7e54239
 SHA512:
-  metadata.gz: 2ebf2c15e4608233bbd88e05fa904008fdd401c65b549604e985d1199f9e44c9899df372a1224c6c65f4adb8d5be4211f7ff61642c0eadba6001208fc464e4cc
-  data.tar.gz: 85cd37c40c76f1c94aa83382d90ac4b751a3c250a287ffbe36fa89b42f97868a2ef031010aa8ac11266bdc35379d737ee1ec1409f3057e0a8e087732f0c35bf5
+  metadata.gz: e7f2bf4d0415c18bb4385f612f7ca55ea2a8ee83259ee800dc058299e8f51ae1b51ec3c3467156a81547d2d1ad70d5717f1e6c01b53b6012f6a58a1cb141738c
+  data.tar.gz: a8f8a22d199ad6326812daca779c664c53b83c65cc772e370d5cb7ae0a1fb92a65df5b8a33ad8645880571be5ca9f85f44cb030747c4c8ec2ae7e999102d53eb

data/lib/airbrake-ruby/code_hunk.rb

@@ -22,26 +22,11 @@ module Airbrake
     # @return [Hash{Integer=>String}, nil] lines of code around the base line
     def get(file, line)
       return unless File.exist?(file)
+      return unless line
 
-      start_line = [line - NLINES, 1].max
-      end_line = line + NLINES
-      lines = {}
-
-      begin
-        get_from_cache(file).with_index(1) do |l, i|
-          next if i < start_line
-          break if i > end_line
-
-          lines[i] = l[0...MAX_LINE_LEN].rstrip
-        end
-      rescue StandardError => ex
-        @config.logger.error(
-          "#{self.class.name}##{__method__}: can't read code hunk for " \
-          "#{file}:#{line}: #{ex}\n#{ex.backtrace}"
-        )
-      end
-
+      lines = get_lines(file, [line - NLINES, 1].max, line + NLINES) || {}
       return { 1 => '' } if lines.empty?
+
       lines
     end
 
@@ -49,6 +34,24 @@ module Airbrake
 
     def get_from_cache(file)
       Airbrake::FileCache[file] ||= File.foreach(file)
+    rescue StandardError => ex
+      @config.logger.error(
+        "#{self.class.name}: can't read code hunk for #{file}: #{ex}"
+      )
+      nil
+    end
+
+    def get_lines(file, start_line, end_line)
+      return unless (cached_file = get_from_cache(file))
+
+      lines = {}
+      cached_file.with_index(1) do |l, i|
+        next if i < start_line
+        break if i > end_line
+
+        lines[i] = l[0...MAX_LINE_LEN].rstrip
+      end
+      lines
     end
   end
 end

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

@@ -24,7 +24,7 @@ module Airbrake
               # 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)
+              frame[:file] = file.sub(/\A#{gem_path}/, GEM_ROOT_LABEL)
             end
           end
         end

data/lib/airbrake-ruby/version.rb

@@ -4,5 +4,5 @@
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '2.5.0.rc.1'.freeze
+  AIRBRAKE_RUBY_VERSION = '2.5.0.rc.2'.freeze
 end

data/spec/code_hunk_spec.rb

@@ -3,8 +3,14 @@ require 'spec_helper'
 RSpec.describe Airbrake::CodeHunk do
   let(:config) { Airbrake::Config.new }
 
+  after do
+    %w[empty_file.rb code.rb banana.rb short_file.rb long_line.txt].each do |f|
+      Airbrake::FileCache[fixture_path(f)] = nil
+    end
+  end
+
   describe "#to_h" do
-    context "when a file is empty" do
+    context "when file is empty" do
       subject do
         described_class.new(config).get(fixture_path('empty_file.rb'), 1)
       end
@@ -12,6 +18,12 @@ RSpec.describe Airbrake::CodeHunk do
       it { is_expected.to eq(1 => '') }
     end
 
+    context "when line is nil" do
+      subject { described_class.new(config).get(fixture_path('code.rb'), nil) }
+
+      it { is_expected.to be_nil }
+    end
+
     context "when a file doesn't exist" do
       subject { described_class.new(config).get(fixture_path('banana.rb'), 1) }
 
@@ -91,7 +103,7 @@ RSpec.describe Airbrake::CodeHunk do
 
     context "when an error occurrs while fetching code" do
       before do
-        expect(File).to receive(:foreach).and_raise(Errno::EACCES)
+        expect(Airbrake::FileCache).to receive(:[]).and_raise(Errno::EACCES)
       end
 
       it "logs error and returns nil" do

data/spec/notice_spec.rb

@@ -207,7 +207,7 @@ RSpec.describe Airbrake::Notice do
 
     it "always contains environment/program_name" do
       expect(notice.to_json).
-        to match(%r|"environment":{"program_name":.+/exe/rspec.*|)
+        to match(%r|"environment":{"program_name":.+/rspec.*|)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 2.5.0.rc.1
+  version: 2.5.0.rc.2
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec