effective_logging 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eacf844b2242cd5daa31e948a8d5b40e7fff67c9
-  data.tar.gz: c3c9bde4856f70293a3db72c93129c652dc5cc59
+  metadata.gz: 764110851ffd8e9238e69e60a0dc08e1f210c6fa
+  data.tar.gz: 9090700d036500ba51819420446f5feeb941b0e6
 SHA512:
-  metadata.gz: 344c156190cace9f22cf5a906718c554ff0374260682d539d4b5c5bd59a68a4a2a01f7625c9e16ac2ce380e505f0870587d9d5288c9849321ca6113fc8279208
-  data.tar.gz: 35795a9dfce13770e69975179ed775946c1c35ae21cc2b934c284b787d53aaedb331a5181583a2a590eb9cacab25cb101aba184327a0157fa4f787a043bfcac8
+  metadata.gz: 270572880bdf24cca71708c5076c8920a06a186fa2c8db87c82020e1fc4f992e7cec9f2701e1bdb23152f428df053f59a66ec189a4e653fa22fc302ab9fa2df6
+  data.tar.gz: d6eedad46a7b9fe2bb010b28cb58d0b2738962e4d39d90e032439d01252aeff46a25189524a7247d1af0f721dac28ed5522b641c9a7c683229ca0531287b1a39

data/README.md

@@ -321,7 +321,7 @@ If you don't want to use the builtin Admin screen, and would rather render the e
 In your controller:
 
 ```ruby
-@datatable = EffectiveLogsDatatable.new(self)
+@datatable = EffectiveLogsDatatable.new
 ```
 
 And then in your view:
@@ -334,13 +334,11 @@ render_datatable(@datatable)
 
 We can also use a similar method to create a datatable of logs for just one user.
 
-When initialized with :user_id, the 'User' column is hidden and the Logs are scoped to any logs where this user is the User or Associated column.
-
-In your controller:
+When initialized with :for, the logs are scoped to any log where this id matches the User or Associated column.
 
 ```ruby
-@user = User.find(params[:id])
-@datatable = EffectiveLogsDatatable.new(self, user_id: @user.id)
+EffectiveLogsDatatable.new(for: @user.id)
+EffectiveLogsDatatable.new(for: [1, 2, 3])  # Users with ID 1, 2 and 3
 ```
 
 

data/app/datatables/effective_logs_datatable.rb

@@ -8,10 +8,8 @@ unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
 
       if attributes[:user] == false
         # Do not include
-      elsif attributes[:user_id].present?
-        col :user, search: { collection: User.where(id: Array(attributes[:user_id])) }
-      elsif attributes[:user].present?
-        col :user, search: { collection: User.where(id: Array(attributes[:user]).map { |user| user.to_param }) }
+      elsif attributes[:for]
+        col :user, search: :string
       else
         col :user
       end
@@ -54,8 +52,8 @@ unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
         scope = scope.where(status: EffectiveLogging.log_changes_status)
       end
 
-      if (attributes[:user] || attributes[:user_id]).present?
-        user_ids = Array(attributes[:user].presence || attributes[:user_id]).map { |user| user.kind_of?(User) ? user.id : user.to_i }
+      if attributes[:for]
+        user_ids = Array(attributes[:for])
         scope = scope.where('user_id IN (?) OR (associated_id IN (?) AND associated_type = ?)', user_ids, user_ids, 'User')
       end
 

data/lib/effective_logging/email_logger.rb

@@ -21,8 +21,11 @@ module EffectiveLogging
       logged_fields[:email] = "#{message.header}<hr>#{(body.presence || message.body)}"
 
       (message.to || []).each do |to|
+        user = (User.where(email: to).first rescue nil)
+
         logged_fields[:to] = to
-        logged_fields[:associated] ||= (User.where(email: to).first rescue nil)
+        logged_fields[:associated] ||= user
+        logged_fields[:user] ||= user
 
         ::EffectiveLogger.email("#{message.subject} - #{message.to.join(', ')}", logged_fields)
       end

data/lib/effective_logging/engine.rb

@@ -34,7 +34,7 @@ module EffectiveLogging
       end
     end
 
-    # # Register the log_page_views concern so that it can be called in ActionController or elsewhere
+    # Register the log_page_views concern so that it can be called in ActionController or elsewhere
     initializer 'effective_logging.log_changes_action_controller' do |app|
       Rails.application.config.to_prepare do
         ActiveSupport.on_load :action_controller do

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.11.0'.freeze
+  VERSION = '1.11.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails