effective_logging 3.0.5 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3363ae48fb27d2b255f72019146a8fae24e2267e4189d73d790b7fd8077c3f5e
-  data.tar.gz: 544f7e00c6a1d2aa20a25001b2b82159236232f5c339e9db29320cbe55755c34
+  metadata.gz: ced9c07cb086b859429b90b1ccbac95ae8e201b775bcd583b3d289004289094d
+  data.tar.gz: 7411b720f373bc75ad92be98649481daefc15755d972835909e65d272d243b40
 SHA512:
-  metadata.gz: 0a3f116668e9c19581023ccbb9eb12c3ae78170897425b7b381cd9c0ae3155c15c7cc0f09fadc333ba033d402a5e0781efa789cfbb7b3b4b04eb600afa538170
-  data.tar.gz: 6ab0bdceca929bc9b640f126d7a785c7c25a46409e6e588101860ba4dda6330909ead80228a10742c3ebddec4be8fd6c9a52d65bbe0e45dbaa11d360261e4a69
+  metadata.gz: caef27d98294627b0a21fa7d6dee8ab0d08d86e8297eddcbfcc403724bbfb75ca79b317192ee96ef744704e88fd03a04b41a913289c7a6e1c92753a140640a38
+  data.tar.gz: 579cabf40e8107f4a44c23da05e87c7d6887c4e7604b265475a8a4ae6769f99ce421e3e358df70f1d56935e06724254ceebec651cf8a41f5935811d44ad5cff2

data/README.md

@@ -197,6 +197,12 @@ 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 application controller:
+
+```
+around_action :set_effective_logging_current_user
+```
+
 Add to your model:
 
 ```ruby
@@ -371,4 +377,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/models/effective/log.rb

@@ -43,6 +43,10 @@ module Effective
       "Log #{id}"
     end
 
+    def associated_to_s=(value)
+      super(value.to_s[0...255].presence) # Take only first 255 characters
+    end
+
     def log(message, status = EffectiveLogging.statuses.first, options = {})
       EffectiveLogger.log(message, status, (options || {}).merge(parent: self))
     end

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

@@ -7,9 +7,9 @@ module EffectiveLogging
 
       def set_effective_logging_current_user
         EffectiveLogging.current_user = current_user
+        yield if block_given?
       end
 
     end
   end
 end
-

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.0.5'.freeze
+  VERSION = '3.0.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.10
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-09-08 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.