rorvswild 0.3.3 → 0.3.4

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.4".freeze
 end

data/lib/rorvswild.rb

@@ -56,14 +56,16 @@ module RorVsWild
       {
         api_url: "https://www.rorvswild.com/api",
         explain_sql_threshold: 500,
+        ignored_exceptions: [],
       }
     end
 
-    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :app_root, :app_root_regex
+    attr_reader :api_url, :api_key, :app_id, :explain_sql_threshold, :app_root, :app_root_regex, :ignored_exceptions
 
     def initialize(config)
       config = self.class.default_config.merge(config)
       @explain_sql_threshold = config[:explain_sql_threshold]
+      @ignored_exceptions = config[:ignored_exceptions]
       @app_root = config[:app_root]
       @api_url = config[:api_url]
       @api_key = config[:api_key]
@@ -74,7 +76,9 @@ module RorVsWild
       if defined?(Rails)
         @logger ||= Rails.logger
         @app_root ||= Rails.root.to_s
-        @parameter_filter = ActionDispatch::Http::ParameterFilter.new(Rails.application.config.filter_parameters)
+        config = Rails.application.config
+        @parameter_filter = ActionDispatch::Http::ParameterFilter.new(config.filter_parameters)
+        @ignored_exceptions = %w[ActionController::RoutingError] + config.action_dispatch.rescue_responses.map { |(key,value)| key }
       end
 
       @logger ||= Logger.new(STDERR)
@@ -88,6 +92,7 @@ module RorVsWild
       client = self
       if defined?(ActiveSupport::Notifications)
         ActiveSupport::Notifications.subscribe("sql.active_record", &method(:after_sql_query))
+        ActiveSupport::Notifications.subscribe("render_partial.action_view", &method(:after_view_rendering))
         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))
@@ -135,7 +140,7 @@ module RorVsWild
     end
 
     def after_exception(exception, controller)
-      if !exception.is_a?(ActionController::RoutingError)
+      if !ignored_exceptions.include?(exception.class.to_s)
         file, line = exception.backtrace.first.split(":")
         request[:error] = exception_to_hash(exception).merge(
           session: controller.session.to_hash,
@@ -312,17 +317,24 @@ module RorVsWild
       }
     end
 
+    HTTPS = "https".freeze
+    CERTIFICATE_AUTHORITIES_PATH = File.expand_path("../../cacert.pem", __FILE__)
+
     def post(path, data)
       uri = URI(api_url + path)
       http = Net::HTTP.new(uri.host, uri.port)
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http.use_ssl = true
+
+      if uri.scheme == HTTPS
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http.ca_file = CERTIFICATE_AUTHORITIES_PATH
+        http.use_ssl = true
+      end
 
       post = Net::HTTP::Post.new(uri.path)
       post.content_type = "application/json".freeze
       post.basic_auth(app_id, api_key)
       post.body = data.to_json
-      Rails.logger.debug http.request(post).inspect
+      http.request(post)
     end
 
     def filter_sensitive_data(hash)

data/test/ror_vs_wild_test.rb

@@ -87,6 +87,21 @@ class RorVsWildTest < MiniTest::Unit::TestCase
     assert_equal([{file: "file", line: 123, sql: "SELECT 2", runtime: 21, max_runtime: 11, times: 2, plan: nil,}], client.send(:queries))
   end
 
+  def test_after_exception
+    exception, controller = nil, stub(session: {}, request: stub(env: ENV))
+    begin; 1/0; rescue => exception; end
+    assert_raises(ZeroDivisionError) { client.after_exception(exception, controller) }
+    assert_equal("ZeroDivisionError", client.send(:request)[:error][:exception])
+  end
+
+  def test_after_exception_when_ignored
+    client = initialize_client(ignored_exceptions: %w[ZeroDivisionError])
+    exception, controller = nil, stub(session: {}, request: stub(env: ENV))
+    begin; raise 1/0; rescue => exception; end
+    assert_raises(ZeroDivisionError) { client.after_exception(exception, controller) }
+    refute(client.send(:request)[:error])
+  end
+
   private
 
   def client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -37,6 +37,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- cacert.pem
 - lib/rorvswild.rb
 - lib/rorvswild/version.rb
 - rorvswild.gemspec