rorvswild 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1688d79676d52dc69efdbf5cb2149f0f1e8af89
-  data.tar.gz: 3c3428fd9bb732a4b18513206cb240e7125ad7ee
+  metadata.gz: 232fd31fbdd8f8aa04082081440dab07b08476e0
+  data.tar.gz: c2159c0e883a30214d2bb6b2230a4a1401269862
 SHA512:
-  metadata.gz: 2320d56b3563cf5a0257117e0b2eadf1958546aef3b40c84616da98d4068dc2a2844b879396e0532f0c910f8103f058896c8d963c11abcff8a24b19d03d2fd90
-  data.tar.gz: baffb82f1be10cf110c3d22230873af90e3bc2bc3269c04df3a1a4b896f504d062a85ff623927238f47a93f9840eb1e28ac880f470bccf68add3d8f2284bfdc3
+  metadata.gz: 701d9293224c6ab52761adfb3af3a6b7985fc1ffe1c2675bbf80faeb2f820254e97fe151b124a79b50a08541c4176b250d71a5012766c0a3a1791952e0bc382b
+  data.tar.gz: 5f6d5fb467f80b56fe300967fa8a40bce38cef2d057f812ee767c2825d42cde2fbc5c0a6ed645ee8810621cc4d8f9c25ca1a3212c7d7847cc014bbb72406252d

data/lib/rorvswild/version.rb

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

data/lib/rorvswild.rb

@@ -10,6 +10,19 @@ module RorVsWild
     Client.new(*args) # Compatibility with 0.0.1
   end
 
+  def self.detect_config_file
+    return if !defined?(Rails)
+    Rails::Railtie.initializer "rorvswild.detect_config_file" do
+      if !RorVsWild.default_client && (path = Rails.root.join("config/rorvswild.yml")).exist?
+        RorVsWild.load_config_file(path, Rails.env)
+      end
+    end
+  end
+
+  def self.load_config_file(path, environment)
+    config = YAML.load_file(path)[environment.to_s] and Client.new(config.symbolize_keys)
+  end
+
   def self.register_default_client(client)
     @default_client = client
   end
@@ -43,16 +56,14 @@ module RorVsWild
       {
         api_url: "http://www.rorvswild.com/api",
         explain_sql_threshold: 500,
-        log_sql_threshold: 100,
       }
     end
 
-    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :log_sql_threshold, :app_root, :app_root_regex
+    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :app_root, :app_root_regex
 
     def initialize(config)
       config = self.class.default_config.merge(config)
       @explain_sql_threshold = config[:explain_sql_threshold]
-      @log_sql_threshold = config[:log_sql_threshold]
       @app_root = config[:app_root]
       @api_url = config[:api_url]
       @api_key = config[:api_key]
@@ -103,13 +114,10 @@ module RorVsWild
     end
 
     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
+      return if !queries || payload[:name] == "EXPLAIN".freeze || payload[:name] == "SCHEMA".freeze
       file, line, method = extract_most_relevant_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
-      plan = explain(payload[:sql], payload[:binds]) if runtime >= explain_sql_threshold
+      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)
     rescue => exception
       log_error(exception)
@@ -213,15 +221,12 @@ module RorVsWild
     end
 
     def push_query(query)
-      if query[:sql] || query[:plan]
-        queries << query
+      if hash = queries.find { |hash| hash[:line] == query[:line] && hash[:file] == query[:file] }
+        hash[:runtime] += query[:runtime]
+        hash[:plan] = query[:plan]
+        hash[:times] += 1
       else
-        if hash = queries.find { |hash| hash[:line] == query[:line] && hash[:file] == query[:file] }
-          hash[:runtime] += query[:runtime]
-          hash[:times] += 1
-        else
-          queries << query
-        end
+        queries << query
       end
     end
 
@@ -320,8 +325,8 @@ module RorVsWild
     end
 
     def log_error(exception)
-      logger.puts("[RorVsWild] " + exception.inspect)
-      logger.puts("[RorVsWild] " + exception.backtrace.join("\n[RorVsWild] "))
+      @logger.error("[RorVsWild] " + exception.inspect)
+      @logger.error("[RorVsWild] " + exception.backtrace.join("\n[RorVsWild] "))
     end
   end
 
@@ -339,3 +344,5 @@ module RorVsWild
     end
   end
 end
+
+RorVsWild.detect_config_file

metadata

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