effective_logging 3.5.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29a2f35841f2c300e99ba671235f38282574392f3e0ad58ac1a4b19e78603f51
-  data.tar.gz: 3460cc2ed8dcac7975fe8fe18ed1d111c121499bb540ce1ba587d9420f8d888c
+  metadata.gz: 07b93fb924886c7eb67bebfa52af0ebba0955dcf70f882631b20b6c8d1ad4561
+  data.tar.gz: af822e66e051e26100da80e9edab36e0c3665922924fadae8d2d8a9f0a34eed4
 SHA512:
-  metadata.gz: a73c5c23e02b3e230e343f32d185231ad30ac8ec2282cea0481d1943c3b7c8887c7245d09e118f946822aac38e175992450be9d12971fdc68fa1bab65d8b6fc3
-  data.tar.gz: dff10915122c29bf7adc3585550721dcd2ee913c32d9bf7f7443774c44ed367096f227cf0a5e2a6fd0c582f523e2ddcd203323a214836281f6dff41beeef4f2a
+  metadata.gz: 39fca8a1eb4fe170a48c4e588d711cdee34cbd5999f05220a905e308e346ce80c2ece0bb840b480d67c11f43cd7f5215c009e32f1e13bf15c3526dab20a790f8
+  data.tar.gz: aff176f1e23569d3f91a6e3b9c59bf3d8636efb753ae32dee906937db304769230762f85df3ef986cfc6b461c3251233e2affe8c6cd5887fd249b7167a0656fc

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -254,7 +254,7 @@ First, require the javascript in your application.js:
 and add the user permission:
 
 ```ruby
-can :create, Effective::Log
+can :create, EffectiveLogging.Log
 ```
 
 then logging an event from JavaScript is almost the same one-liner as from ruby:
@@ -290,7 +290,7 @@ link_to 'Logs', effective_logging.admin_logs_path   # /admin/logs
 But you may need to add the permission (using CanCan):
 
 ```ruby
-can :manage, Effective::Log
+can :manage, EffectiveLoggging.Log
 can :admin, :effective_logging
 ```
 

data/app/controllers/admin/logs_controller.rb

@@ -6,6 +6,9 @@ module Admin
     include Effective::CrudController
     skip_log_page_views
 
+    resource_scope -> { EffectiveLogging.Log.deep.all }
+    datatable -> { Admin::EffectiveLogsDatatable.new }
+
     if (config = EffectiveLogging.layout)
       layout(config.kind_of?(Hash) ? config[:admin] : config)
     end

data/app/controllers/effective/logs_controller.rb

@@ -5,15 +5,17 @@ module Effective
     include Effective::CrudController
     skip_log_page_views
 
+    resource_scope -> { EffectiveLogging.Log.all }
+
     if (config = EffectiveLogging.layout)
       layout(config.kind_of?(Hash) ? config[:application] : config)
     end
 
     # This is a post from our Javascript
     def create
-      EffectiveResources.authorize!(self, :create, Effective::Log.new)
+      EffectiveResources.authorize!(self, :create, resource_scope.new)
 
-      @log = Effective::Log.new.tap do |log|
+      @log = resource_scope.new.tap do |log|
         log.message = log_params[:message]
         log.status = EffectiveLogging.statuses.find { |status| status == log_params[:status] } || 'info'
         log.user = EffectiveLogging.current_user || current_user
@@ -40,12 +42,12 @@ module Effective
 
     # This is the User index event
     def index
-      EffectiveResources.authorize!(self, :index, Effective::Log.new(user_id: current_user.id))
+      EffectiveResources.authorize!(self, :index, resource_scope.new(user: current_user, user_id: current_user.id))
       @datatable = EffectiveLogsDatatable.new(self, for: current_user.id)
     end
 
     def html_part
-      @log = Effective::Log.find(params[:id])
+      @log = resource_scope.find(params[:id])
 
       EffectiveResources.authorize!(self, :show, @log)
 

data/app/datatables/admin/effective_logs_datatable.rb

@@ -0,0 +1,2 @@
+class Admin::EffectiveLogsDatatable < EffectiveLogsDatatable
+end

data/app/datatables/effective_log_changes_datatable.rb

@@ -37,7 +37,7 @@ class EffectiveLogChangesDatatable < Effective::Datatable
   # A nil attributes[:log_id] means give me all the top level log entries
   # If we set a log_id then it's for sub logs
   collection do
-    Effective::Log.logged_changes.deep
+    EffectiveLogging.Log.logged_changes.deep
       .where(changes_to_type: attributes[:changes_to_type], changes_to_id: attributes[:changes_to_id])
   end
 

data/app/datatables/effective_logs_datatable.rb

@@ -42,7 +42,7 @@ class EffectiveLogsDatatable < Effective::Datatable
   # A nil attributes[:log_id] means give me all the top level log entries
   # If we set a log_id then it's for sub logs
   collection do
-    scope = Effective::Log.deep.all
+    scope = EffectiveLogging.Log.deep.all
 
     # Older syntax, pass by integer
     if attributes[:for]

data/app/models/concerns/acts_as_loggable.rb

@@ -20,7 +20,7 @@ module ActsAsLoggable
   end
 
   included do
-    has_many :logged_changes, -> { order(:id).where(status: EffectiveLogging.log_changes_status) }, as: :changes_to, class_name: 'Effective::Log'
+    has_many :logged_changes, -> { EffectiveLogging.Log.order(:id).where(status: EffectiveLogging.log_changes_status) }, as: :changes_to
 
     log_changes_options = {
       to: @acts_as_loggable_options[:to],

data/app/models/concerns/effective_logging_log.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+# EffectiveLoggingLog
+#
+# Mark your log model with effective_logging_log to get all the includes
+
+module EffectiveLoggingLog
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_logging_log
+      include ::EffectiveLoggingLog
+    end
+  end
+
+  module ClassMethods
+    def effective_logging_log?; true; end
+  end
+
+  included do
+    self.table_name = (EffectiveLogging.logs_table_name || :logs).to_s
+
+    belongs_to :user, polymorphic: true, optional: true
+    belongs_to :changes_to, polymorphic: true, optional: true # This is the log_changes to: option
+    belongs_to :associated, polymorphic: true, optional: true
+
+    effective_resource do
+      status              :string
+
+      changes_to_type     :string
+      changes_to_id       :string
+
+      associated_type     :string
+      associated_id       :integer
+      associated_to_s     :string
+
+      message             :text
+      details             :text
+
+      timestamps
+    end
+
+    serialize :details, Hash
+
+    validates :message, presence: true
+    validates :status, presence: true
+
+    validate(if: -> { status.present? }) do
+      errors.add(:status, "is not included") unless EffectiveLogging.statuses.include?(status)
+    end
+
+    scope :deep, -> { includes(:user, :associated, :changes_to) }
+    scope :sorted, -> { order(:id) }
+    scope :logged_changes, -> { where(status: EffectiveLogging.log_changes_status) }
+    scope :changes, -> { where(status: EffectiveLogging.log_changes_status) }
+
+    # Dynamically add logging methods based on the defined statuses
+    # EffectiveLogging.info 'my message'
+    (EffectiveLogging.statuses || []).each do |status|
+      send(:define_method, status) { |message, options={}| log(message, status, options) }
+    end
+
+  end
+
+  # Instance Methods
+  def to_s
+    "#{model_name.human} ##{id}"
+  end
+
+  def associated_to_s=(value)
+    super(value.to_s[0...255].presence) # Take only first 255 characters
+  end
+
+  def log(message, status = nil, options = {})
+    status ||= EffectiveLogging.statuses.first
+    EffectiveLogger.log(message, status, options)
+  end
+
+  def details
+    self[:details] || {}
+  end
+
+  def next_log
+    self.class.order(id: :asc).where('id > ?', id).first
+  end
+
+  def prev_log
+    self.class.order(id: :desc).where('id < ?', id).first
+  end
+
+end

data/app/models/effective/log.rb

@@ -1,68 +1,7 @@
-# frozen_string_literal: true
-
 module Effective
   class Log < ActiveRecord::Base
     self.table_name = EffectiveLogging.logs_table_name.to_s
 
-    belongs_to :user, polymorphic: true, optional: true
-    belongs_to :changes_to, polymorphic: true, optional: true # This is the log_changes to: option
-    belongs_to :associated, polymorphic: true, optional: true
-
-    effective_resource do
-      status              :string
-
-      changes_to_type     :string
-      changes_to_id       :string
-
-      associated_type     :string
-      associated_id       :integer
-      associated_to_s     :string
-
-      message             :text
-      details             :text
-
-      timestamps
-    end
-
-    serialize :details, Hash
-
-    validates :message, presence: true
-    validates :status, presence: true, inclusion: { in: EffectiveLogging.statuses }
-
-    scope :deep, -> { includes(:user, :associated) }
-    scope :sorted, -> { order(:id) }
-    scope :logged_changes, -> { where(status: EffectiveLogging.log_changes_status) }
-    scope :changes, -> { where(status: EffectiveLogging.log_changes_status) }
-
-    def to_s
-      "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)
-    end
-
-    def details
-      self[:details] || {}
-    end
-
-    def next_log
-      Log.order(id: :asc).where('id > ?', id).first
-    end
-
-    def prev_log
-      Log.order(id: :desc).where('id < ?', id).first
-    end
-
-    # Dynamically add logging methods based on the defined statuses
-    # EffectiveLogging.info 'my message'
-    (EffectiveLogging.statuses || []).each do |status|
-      send(:define_method, status) { |message, options={}| log(message, status, options) }
-    end
-
+    effective_logging_log
   end
 end

data/app/models/effective_logger.rb

@@ -24,7 +24,7 @@ class EffectiveLogger
       options[:user_agent] ||= request.user_agent
     end
 
-    log = Effective::Log.new(
+    log = EffectiveLogging.Log.new(
       message: message,
       status: status,
       user_id: options.delete(:user_id),

data/config/effective_logging.rb

@@ -2,6 +2,9 @@ EffectiveLogging.setup do |config|
   # Configure Database Tables
   config.logs_table_name = :logs
 
+  # Specify Log class
+  # config.log_class_name = 'Effective::Log'
+
   # Admin Screens Layout Settings
   # config.layout = { application: 'application', admin: 'admin' }
 

data/lib/effective_logging/active_record_logger.rb

@@ -43,7 +43,7 @@ module EffectiveLogging
     end
 
     def log(message, details)
-      Effective::Log.create!(
+      EffectiveLogging.Log.create!(
         changes_to: log_changes_to,
         associated: object,
         associated_to_s: (object.to_s rescue nil),

data/lib/effective_logging/email_logger.rb

@@ -51,17 +51,13 @@ module EffectiveLogging
     private
 
     def self.log_email(message, fields, user_klass)
-      tos = Array(message.to) - [nil, '']
+      tos = (Array(message.to) + Array(message.cc)) - [nil, '']
 
       tos.each do |to|
         user = (user_klass.where(email: to.downcase).first if user_klass.present?)
+        details = fields.merge(to: to, user: user)
 
-        user_fields = fields.merge(to: to, user: user)
-        ::EffectiveLogger.email("#{message.subject} - #{tos.join(', ')}", user_fields)
-      end
-
-      if tos.blank? && (message.cc.present? || message.bcc.present?)
-        ::EffectiveLogger.email("#{message.subject} - multiple recipients", fields)
+        ::EffectiveLogger.email("#{message.subject} - #{to}", details)
       end
 
       true

data/lib/effective_logging/engine.rb

@@ -28,6 +28,7 @@ module EffectiveLogging
       app.config.to_prepare do
         ActiveSupport.on_load :active_record do
           ActiveRecord::Base.extend(ActsAsLoggable::Base)
+          ActiveRecord::Base.extend(EffectiveLoggingLog::Base)
         end
       end
     end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.5.3'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/lib/effective_logging.rb

@@ -6,12 +6,17 @@ module EffectiveLogging
   def self.config_keys
     [
       :logs_table_name, :layout, :additional_statuses,
+      :log_class_name,
       :active_storage_enabled, :email_enabled, :sign_in_enabled, :sign_out_enabled
     ]
   end
 
   include EffectiveGem
 
+  def self.Log
+    log_class_name&.constantize || Effective::Log
+  end
+
   def self.statuses
     @statuses ||= (
       base = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,10 +94,12 @@ files:
 - app/assets/javascripts/effective_logging/effective_logger.js.coffee.erb
 - app/controllers/admin/logs_controller.rb
 - app/controllers/effective/logs_controller.rb
+- app/datatables/admin/effective_logs_datatable.rb
 - app/datatables/effective_log_changes_datatable.rb
 - app/datatables/effective_logs_datatable.rb
 - app/helpers/effective_logging_helper.rb
 - app/models/concerns/acts_as_loggable.rb
+- app/models/concerns/effective_logging_log.rb
 - app/models/effective/log.rb
 - app/models/effective_logger.rb
 - app/views/admin/logs/_layout.html.haml
@@ -139,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Automatically log all sent emails, user logins, and page views. This also