rorvswild 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c255c25e5829f312cb6e04c42eb8bb0c4d0b247b
-  data.tar.gz: 0581376548672b9c4e168bdf5b2bf0c02a1b044d
+  metadata.gz: defe2d991680e75ff224dcdf201db4410853b1c4
+  data.tar.gz: 6af12c56716629ac4b2a4abed82493639d49ba52
 SHA512:
-  metadata.gz: f702cf9cb1ab6f629130bb5fcc543821181d8e8a4b7b45bf56a7c8277a19f4e6401cb7e3c29911e1f81dc9a9dc0fd6157e2db5f9a786a003887e75517722e7eb
-  data.tar.gz: 0851c9573066fe3ca8b9581d10cc09c61c6f3e4da1c44fbc1c358bbae1fba47b4fdf66c9c796e2b501870ada44977af4209de3bf3a79a200cb2f6d21ccf85940
+  metadata.gz: b2815352f7222b25537f8a075527cb0a11a8a108029f9a19c91459156784b286519a20321c3a51cc0b9f3e2ecf59da637f8c57d504ab97fbe4da5f58e0c30db9
+  data.tar.gz: 26d522bbce03f923a85ce76f04e54d8476124b90a9d2e205ca85431a5a746a9ad0f369989f0544139093e6c5775cd1060f9aa92c264f5c12a85168ef4c96ddd5

data/lib/rorvswild/version.rb

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

data/lib/rorvswild.rb

@@ -1,4 +1,7 @@
 require "rorvswild/version"
+require "json/ext"
+require "net/http"
+require "uri"
 
 module RorVsWild
   def self.new(*args)
@@ -59,11 +62,13 @@ module RorVsWild
 
     def setup_callbacks
       client = self
-      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))
-      ActiveSupport::Notifications.subscribe("start_processing.action_controller", &method(:before_http_request))
-      ActionController::Base.rescue_from(StandardError) { |exception| client.after_exception(exception, self) }
+      if defined?(Rails)
+        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))
+        ActiveSupport::Notifications.subscribe("start_processing.action_controller", &method(:before_http_request))
+        ActionController::Base.rescue_from(StandardError) { |exception| client.after_exception(exception, self) }
+      end
 
       Resque::Job.send(:extend, ResquePlugin) if defined?(Resque::Job)
       Delayed::Worker.lifecycle.around(:invoke_job, &method(:around_delayed_job)) if defined?(Delayed::Worker)
@@ -87,7 +92,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_query_location(caller)
+      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
@@ -218,7 +223,7 @@ module RorVsWild
     SELECT_REGEX = /\Aselect/i.freeze
 
     def explain(sql, binds)
-      ActiveRecord::Base.connection.explain(sql, binds) if (sql =~ SELECT_REGEX) == 0
+      ActiveRecord::Base.connection.explain(sql, binds) if sql =~ SELECT_REGEX
     end
 
     def post_request
@@ -240,14 +245,11 @@ module RorVsWild
       post("/errors".freeze, error: hash)
     end
 
-    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
+    GEM_HOME_REGEX = ENV["GEM_HOME"] ? /\A#{ENV["GEM_HOME"]}/.freeze : nil
 
-    def extract_error_location(stack)
-      extract_query_location(stack) || split_file_location(stack.first)
+    def extract_most_relevant_location(stack)
+      location = stack.find { |str| !(str =~ GEM_HOME_REGEX) } if GEM_HOME_REGEX
+      split_file_location(relative_path(location || stack.first))
     end
 
     def split_file_location(location)
@@ -268,11 +270,11 @@ module RorVsWild
     end
 
     def relative_path(path)
-      path.sub(Rails.root.to_s, "".freeze)
+      defined?(Rails) ? path.sub(Rails.root.to_s, "".freeze) : path
     end
 
     def exception_to_hash(exception, extra_details = nil)
-      file, line, method = extract_error_location(exception.backtrace)
+      file, line, method = extract_most_relevant_location(exception.backtrace)
       {
         method: method,
         line: line.to_i,
@@ -296,21 +298,26 @@ module RorVsWild
     end
 
     def filter_sensitive_data(hash)
-      @sensitive_filter ||= ActionDispatch::Http::ParameterFilter.new(Rails.application.config.filter_parameters)
-      @sensitive_filter.filter(hash)
+      if defined?(Rails)
+        @sensitive_filter ||= ActionDispatch::Http::ParameterFilter.new(Rails.application.config.filter_parameters)
+        @sensitive_filter.filter(hash)
+      else
+        hash
+      end
     end
 
     def filter_environment_variables(hash)
       hash.clone.keep_if { |key,value| key == key.upcase }
     end
 
-    def logger
-      Rails.logger
-    end
-
     def log_error(exception)
-      logger.error("[RorVsWild] " + exception.inspect)
-      logger.error("[RorVsWild] " + exception.backtrace.join("\n[RorVsWild] "))
+      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
     end
   end
 

data/test/ror_vs_wild_test.rb

@@ -45,7 +45,7 @@ class RorVsWildTest < MiniTest::Unit::TestCase
     assert_equal(ZeroDivisionError, exception.class)
   end
 
-  def test_catch_error_with_extra_Details
+  def test_catch_error_with_extra_details
     client.expects(:post_error)
     exception = RorVsWild.catch_error(foo: "bar") { 1 / 0 }
     assert_equal(ZeroDivisionError, exception.class)
@@ -56,22 +56,14 @@ 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'"]))
+  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))
+    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_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
-
-  def test_extract_error_location_when_there_is_no_method_name
-    assert_equal(["/foo/bar.rb", "123", nil], client.send(:extract_error_location, ["/foo/bar.rb:123"]))
+  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
 
   private

metadata

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