exceptiontrap 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4613ddfba38ec1f735fafa7da8fe332b9d74867dae0e6f3ed0666ef2f14387e
-  data.tar.gz: 24a85363cfac60501748bc86d497107b4932216550d87e3d29610ef6b06cd6fa
+  metadata.gz: 25618a77b83b7ef0c13663112662880e35f17a0af53f88e3c1421fe621aed816
+  data.tar.gz: a8d8f88e92861949b4ce464f6965287bcce8fc3a022e1a7ec13353202bbf0f9d
 SHA512:
-  metadata.gz: dbb493a6883454ee949003ce2d9db020312503ae82b639793fbbf394cc5962de1bf2a08856d617a3c1fea5dab10cae2a1c173fa8b021b7fc719c2cc4c89b3182
-  data.tar.gz: 59e795762b2c85e3a9c4a61536fd3487172d58b2ff4c1d0adf0fb79822801bde8a2c9bbe2bcf3b5a91db22cdf123eca03a1250580fe684b4b6d155fbecf4adc1
+  metadata.gz: fac4396f56131cb0cb791bc02eb5cb4f5be99b876965caae23f8d36615f38fa6a12e1ee1a1b1229623ad1266ac6053e4eccabfe148344cec379ee1bd97aee7c0
+  data.tar.gz: 48cb93606af8e72c75b6745592d73015cec4c0e379dbf2dfab00e2889fc27046a79fbb9af1dbf0b224c38cfa7c20aa2bf4df8e035681736620ff941e2646aac5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exceptiontrap (2.0.1)
+    exceptiontrap (2.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -52,7 +52,7 @@ end
 
 There is no automatic integration into [Resque](https://github.com/resque/resque) yet. Meanwhile you can let Exceptiontrap notifiy you about errors using its `notify` method inside Resque's `on_failure` hook.
 
-You can also create a module with Exceptiontrap enabled and integrate this.
+You can also create a module with Exceptiontrap enabled and integrate it.
 
 ```ruby
 module ExceptiontrapJob
@@ -71,7 +71,7 @@ end
 
 ## Known Issues / Todo
 
-Optimize and insert the test suite to the gem.
+Optimize and add the test suite.
 
 
-Copyright (c) 2018 [Torsten Bühl], released under the MIT license
+Copyright (c) 2019 [Torsten Bühl], released under the MIT license

data/generators/exceptiontrap/templates/exceptiontrap.yml

@@ -1,7 +1,7 @@
 # Exceptiontrap Config File
 
-# If ENV['api-key'] is set, it will be used instead of the following api-key
-# This happens for example, if you use the exceptiontrap addon on heroku
+# If ENV['EXCEPTIONTRAP_API_KEY'] is set, it will be used instead of the following api-key
+# This happens for example if you use the Exceptiontrap add-on on Heroku
 api-key: <%= api_key %>
 ssl: true
 timeout: 5000
@@ -16,4 +16,4 @@ ignoreExceptions:
 filterParams:
   - 'password'
   - 'password_confirmation'
-  - 's3-key'
+  - 's3-key'

data/lib/exceptiontrap/data.rb

@@ -1,26 +1,7 @@
 module Exceptiontrap
+  # TODO: Rewrite this class
   class Data
     class << self
-      # TODO: Remove the duplication or separate classes
-      # Creates Notification Data for action controller requests (Rails 2)
-      def rails2_data(exception, request, session, response)
-        data = {
-          'notifier' => NOTIFIER_NAME,
-          'name' => exception.class.name,
-          'message' => exception.message,
-          'location' => location(exception),
-          'root' => application_root.to_s,
-          'app_environment' => application_environment,
-          'request_uri' => request.url || REQUEST_URI,
-          'request_params' => clean_params(request.params),
-          'request_session' => clean_params(extrap_session_data(session)),
-          'environment' => clean_params(request.env),
-          'trace' => clean_backtrace(exception.backtrace),
-          'request_components' => { :controller => request.params[:controller], :action => request.params[:action] }
-        }
-      end
-
-      # Creates Notification Data for rack requests (Rails 3)
       def rack_data(exception, env = {})
         components = {}
         if env["action_dispatch.request.parameters"] != nil
@@ -41,8 +22,8 @@ module Exceptiontrap
           'app_environment' => application_environment,
           'request_uri' => rack_request_url(env),
           'request_params' => clean_params(env['action_dispatch.request.parameters']),
-          'request_session' => clean_params(extrap_session_data(env['rack.session'])),
-          'environment' => clean_params(env),
+          'request_session' => clean_params(session_data(env)),
+          'environment' => clean_params(strip_env(env)),
           'trace' => clean_backtrace(exception.backtrace),
           'request_components' => components
         }
@@ -86,8 +67,9 @@ module Exceptiontrap
       end
 
       # Deletes params from env / set in config file
-      def remove_params
-        remove_params = ['rack.request.form_hash', 'rack.request.form_vars']
+      def strip_env(env)
+        keys_to_remove = ['rack.request.form_hash', 'rack.request.form_vars', 'async.callback']
+        env.reject { |k,v| keys_to_remove.include?(k) }
       end
 
       # Replaces parameter values with a string / set in config file
@@ -112,9 +94,10 @@ module Exceptiontrap
         end
       end
 
-      # Retrieve data
-      def extrap_session_data(session)
+      def session_data(env)
+        session = env['action_dispatch.request.session']
         return if session == nil
+
         if session.respond_to?(:to_hash)
           session.to_hash
         else
@@ -134,18 +117,17 @@ module Exceptiontrap
         defined?(Rails.root) ? Rails.root : Dir.pwd
       end
 
-      # Trims first underscore from keys, to prevent "malformed" rails XML-tags
+      # TODO: Refactor
       def normalize_data(hash)
         new_hash = {}
 
-        # TODO: Do this nicer
         hash.each do |key, value|
-          # key_s = key.to_s.dup
-          # key_s.sub!("_", "") if key_s[0].chr == "_"
-          # key_s.sub!("_", "") if key_s[0].chr == "_"
-
-          if value.respond_to?(:to_hash) # if hash, normalize these too
-            new_hash[key] = normalize_data(value.to_hash)
+          if value.respond_to?(:to_hash)
+            begin
+              new_hash[key] = normalize_data(value.to_hash)
+            rescue
+              new_hash[key] = value.to_s
+            end
           else
             new_hash[key] = value.to_s
           end
@@ -156,4 +138,4 @@ module Exceptiontrap
 
     end
   end
-end
+end

data/lib/exceptiontrap/rack.rb

@@ -8,10 +8,11 @@ module Exceptiontrap
       begin
         response = @app.call(env)
       rescue Exception => exception
-        puts '[Exceptiontrap] Raised Exceptiontrap::Rack::Exception'
         puts "[Exceptiontrap] Caught Exception: #{exception.class.name}"
+
         data = Exceptiontrap::Data.rack_data(exception, env)
         Exceptiontrap::Notifier.notify(data)
+
         raise
       end
 
@@ -19,4 +20,4 @@ module Exceptiontrap
     end
 
   end
-end
+end

data/lib/exceptiontrap/railtie.rb

@@ -8,7 +8,7 @@ module Exceptiontrap
       Exceptiontrap::Config.load(File.join(Rails.root, '/config/exceptiontrap.yml'))
       next if Exceptiontrap::disabled?
 
-      app.config.middleware.insert_after ActionDispatch::ShowExceptions, Exceptiontrap::Rack
+      app.config.middleware.insert_after ActionDispatch::DebugExceptions, Exceptiontrap::Rack
     end
   end
 end

data/lib/exceptiontrap/version.rb

@@ -1,3 +1,3 @@
 module Exceptiontrap
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/lib/exceptiontrap.rb

@@ -22,12 +22,6 @@ module Exceptiontrap
     'Accept' => 'application/json'
   }
 
-  def self.notify(exception, params = {})
-    return if disabled?
-    data = Data.rack_data(exception, params)
-    Notifier.notify(data)
-  end
-
   def self.enabled?
     Config.enabled_environments.include?(Data.application_environment)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exceptiontrap
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - tbuehl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake