velocity_audited 6.0.1 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d06e2db5a0f241680b03f00ea18dd1be63bbbac5012e7f01c1222bd2203a11
-  data.tar.gz: ebb4a1d5c04de38769514698513771dd8ef3d795b92b6b4c9caac84c2e3f1973
+  metadata.gz: 7b39436e9380cd8f81939d01bd864c669d65bb033ef97d7c265165160e52809c
+  data.tar.gz: 761804b094627fcb2b13e991ec8eb66288f1761d3d9ba4b134811d3ed399b3b8
 SHA512:
-  metadata.gz: 72800d67eae10d4ca2ea18df5204edd747fcaa4d3d9009259df035ba44f10c4d3b876dc705ae932b827922ee2c45e734157ba830c01ed43718dd1eb7f03ad4d4
-  data.tar.gz: 71b6eb0a64c888b71ef1aa9edbeb0dcb2b4fd0161f00d9b55910bd33513cf37c6bea1519aa86d13dc5668a4b577d2f73c6d3d4f9bff29e6f87bf9094ffc15d5a
+  metadata.gz: ebd15ee11f7c91d2beb3c61db75d6a6c8a3795c8615423d9c9ad9ed9294d321ad5439427adba2a45238318d4e79fa1183a5401250d62ed945b36ee25f03091b6
+  data.tar.gz: 0621c54999850e9a6cd4cbe12642cc1e99ea0e367119aba2a503009f290ea5cc99374dab67d34e2e8c9007a4f51ee660c5429c6607ecc3917fa5bb3260f16bdf

data/lib/audited/auditor.rb

@@ -310,6 +310,8 @@ module VelocityAudited
       def write_audit(attrs)
         self.audit_comment = nil
         attrs[:db_audit] = true
+        attrs[:record_id] = id
+        attrs[:model] = self.class.base_class.name
         attrs = add_metadata(attrs)
         if auditing_enabled
           attrs[:associated] = send(audit_associated_with) unless audit_associated_with.nil?
@@ -321,8 +323,9 @@ module VelocityAudited
         attrs[:client] = ::VelocityAudited.store[:client]
         attrs[:origin] = ::VelocityAudited.store[:origin]
         attrs[:user_agent] = ::VelocityAudited.store[:user_agent]
-        attrs[:ip] = ::VelocityAudited.store[:ip]
+        attrs[:ip] = ::VelocityAudited.store[:current_remote_address]
         attrs[:uid] = ::VelocityAudited.store[:uid]
+        attrs[:request_id] = ::VelocityAudited.store[:request_id]
         attrs
       end
 

data/lib/audited/sweeper.rb

@@ -8,9 +8,9 @@ module VelocityAudited
       current_user: :current_user,
       origin: :origin,
       user_agent: :user_agent,
-      ip: :ip,
       uid: :uid,
-      client: :client
+      client: :client,
+      request_id: :request_id
     }
 
     delegate :store, to: ::VelocityAudited
@@ -43,11 +43,7 @@ module VelocityAudited
     def user_agent
       controller.try(:request).try(:headers)['User-Agent']
     end
-
-    def ip
-      controller.try(:request).try(:headers)['HTTP_X_FORWARDED_FOR']
-    end
-
+    
     def uid
       controller.try(:request).try(:headers)['uid']
     end
@@ -56,6 +52,10 @@ module VelocityAudited
       controller.try(:request).try(:headers)['client']
     end
 
+    def request_id
+      controller.try(:request).try(:uuid)
+    end
+
     def controller
       store[:current_controller]
     end

data/lib/audited/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VelocityAudited
-  VERSION = "6.0.1"
+  VERSION = "6.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: velocity_audited
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.3
 platform: ruby
 authors:
 - Brandon Keepers
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord