rorvswild 1.0.0.pre.alpha → 1.0.0.pre.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1736359534ad385b3f94023b6f58aedeb80758d9
-  data.tar.gz: 7b3977b85d8cc46cf332bccd8ada6c8ed482a1a4
+  metadata.gz: b2e54a9c9fc7d9ef4b92bc45f8f0ecbc52105af2
+  data.tar.gz: 7961fe5c7ae2c6feb83cfd5c08e00d73b9cbe4f8
 SHA512:
-  metadata.gz: 0851e785429d0263cdf0f0b98792db188a9616fc16bb98847dd2e1ccb979e3627a5a591f6282468c62e18ca46ccba79aaa10441c60f2b258d51b174d28c25489
-  data.tar.gz: 02e3b948d90d5fb378c6707d6e2d563348a1549bec9465e7a5dd2d00488d918d229e9d5ef0ef11dc3cf4453ea8d686539b8ff6c1e6695ae5ef768ab1e8b021b3
+  metadata.gz: 4a38e82f8384ce51edc22282b536047f1f38a3c33cc4e465bbfdf22e81720e928fbce9e8eda575a5e3e8906faa9c113afde036d4955cda6ee3e6b7cf5bdf9989
+  data.tar.gz: bf0b0b27b2e44bd742b6374b351f5736d2cdbc8742346d218cfbd9ecc9da314271c32f69b6a4aeb30efd5bcc5be8e4d185b6871a291c3dc3c1009ac0ab1d8046

data/lib/rorvswild/agent.rb

@@ -161,9 +161,8 @@ module RorVsWild
     end
 
     def exception_to_hash(exception, extra_details = nil)
-      file, line, method = extract_most_relevant_file_and_line(exception.backtrace_locations)
+      file, line = extract_most_relevant_file_and_line_from_exception(exception)
       {
-        method: method,
         line: line.to_i,
         file: relative_path(file),
         message: exception.message,

data/lib/rorvswild/location.rb

@@ -1,13 +1,29 @@
 module RorVsWild
   module Location
+    def extract_most_relevant_file_and_line(locations)
+      location = find_most_relevant_location(locations)
+      [relative_path(location.path), location.lineno]
+    end
+
     def find_most_relevant_location(locations)
       result = locations.find { |l| l.path.index(app_root) == 0 && !(l.path =~ gem_home_regex) } if app_root
       result || locations.find { |l| !(l.path =~ gem_home_regex) } || locations.first
     end
 
-    def extract_most_relevant_file_and_line(stack)
-      location = find_most_relevant_location(stack)
-      [relative_path(location.path), location.lineno]
+    def extract_most_relevant_file_and_line_from_exception(exception)
+      # Exception#backtrace_locations is faster but exists since 2.1.0.
+      # Sometime Exception#backtrace_locations returns nil for an unknow reason. So we fallback to the old way.
+      if exception.respond_to?(:backtrace_locations) && locations = exception.backtrace_locations
+        extract_most_relevant_file_and_line(locations)
+      else
+        extract_most_relevant_file_and_line_from_array_of_strings(exception.backtrace)
+      end
+    end
+
+    def extract_most_relevant_file_and_line_from_array_of_strings(stack)
+      location = stack.find { |str| str =~ app_root_regex && !(str =~ gem_home_regex) } if app_root_regex
+      location ||= stack.find { |str| !(str =~ gem_home_regex) } if gem_home_regex
+      relative_path(location || stack.first).split(":".freeze)
     end
 
     def gem_home_regex

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "1.0.0-alpha".freeze
+  VERSION = "1.0.0-alpha2".freeze
 end

data/test/rorvswild_test.rb

@@ -126,6 +126,14 @@ class RorVsWildTest < Minitest::Test
     ENV["GEM_HOME"], ENV["GEM_PATH"] = original_gem_home,  original_gem_path
   end
 
+  def test_extract_most_relevant_file_and_line_from_array_of_strings
+    callstack = ["#{ENV["GEM_HOME"]}/lib/sql.rb:1", "/usr/lib/ruby/net/http.rb:2", "/rails/root/app/models/user.rb:3"]
+    assert_equal(["/app/models/user.rb", "3"], agent.extract_most_relevant_file_and_line_from_array_of_strings(callstack))
+
+    locations = ["#{ENV["GEM_HOME"]}/lib/sql.rb:1"]
+    assert_equal(["#{ENV["GEM_HOME"]}/lib/sql.rb", "1"], agent.extract_most_relevant_file_and_line_from_array_of_strings(locations))
+  end
+
   private
 
   def agent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha
+  version: 1.0.0.pre.alpha2
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler