rorvswild 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 232fd31fbdd8f8aa04082081440dab07b08476e0
-  data.tar.gz: c2159c0e883a30214d2bb6b2230a4a1401269862
+  metadata.gz: 2090ba967a7c985f4403ac9e01fc364886120dd9
+  data.tar.gz: 6251252d0727624d67fecb7a680786baac12b89b
 SHA512:
-  metadata.gz: 701d9293224c6ab52761adfb3af3a6b7985fc1ffe1c2675bbf80faeb2f820254e97fe151b124a79b50a08541c4176b250d71a5012766c0a3a1791952e0bc382b
-  data.tar.gz: 5f6d5fb467f80b56fe300967fa8a40bce38cef2d057f812ee767c2825d42cde2fbc5c0a6ed645ee8810621cc4d8f9c25ca1a3212c7d7847cc014bbb72406252d
+  metadata.gz: 711ed99628c2daeddb99b7ca068401e1d266ab655977e39f3f79b6ca9af6e6aa6b8b051addc4e3dcf4eba0c1e6d2a002541bb332422b4102f1056b86d52343c0
+  data.tar.gz: 269fb5c4c938c7b891d4fb1e4f7c8515f137c3797c1fb83b2c15f981ab68f3f9fb44912ca86eb0f9035dbe6a76be634eb1de6fb5a8d50734236862734b37b0ab

data/lib/rorvswild.rb

@@ -100,7 +100,7 @@ module RorVsWild
     end
 
     def before_http_request(name, start, finish, id, payload)
-      request.merge!(controller: payload[:controller], action: payload[:action], path: payload[:path])
+      request.merge!(controller: payload[:controller], action: payload[:action], path: payload[:path], queries: [], views: {})
     end
 
     def after_http_request(name, start, finish, id, payload)
@@ -118,7 +118,7 @@ module RorVsWild
       file, line, method = extract_most_relevant_location(caller)
       runtime, sql = compute_duration(start, finish), payload[:sql]
       plan = runtime >= explain_sql_threshold ? explain(payload[:sql], payload[:binds]) : nil
-      push_query(file: file, line: line, method: method, sql: sql, plan: plan, runtime: runtime, times: 1)
+      push_query(file: file, line: line, method: method, sql: sql, plan: plan, runtime: runtime)
     rescue => exception
       log_error(exception)
     end
@@ -160,10 +160,11 @@ module RorVsWild
 
     def measure_block(name, &block)
       job[:name] = name
+      job[:queries] = []
       started_at = Time.now
       cpu_time_offset = cpu_time
       block.call
-    rescue => exception
+    rescue Exception => exception
       job[:error] = exception_to_hash(exception)
       raise
     ensure
@@ -175,7 +176,7 @@ module RorVsWild
     def catch_error(extra_details = nil, &block)
       begin
         block.call
-      rescue => exception
+      rescue Exception => exception
         record_error(exception, extra_details)
         exception
       end
@@ -197,11 +198,11 @@ module RorVsWild
     private
 
     def queries
-      data[:queries] ||= []
+      data[:queries]
     end
 
     def views
-      data[:views] ||= {}
+      data[:views]
     end
 
     def job
@@ -222,10 +223,16 @@ module RorVsWild
 
     def push_query(query)
       if hash = queries.find { |hash| hash[:line] == query[:line] && hash[:file] == query[:file] }
+        if query[:runtime] > hash[:max_runtime]
+          hash[:max_runtime] = query[:runtime]
+          hash[:plan] = query[:plan]
+          hash[:sql] = query[:sql]
+        end
         hash[:runtime] += query[:runtime]
-        hash[:plan] = query[:plan]
         hash[:times] += 1
       else
+        query[:times] = 1
+        query[:max_runtime] = query[:runtime]
         queries << query
       end
     end

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

data/test/ror_vs_wild_test.rb

@@ -79,6 +79,14 @@ class RorVsWildTest < MiniTest::Unit::TestCase
     assert_equal(["/app/models/user.rb", "3", "method3"], client.send(:extract_most_relevant_location, callstack))
   end
 
+  def test_push_query
+    client = initialize_client
+    client.send(:data)[:queries] = []
+    client.send(:push_query, {file: "file", line: 123, sql: "SELECT 1", runtime: 10})
+    client.send(:push_query, {file: "file", line: 123, sql: "SELECT 2", runtime: 11})
+    assert_equal([{file: "file", line: 123, sql: "SELECT 2", runtime: 21, max_runtime: 11, times: 2, plan: nil,}], client.send(:queries))
+  end
+
   private
 
   def client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler