effective_logging 3.0.7 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9fced444e21c7fe1cdfc6eefbb7a4a1c5aefde46e660c80ea8e556e4811a53
-  data.tar.gz: '02657769444b4e41d0fd0fa0ecd1d083aa5e60b7ba49df2f64be18d70e434404'
+  metadata.gz: 2898e7d8542c2b5c528242611aa2e80becf21097da0e71506e4ca205c0169933
+  data.tar.gz: edad3789ae84819c00bd87b507314f1dc7abe79d75809249b48ad53f28799ffa
 SHA512:
-  metadata.gz: 01efee520769124bc69f458c9db6301a3c9413ea43da4fae9b74cebf5b387a951828a058256c26db99926eb8a89851cfda74f85d879c90809586e3284c1503de
-  data.tar.gz: ed09985141339c9fe27f9f377bf84ed8e4c0e902609f0eddb493d235f9fc0ee78812cb7afd97592a4ff3c83fe3a0c0e281b9feb706f136360d253f2dd57c7093
+  metadata.gz: 01e10ee66306428c3185065f036d33b54b76520e448510048a35a39e29ba6180bf256065183f472df5471f3df8b4e671f33f72c0dc2eab591b38be19c7a2eded
+  data.tar.gz: 5a1d5c5833d61581879e0204197dfacd511ae8d27042234372d0b41350beed0e52daf959952d7df8d16732738695ee73a0f3dbfdfa3381cb6769ce5f8981534d

data/README.md

@@ -197,19 +197,17 @@ This logging includes the resource's base attributes, all autosaved associations
 
 It will recurse through all accepts_nested_attributes has_many's and handle any number of child objects.
 
-Add to your model:
+Add to your application controller:
 
-```ruby
-class Post < ActiveRecord::Base
-  log_changes
-end
+```
+around_action :set_effective_logging_current_user
 ```
 
-and to your controller:
+Add to your model:
 
 ```ruby
-class ApplicationController < ActionController::Base
-  before_action :set_effective_logging_current_user
+class Post < ActiveRecord::Base
+  log_changes
 end
 ```
 
@@ -371,4 +369,3 @@ MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
-

data/app/datatables/effective_log_changes_datatable.rb

@@ -21,7 +21,8 @@ class EffectiveLogChangesDatatable < Effective::Datatable
       end
 
     end.search do |collection, term, column, sql_column|
-      collection.where("associated_type #{resource.ilike} ? OR associated_to_s #{resource.ilike} ? OR message #{resource.ilike} ?", "%#{term}%", "%#{term}%", "%#{term}%")
+      ilike = effective_resource.ilike
+      collection.where("associated_type #{ilike} ? OR associated_to_s #{ilike} ? OR message #{ilike} ?", "%#{term}%", "%#{term}%", "%#{term}%")
     end
 
     col :details, visible: false, sort: false do |log|

data/app/views/effective/logs/_log.html.haml

@@ -40,7 +40,7 @@
       - next unless value.present?
       .row
         .col-md-12
-          %p
+          .mt-3
             %strong= "#{key.to_s.titleize}:"
           = format_log_details_value(log, key)
 
@@ -50,4 +50,3 @@
 
       - unless log.datatable.nil?
         = render_datatable(log.datatable)
-

data/lib/effective_logging/email_logger.rb

@@ -5,7 +5,7 @@ module EffectiveLogging
       return unless message.present?
 
       # collect a Hash of arguments used to invoke EffectiveLogger.success
-      logged_fields = { from: message.from.join(','), to: message.to, subject: message.subject }
+      logged_fields = { from: message.from.join(','), to: message.to, subject: message.subject, cc: message.cc, bcc: message.bcc }
 
       # Add a log header to your mailer to pass some objects or additional things to EffectiveLogger
       # mail(to: 'admin@example.com', subject: @post.title, log: { post: @post })
@@ -18,10 +18,11 @@ module EffectiveLogging
       end
 
       body = (message.body.try(:parts) || []).find { |part| part.content_type.to_s.downcase.include?('text/html') }
+      to = Array(message.to) - [nil, '']
 
       logged_fields[:email] = "#{message.header}<hr>#{(body.presence || message.body)}"
 
-      (message.to || []).each do |to|
+      to.each do |to|
         user = (User.where(email: to).first rescue nil)
 
         logged_fields[:to] = to
@@ -30,6 +31,11 @@ module EffectiveLogging
 
         ::EffectiveLogger.email("#{message.subject} - #{message.to.join(', ')}", logged_fields)
       end
+
+      if to.blank? && (message.cc.present? || message.bcc.present?)
+        ::EffectiveLogger.email("#{message.subject} - multiple recipients", logged_fields)
+      end
+
     end
 
   end

data/lib/effective_logging/engine.rb

@@ -1,11 +1,13 @@
 require 'effective_logging/active_record_logger'
+require 'effective_logging/email_logger'
+require 'effective_logging/log_page_views'
+require 'effective_logging/set_current_user'
+require 'effective_logging/user_logger'
 
 module EffectiveLogging
   class Engine < ::Rails::Engine
     engine_name 'effective_logging'
 
-    config.autoload_paths += Dir["#{config.root}/lib/"]
-
     # Set up our default configuration options.
     initializer "effective_logging.defaults", :before => :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_logging.rb")
@@ -14,7 +16,6 @@ module EffectiveLogging
     # Automatically Log Emails
     initializer 'effective_logging.emails' do |app|
       if EffectiveLogging.email_enabled == true
-        require 'effective_logging/email_logger'
         ActionMailer::Base.register_interceptor(EffectiveLogging::EmailLogger)
       end
     end
@@ -30,7 +31,6 @@ module EffectiveLogging
     initializer 'effective_logging.log_changes_action_controller' do |app|
       Rails.application.config.to_prepare do
         ActiveSupport.on_load :action_controller do
-          require 'effective_logging/set_current_user'
           ActionController::Base.include(EffectiveLogging::SetCurrentUser::ActionController)
         end
       end

data/lib/effective_logging/set_current_user.rb

@@ -3,13 +3,17 @@ module EffectiveLogging
     module ActionController
 
       # Add me to your ApplicationController
-      # before_action :set_effective_logging_current_user
+      # around_action :set_effective_logging_current_user
 
       def set_effective_logging_current_user
         EffectiveLogging.current_user = current_user
+
+        if block_given?
+          yield
+          EffectiveLogging.current_user = nil
+        end
       end
 
     end
   end
 end
-

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.0.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.12
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,7 @@ homepage: https://github.com/code-and-effect/effective_logging
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Automatically log all sent emails, user logins, and page views. This also
   will log custom events from Ruby and JavaScript.