effective_logging 3.0.4 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19680da7bc048d5574223fca115ac877e1ed4e45d346dc71b4ce2895f5d23d0
-  data.tar.gz: d455d79c1d428c2c753bb46eb10eeafb7bdfa0d861be8fbd13e9afe9a604d2f3
+  metadata.gz: 87ea6d6a2184d29eec7b23d56bde3f84c17f16b8f6058a9823849c5ee56edc50
+  data.tar.gz: 0bb7c7040965bc8bb4587a1668d01902b4c85d26c574269b7b130a41325a570e
 SHA512:
-  metadata.gz: ea2a885212f36741a713880b58ae621a04d1ed8980d2ecd150a0936f60996f5047d3aa3d4fe03cc4a6734be1e3483a6141cc5354596d02cabfb1eb4e1292d63a
-  data.tar.gz: 421254b96a6138f2c6e1353a7f3a3c97a34e34368523d3a7f5db9517d5b66b21d85edadabcf11858177dc82b776dca4c21423c5358d1669e73a73a01c4f66fd9
+  metadata.gz: 4c7d6f2d933d8774ebc5142a3e171e03178d5918a392635db966c9aa88b0d6d19127520d644fa2f43733cefc514bb31fb23d68dc542c99133b90922cf5aaa213
+  data.tar.gz: 8914c55bdfbe4e3951e25152c095656c2fb649ebd91d3cceca73191b16177f45db31a14339c42363d223a571cefcf9bf1644f7c9683de43d001ea3ff371a6c8b

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/concerns/acts_as_loggable.rb

@@ -1,7 +1,7 @@
 module ActsAsLoggable
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def log_changes(*options)
       @acts_as_loggable_options = options.try(:first) || {}
 

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
@@ -22,7 +23,7 @@ module EffectiveLogging
     # Include acts_as_loggable concern and allow any ActiveRecord object to call it with log_changes()
     initializer 'effective_logging.active_record' do |app|
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(ActsAsLoggable::ActiveRecord)
+        ActiveRecord::Base.extend(ActsAsLoggable::Base)
       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/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.0.4'.freeze
+  VERSION = '3.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.9
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-08-13 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.