nadir 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d082eb1b9703274e2e4acddaab0926944198cdbf06b1ede7bb1ced1dc9f8df5f
-  data.tar.gz: 6dea178a0ac5092104705b5b5b068880e5748dee33374cc6b6394edc4f531f8b
+  metadata.gz: 727bf91421bfafe5f50ad2cc408c2d98734148746ea94f49196e253b1fee450f
+  data.tar.gz: e57725430192bd4450a3f171d4129eb436b9ad9e2d4df3a1314e2a2f116cdc82
 SHA512:
-  metadata.gz: 93db3911eb8d93ddb14c17a6c1b147ce5ad7807c92dffe0911bcd2c9fea202637f3f54046bcad3319336a18af70215fea41d608e6437019f99612217c09a665d
-  data.tar.gz: c5a6af04b60d96d0ab77696e21d6dd5285065e833de67af613fdb0e6d69fef47b4101dfdf5b7ecb2c98f66c1ea875571fff11d0afddb2f1c87defe587951576e
+  metadata.gz: 93044be9d9f2ca132a0894562d5fcd929f1be652d0c1af919edc7f09a34b62c564e27172fdb7aeba8c3727863a6420be412b6a86ec019e57c7e2fd116c4f7809
+  data.tar.gz: 6e018cdde745fe97415385473df7bdf931ad996f571f5fb6cceaf0ce747790d2f9ab73ce2dc44c4373f9f0ce527dfaffa3911ca61cc1fe36b9acc37f77a6e455

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nadir (1.1.1)
+    nadir (1.1.2)
       commander (~> 4.4)
       concurrent-ruby (~> 1.0)
 

data/lib/nadir/middleware/rack.rb

@@ -9,19 +9,28 @@ module Nadir
         begin
           response = @app.call(env)
         rescue Exception => exception
-          request = ActionDispatch::Request.new env
+          begin
+            request = ActionDispatch::Request.new env
 
-          headers = request.headers.env.select{|k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/}
-          location = request.parameters.values_at('controller', 'action').compact.join('#')
-          location = location.presence || "#{headers['REQUEST_METHOD']} #{headers['PATH_INFO']}"
+            headers = request.headers.env.select{|k, _| k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES) || k =~ /^HTTP_/}
+            location = request.parameters.values_at('controller', 'action').compact.join('#')
+            location = location.presence || "#{headers['REQUEST_METHOD']} #{headers['PATH_INFO']}"
 
-          request_params = {
-            params: request.parameters,
-            remote_ip: request.remote_ip,
-            headers: headers,
-          }
+            request_params = {
+              headers: headers,
+              params: request.parameters,
+              remote_ip: request.remote_ip,
+              user: {}
+            }
 
-          Nadir.notify exception, location: location, request: request_params
+            if request.env['warden'] && request.env['warden'].respond_to?(:user)
+              request_params[:user][:id] = request.env['warden'].user&.id
+            end
+
+            Nadir.notify exception, location: location, request: request_params
+          rescue => e
+            Nadir.logger.error "[Nadir] Internal error: #{e.inspect}"
+          end
 
           raise
         end

data/lib/nadir/notification.rb

@@ -19,7 +19,8 @@ module Nadir
         request_params: @params.dig(:request, :params),
         request_remote_ip: @params.dig(:request, :remote_ip),
         request_headers: @params.dig(:request, :headers),
-        job: @params.dig(:job)
+        user: @params.dig(:request, :user),
+        job: @params.dig(:job),
       }
     end
 

data/lib/nadir/version.rb

@@ -1,3 +1,3 @@
 module Nadir
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nadir
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Georgi Mitrev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby