effective_logging 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7434cf485dffbdf6247f4b3b443b5f960be1800e
-  data.tar.gz: cfddb7f270f5ca439a636cd97307a2da93f30d9f
+  metadata.gz: 1f13ff153b87e251c687b2fbd6fe49dc870050c0
+  data.tar.gz: bbee752de6d570e21276612e9a14d97448671640
 SHA512:
-  metadata.gz: 91e89fc02a6fd44d5772fd3eaf8227875792efb50e2b679b6c02b359ffce1d9dcd2857fcf1731aded213c1919cc81a379acb1a5db55e74bce8715f8d48e85104
-  data.tar.gz: 0d6472016fd5f78135d4bc843e1c37e86b78471ea6215af834d6f603b2d73720dba903e3987876bc14eb452a4433a0cb967aa93271bcc14e20fd8da1da563ee8
+  metadata.gz: 5c805494dba913dd2bd10dd047e10b047f22e7c79164419cfaa76ab1ba22e51191b854a7681bc6129061e41f0804615b890e115759cfd703c749c091e1929b7b
+  data.tar.gz: 3aa1ec9ddf7cfa73e0de6dca4fea9bbf53fa35c3a057ca0fc84c0c0faad950fd6f64340b5df89780db0b6d6f0a580b6b62dc4ee6fd4062fb6c45193239e5bf96

data/app/models/effective_logger.rb

@@ -2,6 +2,8 @@
 
 class EffectiveLogger
   def self.log(message, status = EffectiveLogging.statuses.first, options = {})
+    options = Hash(options).delete_if { |k, v| v.blank? }
+
     if options[:user].present? && !options[:user].kind_of?(User)
       raise ArgumentError.new('Log.log :user => ... argument must be a User object')
     end
@@ -14,6 +16,14 @@ class EffectiveLogger
       raise ArgumentError.new('Log.log :associated => ... argument must be an ActiveRecord::Base object')
     end
 
+    if options[:request].present? && options[:request].respond_to?(:referrer)
+      request = options.delete(:request)
+
+      options[:ip] ||= request.ip
+      options[:referrer] ||= request.referrer
+      options[:user_agent] ||= request.user_agent
+    end
+
     log = Effective::Log.new(
       message: message,
       status: status,
@@ -21,24 +31,17 @@ class EffectiveLogger
       user: options.delete(:user),
       parent: options.delete(:parent),
       associated: options.delete(:associated),
-      associated_to_s: options.delete(:associated_to_s)
+      associated_to_s: options.delete(:associated_to_s),
+      details: options
     )
 
     if log.associated.present?
-      log.associated_to_s ||= (log.associated.to_s rescue nil)
-    end
-
-    if options[:request].present? && options[:request].respond_to?(:referrer)
-      request = options.delete(:request)
-
-      options[:ip] ||= request.ip
-      options[:referrer] ||= request.referrer
-      options[:user_agent] ||= request.user_agent
+      log.associated_to_s ||= log.associated.to_s
     end
 
-    log.details = options.delete_if { |k, v| v.blank? } if options.kind_of?(Hash)
+    log.save!
 
-    log.save
+    log
   end
 
   # Dynamically add logging methods based on the defined statuses

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails