effective_logging 3.0.6 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c6855c1a509c800b5bf98f08e8e43081fc02201b7a14c9b90c98bd88b6c738
-  data.tar.gz: 52de7cbaaa0cc3a9e70cc5127ef04810cf98c9dd1584453f35c31d71fb41c95b
+  metadata.gz: 62d539b7dc09aceba5ef177b28855ca353575ad22360c42b7a6efa6bd4fcb95f
+  data.tar.gz: 2bef3c5f0bf3d346f9413d36ad90cc6a52616d25b0b5b0650c635648e2c07acd
 SHA512:
-  metadata.gz: 640a0186b3571990a7299c24b2b28dae8b046b3adfd2198b30419a7d35a48d014bf796807b9ac04187ec32ba67652a4eb2fb3e8fa3277e39665a86fd85137646
-  data.tar.gz: e5660ff8a3695f4e0d4a0e580145e15e7d323ed28194241197e2ede6cb8c3e9e39478f40ac2f3868a5bb8dae2dea56a6ddbc685b16bd3b4d1c67ff6e777fbc3b
+  metadata.gz: c0490c23500c6bd71810b432cfd44291d033fb16e14c1de1fbe37fd8a1c8228f18638140f6fa9ab4be2b6827d303af7c5a19ffc5f351cebf81bd14f260765588
+  data.tar.gz: 15ab06e638ce08d4ea88dfd1e586a8b447b998e8969e971212873edb56db314e9cdf78236f1f6de57d8747afda30c36ba18aa0267ec808118713733cd7ccadb5

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/lib/effective_logging/active_record_logger.rb

@@ -5,16 +5,17 @@ module EffectiveLogging
     BLANK = "''"
     BLACKLIST = [:updated_at, :created_at, :encrypted_password, :status_steps] # Don't log changes or attributes
 
-    def initialize(object, to: nil, prefix: nil, only: nil, except: nil)
+    # to, prefix, only, except
+    def initialize(object, args = {})
       @object = object
       @resource = Effective::Resource.new(object)
 
       # Validate changes_to value
-      if to.present? && !@resource.belong_tos.map(&:name).include?(to)
-        raise ArgumentError.new("unable to find existing belongs_to relationship matching #{to}. Expected a symbol matching a belongs_to.")
+      if args[:to].present? && !@resource.belong_tos.map(&:name).include?(args[:to])
+        raise ArgumentError.new("unable to find existing belongs_to relationship matching #{args[:to]}. Expected a symbol matching a belongs_to.")
       end
 
-      @options = { to: to, prefix: prefix, only: only, except: Array(except) + BLACKLIST }.compact
+      @options = { to: args[:to], prefix: args[:prefix], only: args[:only], except: Array(args[:except]) + BLACKLIST }.compact
     end
 
     # Effective::Log.where(message: 'Deleted').where('details ILIKE ?', '%lab_test_id: 263%')

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.6'.freeze
+  VERSION = '3.0.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.11
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-12-18 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
@@ -138,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+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.