rorvswild 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9692fc304ba53c4419979e2e90f80c8dddcbe52c
-  data.tar.gz: 6c604d217cda610c5f2c3e0cee95cbb09ff9aac1
+  metadata.gz: eeecdd2dfd26ee6068a96bcb067e946e8bd1b904
+  data.tar.gz: 39387cead4fa49a5c6ee04ce03a35950ed1ff5c0
 SHA512:
-  metadata.gz: 9925488161d75f9d0a01893abf87c4486b958e468379fd198cc973dc7ff50af27977c6c8b0167194befc6076c623fa5f2ae80042e01d652881c5634607ce2d35
-  data.tar.gz: b98e6ec554834ce2b6449037fea17732a3413442ee7fd0e811ba1b61ddd936ebe47e3fc916809855e684ecf73879a87d349f4348646b71e4b9830d21e5de0b23
+  metadata.gz: 1d142fb4e7f10a32220e44e12665b1ad311a250790274c65e3cf4c11d4aa2390e480aca3e6dabfc4b2345986b4faa1445d9c3a3542024ba039834f03a3a22842
+  data.tar.gz: ead8f7d8516a43c70c2625868752938188cdfce6a9dd522ea6f339bdac66bb3dbed450eaff216eb42fce732dac633feb24690f1b1f2f8fef629493f415527ca0

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

data/lib/rorvswild.rb

@@ -88,7 +88,7 @@ module RorVsWild
     def after_sql_query(name, start, finish, id, payload)
       return if !queries || payload[:name] == "EXPLAIN".freeze
       runtime, sql, plan = compute_duration(start, finish), nil, nil
-      file, line, method = extract_file_and_line_from_call_stack(caller)
+      file, line, method = extract_query_location(caller)
       # I can't figure out the exact location which triggered the query, so at least the SQL is logged.
       sql, file, line, method = payload[:sql], "Unknow", 0, "Unknow" if !file
       sql = payload[:sql] if runtime >= log_sql_threshold
@@ -227,11 +227,19 @@ module RorVsWild
       post("/errors", error: hash)
     end
 
-    def extract_file_and_line_from_call_stack(stack)
-      return unless location = stack.find { |str| str.include?(Rails.root.to_s) }
+    def extract_query_location(stack)
+      if location = stack.find { |str| str.include?(Rails.root.to_s) }
+        split_file_location(location.sub(Rails.root.to_s, "".freeze))
+      end
+    end
+
+    def extract_error_location(stack)
+      extract_query_location(stack) || split_file_location(stack.first)
+    end
+
+    def split_file_location(location)
       file, line, method = location.split(":")
       method = cleanup_method_name(method)
-      file.sub!(Rails.root.to_s, "")
       [file, line, method]
     end
 
@@ -251,8 +259,9 @@ module RorVsWild
     end
 
     def exception_to_hash(exception, extra_details = nil)
-      file, line = exception.backtrace.first.split(":")
+      file, line, method = extract_error_location(exception.backtrace)
       {
+        method: method,
         line: line.to_i,
         file: relative_path(file),
         message: exception.message,

data/test/ror_vs_wild_test.rb

@@ -56,6 +56,20 @@ class RorVsWildTest < MiniTest::Unit::TestCase
     assert_equal(2, RorVsWild.catch_error { 1 + 1 })
   end
 
+  def test_extract_query_location
+    callstack = ["/ruby/gems/lib/sql.rb:1:in `method1'", "#{Rails.root}/app/models/user.rb:2:in `method2'"]
+    assert_equal(%w[/app/models/user.rb 2 method2], client.send(:extract_query_location, callstack))
+    refute(client.send(:extract_query_location, ["/ruby/gems/lib/sql.rb:1:in `method1'", "/foo/bar.rb:2:in `method2'"]))
+  end
+
+  def test_extract_error_location
+    callstack = ["/ruby/gems/lib/sql.rb:1:in `method1'", "#{Rails.root}/app/models/user.rb:2:in `method2'"]
+    assert_equal(%w[/app/models/user.rb 2 method2], client.send(:extract_error_location, callstack))
+
+    callstack = ["/ruby/gems/lib/sql.rb:1:in `method1'", "/foo/bar.rb:2:in `method2'"]
+    assert_equal(%w[/ruby/gems/lib/sql.rb 1 method1], client.send(:extract_error_location, callstack))
+  end
+
   private
 
   def client
@@ -75,6 +89,6 @@ require "pathname"
 
 module Rails
   def self.root
-    Pathname.new("foo")
+    Pathname.new("/rails/root")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler