rorvswild 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: defe2d991680e75ff224dcdf201db4410853b1c4
-  data.tar.gz: 6af12c56716629ac4b2a4abed82493639d49ba52
+  metadata.gz: f1688d79676d52dc69efdbf5cb2149f0f1e8af89
+  data.tar.gz: 3c3428fd9bb732a4b18513206cb240e7125ad7ee
 SHA512:
-  metadata.gz: b2815352f7222b25537f8a075527cb0a11a8a108029f9a19c91459156784b286519a20321c3a51cc0b9f3e2ecf59da637f8c57d504ab97fbe4da5f58e0c30db9
-  data.tar.gz: 26d522bbce03f923a85ce76f04e54d8476124b90a9d2e205ca85431a5a746a9ad0f369989f0544139093e6c5775cd1060f9aa92c264f5c12a85168ef4c96ddd5
+  metadata.gz: 2320d56b3563cf5a0257117e0b2eadf1958546aef3b40c84616da98d4068dc2a2844b879396e0532f0c910f8103f058896c8d963c11abcff8a24b19d03d2fd90
+  data.tar.gz: baffb82f1be10cf110c3d22230873af90e3bc2bc3269c04df3a1a4b896f504d062a85ff623927238f47a93f9840eb1e28ac880f470bccf68add3d8f2284bfdc3

data/lib/rorvswild/version.rb

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

data/lib/rorvswild.rb

@@ -1,6 +1,7 @@
 require "rorvswild/version"
 require "json/ext"
 require "net/http"
+require "logger"
 require "uri"
 
 module RorVsWild
@@ -46,23 +47,35 @@ module RorVsWild
       }
     end
 
-    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :log_sql_threshold
+    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :log_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]
       @app_id = config[:app_id]
+      @logger = config[:logger]
       @data = {}
+
+      if defined?(Rails)
+        @logger ||= Rails.logger
+        @app_root ||= Rails.root.to_s
+        @parameter_filter = ActionDispatch::Http::ParameterFilter.new(Rails.application.config.filter_parameters)
+      end
+
+      @logger ||= Logger.new(STDERR)
+      @app_root_regex = app_root ? /\A#{app_root}/ : nil
+
       setup_callbacks
       RorVsWild.register_default_client(self)
     end
 
     def setup_callbacks
       client = self
-      if defined?(Rails)
+      if defined?(ActiveSupport::Notifications)
         ActiveSupport::Notifications.subscribe("sql.active_record", &method(:after_sql_query))
         ActiveSupport::Notifications.subscribe("render_template.action_view", &method(:after_view_rendering))
         ActiveSupport::Notifications.subscribe("process_action.action_controller", &method(:after_http_request))
@@ -248,7 +261,8 @@ module RorVsWild
     GEM_HOME_REGEX = ENV["GEM_HOME"] ? /\A#{ENV["GEM_HOME"]}/.freeze : nil
 
     def extract_most_relevant_location(stack)
-      location = stack.find { |str| !(str =~ GEM_HOME_REGEX) } if GEM_HOME_REGEX
+      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
       split_file_location(relative_path(location || stack.first))
     end
 
@@ -270,7 +284,7 @@ module RorVsWild
     end
 
     def relative_path(path)
-      defined?(Rails) ? path.sub(Rails.root.to_s, "".freeze) : path
+      app_root_regex ? path.sub(app_root_regex, "".freeze) : path
     end
 
     def exception_to_hash(exception, extra_details = nil)
@@ -298,12 +312,7 @@ module RorVsWild
     end
 
     def filter_sensitive_data(hash)
-      if defined?(Rails)
-        @sensitive_filter ||= ActionDispatch::Http::ParameterFilter.new(Rails.application.config.filter_parameters)
-        @sensitive_filter.filter(hash)
-      else
-        hash
-      end
+      @parameter_filter ? @parameter_filter.filter(hash) : hash
     end
 
     def filter_environment_variables(hash)
@@ -311,13 +320,8 @@ module RorVsWild
     end
 
     def log_error(exception)
-      if defined?(Rails)
-        Rails.logger.error("[RorVsWild] " + exception.inspect)
-        Rails.logger.error("[RorVsWild] " + exception.backtrace.join("\n[RorVsWild] "))
-      else
-        $stderr.puts("[RorVsWild] " + exception.inspect)
-        $stderr.puts("[RorVsWild] " + exception.backtrace.join("\n[RorVsWild] "))
-      end
+      logger.puts("[RorVsWild] " + exception.inspect)
+      logger.puts("[RorVsWild] " + exception.backtrace.join("\n[RorVsWild] "))
     end
   end
 

data/test/ror_vs_wild_test.rb

@@ -57,34 +57,38 @@ class RorVsWildTest < MiniTest::Unit::TestCase
   end
 
   def test_extract_most_relevant_location
-    callstack = ["#{ENV["GEM_HOME"]}/lib/sql.rb:1:in `method1'", "/app/models/user.rb:2:in `method2'"]
-    assert_equal(%w[/app/models/user.rb 2 method2], client.send(:extract_most_relevant_location, callstack))
+    callstack = ["#{ENV["GEM_HOME"]}/lib/sql.rb:1:in `method1'", "/usr/lib/ruby/net/http.rb:2:in `method2'", "/rails/root/app/models/user.rb:3:in `method3'"]
+    assert_equal(%w[/app/models/user.rb 3 method3], client.send(:extract_most_relevant_location, callstack))
+
     assert_equal(["#{ENV["GEM_HOME"]}/lib/sql.rb", "1", "method1"], client.send(:extract_most_relevant_location, ["#{ENV["GEM_HOME"]}/lib/sql.rb:1:in `method1'"]))
   end
 
+  def test_extract_most_relevant_location_when_there_is_not_app_root
+    client = initialize_client
+    callstack = ["#{ENV["GEM_HOME"]}/lib/sql.rb:1:in `method1'", "/usr/lib/ruby/net/http.rb:2:in `method2'", "/rails/root/app/models/user.rb:3:in `method3'"]
+    assert_equal(%w[/usr/lib/ruby/net/http.rb 2 method2], client.send(:extract_most_relevant_location, callstack))
+  end
+
   def test_extract_most_relevant_location_when_there_is_no_method_name
     assert_equal(["/foo/bar.rb", "123", nil], client.send(:extract_most_relevant_location, ["/foo/bar.rb:123"]))
   end
 
+  def test_extract_most_relevant_location_when_gem_home_is_in_heroku_app_root
+    client = initialize_client(app_root: app_root = File.dirname(gem_home = ENV["GEM_HOME"]))
+    callstack = ["#{gem_home}/lib/sql.rb:1:in `method1'", "/usr/lib/ruby/net/http.rb:2:in `method2'", "#{app_root}/app/models/user.rb:3:in `method3'"]
+    assert_equal(["/app/models/user.rb", "3", "method3"], client.send(:extract_most_relevant_location, callstack))
+  end
+
   private
 
   def client
-    if !@client
-      RorVsWild::Client.any_instance.stubs(:setup_callbacks)
-      @client ||= RorVsWild::Client.new({})
-      @client.stubs(:post_request)
-      @client.stubs(:post_task)
-    end
-    @client
+    @client ||= initialize_client(app_root: "/rails/root")
   end
-end
-
-# Simulate Rails.root
-
-require "pathname"
 
-module Rails
-  def self.root
-    Pathname.new("/rails/root")
+  def initialize_client(options = {})
+    client ||= RorVsWild::Client.new(options)
+    client.stubs(:post_request)
+    client.stubs(:post_task)
+    client
   end
 end

metadata

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