effective_logging 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c25bb89ed7d4ea61f1a557b544bc2476d87346a
-  data.tar.gz: c648b6749add1af7a26aa1ae8afc189b90b906b3
+  metadata.gz: 5d440bb1c8fc00063bd8be23b294627eddc3968a
+  data.tar.gz: 61aed25b0111ef56a941eedda9726ec40cb02bb4
 SHA512:
-  metadata.gz: 9900a5a17e851dae1b6e41a61c73972c29b91108bfb1359a436baa828f00c07e30ddfd46112cb51b145f8e8f9b3852d1d94c83d23cc8e6c3944a54737aeae470
-  data.tar.gz: 0da0a1ce53129cbe60680b5766e7dac74a2710e3ac6295247e0fcb10a1d0aeb1bfecbcb2dcb15333cd39ba22784f48313d7ceb5ce518d3dfe462f4c81de353cb
+  metadata.gz: cfedf4bfa32ecfcdb42e37a575e0cbc36edb0f794b974a8e41b213e4c73559833eb95e25112918615cb1bb296af3dacb05b136f035fe9294d9c68b630e1de687
+  data.tar.gz: 4525eb564843dc558935da3044cb82c3ed5c3f79258c9c2df28da2840a445ec5ba7df4c27c7b6c20537b4e87709fe0e02b399545c4947a6643ba8a9ada763d56

data/README.md

@@ -246,9 +246,9 @@ Apply your own formatting to the logged before and after values of each attribut
 # Format the value of this attribute. Return nil to use the default to_s
 def log_changes_formatted_value(attribute, value)
   if ['cost'].include?(attribute)
-    ActionController::Base.helpers.number_to_currency(value)
+    ApplicationController.helpers.number_to_currency(value)
   elsif ['percentage'].include?(attribute)
-    ActionController::Base.helpers.number_to_percentage(value)
+    ApplicationController.helpers.number_to_percentage(value)
   end
 end
 ```

data/app/controllers/admin/logs_controller.rb

@@ -17,13 +17,13 @@ module Admin
 
     def show
       @log = Effective::Log.includes(:logs).find(params[:id])
-      @log.next_log = Effective::Log.unscoped.order(:id).where(:parent_id => @log.parent_id).where('id > ?', @log.id).first
-      @log.prev_log = Effective::Log.unscoped.order(:id).where(:parent_id => @log.parent_id).where('id < ?', @log.id).last
+      @log.next_log = Effective::Log.unscoped.order(:id).where(parent_id: @log.parent_id).where('id > ?', @log.id).first
+      @log.prev_log = Effective::Log.unscoped.order(:id).where(parent_id: @log.parent_id).where('id < ?', @log.id).last
 
       @page_title = "Log ##{@log.to_param}"
 
       if @log.logs.present?
-        @log.datatable = Effective::Datatables::Logs.new(:log_id => @log.id) if defined?(EffectiveDatatables)
+        @log.datatable = Effective::Datatables::Logs.new(log_id: @log.id) if defined?(EffectiveDatatables)
       end
 
       EffectiveLogging.authorized?(self, :show, @log)

data/app/controllers/effective/logs_controller.rb

@@ -39,10 +39,10 @@ module Effective
 
     # This is the User index event
     def index
-      @datatable = Effective::Datatables::Logs.new(:user_id => current_user.id)
+      @datatable = Effective::Datatables::Logs.new(user_id: current_user.id)
       @page_title = 'My Activity'
 
-      EffectiveLogging.authorized?(self, :index, Effective::Log.new(:user_id => current_user.id))
+      EffectiveLogging.authorized?(self, :index, Effective::Log.new(user_id: current_user.id))
     end
 
     # This is the User show event

data/app/helpers/effective_logging_helper.rb

@@ -27,21 +27,23 @@ module EffectiveLoggingHelper
   # Any other options are sent to the table tag
   def tableize_hash(hash, options = {})
     if hash.present? && hash.kind_of?(Hash)
-      content_tag(:table, options) do
-        hash.map do |k, v|
-          content_tag(:tr) do
-            content_tag((options[:th] ? :th : :td), k) +
-            content_tag(:td) do
-              if v.kind_of?(Hash)
-                tableize_hash(v, options.merge({:class => 'table table-bordered', :th => (options.key?(:sub_th) ? options[:sub_th] : options[:th])}))
-              elsif v.kind_of?(Array)
-                '[' + v.join(', ') + ']'
-              else
-                v.to_s
+      content_tag(:table, class: options[:class]) do
+        content_tag(:tbody) do
+          hash.map do |k, v|
+            content_tag(:tr) do
+              content_tag((options[:th] ? :th : :td), k) +
+              content_tag(:td) do
+                if v.kind_of?(Hash)
+                  tableize_hash(v, options.merge({class: 'table table-hover', th: (options.key?(:sub_th) ? options[:sub_th] : options[:th])}))
+                elsif v.kind_of?(Array)
+                  '[' + v.join(', ') + ']'
+                else
+                  v.to_s
+                end
               end
             end
-          end
-        end.join('').html_safe
+          end.join('').html_safe
+        end
       end.html_safe
     else
       hash.to_s.html_safe
@@ -65,7 +67,7 @@ module EffectiveLoggingHelper
     value = log.details[key]
 
     if value.kind_of?(Hash)
-      tableize_hash(value, :class => 'table', :th => true)
+      tableize_hash(value, class: 'table table-hover', th: true)
     elsif value.kind_of?(Array)
       value.map { |value| effective_logging_simple_format(value) }.join.html_safe
     else

data/app/models/concerns/acts_as_loggable.rb

@@ -18,12 +18,13 @@ module ActsAsLoggable
 
     around_save do |_, block|
       @acts_as_loggable_new_record = new_record?
-      block.call
       EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).changed! unless @acts_as_loggable_new_record
+      block.call
       true
     end
 
     before_destroy do
+      @acts_as_loggable_destroy_record = true
       EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).destroyed!
       true
     end
@@ -31,9 +32,10 @@ module ActsAsLoggable
     after_commit do
       if @acts_as_loggable_new_record
         EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).created!
-      else
+      elsif !@acts_as_loggable_destroy_record
         EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).updated!
       end
+
       true
     end
 
@@ -65,12 +67,7 @@ module ActsAsLoggable
   def log_changes_datatable
     if persisted?
       @log_changes_datatable ||= (
-        Effective::Datatables::Logs.new(
-          associated_id: id,
-          associated_type: self.class.name,
-          status: false,
-          log_changes: true
-        )
+        Effective::Datatables::Logs.new(associated_id: id, associated_type: self.class.name, log_changes: true, status: false)
       )
     end
   end

data/app/models/effective/datatables/logs.rb

@@ -5,9 +5,9 @@ if defined?(EffectiveDatatables)
         include EffectiveLoggingHelper
 
         datatable do
-          default_order :created_at, :desc
+          default_order :updated_at, :desc
 
-          table_column :created_at
+          table_column :updated_at, label: 'Date'
           table_column :id, visible: false
 
           if attributes[:user] == false
@@ -24,9 +24,11 @@ if defined?(EffectiveDatatables)
             table_column :status, filter: { type: :select, values: EffectiveLogging.statuses }
           end
 
-          table_column :associated_type, visible: false
-          table_column :associated_id, visible: false, label: 'Associated Id'
-          table_column :associated_to_s, label: 'Associated'
+          unless attributes[:log_changes]
+            table_column :associated_type, visible: false
+            table_column :associated_id, visible: false, label: 'Associated Id'
+            table_column :associated_to_s, label: 'Associated'
+          end
 
           table_column :message do |log|
             log.message.starts_with?("\t") ? log.message.gsub("\t", "  ") : log.message
@@ -38,8 +40,6 @@ if defined?(EffectiveDatatables)
             tableize_hash(log.details.except(:email), th: true, sub_th: false, width: '100%')
           end
 
-          table_column :updated_at, visible: false
-
           unless attributes[:actions] == false
             actions_column partial: 'admin/logs/actions', partial_local: :log
           end

data/lib/effective_logging/active_record_logger.rb

@@ -1,14 +1,16 @@
 module EffectiveLogging
   class ActiveRecordLogger
-    attr_accessor :resource, :logger, :depth, :options
+    attr_accessor :object, :resource, :logger, :depth, :options
 
     BLANK = "''"
 
-    def initialize(resource, options = {})
+    def initialize(object, options = {})
       raise ArgumentError.new('options must be a Hash') unless options.kind_of?(Hash)
 
-      @resource = resource
-      @logger = options.delete(:logger) || resource
+      @object = object
+      @resource = Effective::Resource.new(object)
+
+      @logger = options.delete(:logger) || object
       @depth = options.delete(:depth) || 0
       @options = options
 
@@ -17,9 +19,9 @@ module EffectiveLogging
 
     # execute! is called when we recurse, otherwise the following methods are best called individually
     def execute!
-      if resource.new_record?
+      if object.new_record?
         created!
-      elsif resource.marked_for_destruction?
+      elsif object.marked_for_destruction?
         destroyed!
       else
         changed!
@@ -28,84 +30,44 @@ module EffectiveLogging
 
     # before_destroy
     def destroyed!
-      log('Deleted', details: applicable(attributes))
+      log('Deleted', details: applicable(resource.instance_attributes))
     end
 
     # after_commit
     def created!
-      log('Created', details: applicable(attributes))
+      log('Created', details: applicable(resource.instance_attributes))
     end
 
     # after_commit
     def updated!
-      log('Updated', details: applicable(attributes))
+      log('Updated', details: applicable(resource.instance_attributes))
     end
 
     # before_save
     def changed!
-      applicable(changes).each do |attribute, (before, after)|
-        if resource.respond_to?(:log_changes_formatted_value)
-          before = resource.log_changes_formatted_value(attribute, before) || before
-          after = resource.log_changes_formatted_value(attribute, after) || after
+      applicable(resource.instance_changes).each do |attribute, (before, after)|
+        if object.respond_to?(:log_changes_formatted_value)
+          before = object.log_changes_formatted_value(attribute, before) || before
+          after = object.log_changes_formatted_value(attribute, after) || after
         end
 
-        attribute = if resource.respond_to?(:log_changes_formatted_attribute)
-          resource.log_changes_formatted_attribute(attribute)
+        attribute = if object.respond_to?(:log_changes_formatted_attribute)
+          object.log_changes_formatted_attribute(attribute)
         end || attribute.titleize
 
-        log("#{attribute}: #{before.presence || BLANK} to #{after.presence || BLANK}", details: { attribute: attribute, before: before, after: after })
+        log("#{attribute}: #{before.presence || BLANK} → #{after.presence || BLANK}", details: { attribute: attribute, before: before, after: after })
       end
 
       # Log changes on all accepts_as_nested_parameters has_many associations
-      (resource.class.try(:reflect_on_all_autosave_associations) || []).each do |association|
-        child_name = association.name.to_s.singularize.titleize
+      resource.nested_resources.each do |association|
+        title = association.name.to_s.singularize.titleize
 
-        Array(resource.send(association.name)).each_with_index do |child, index|
-          ActiveRecordLogger.new(child, options.merge(logger: logger, depth: (depth + 1), prefix: "#{child_name} ##{index+1}: ")).execute!
+        Array(object.send(association.name)).each_with_index do |child, index|
+          ActiveRecordLogger.new(child, options.merge(logger: logger, depth: (depth + 1), prefix: "#{title} ##{index+1}: ")).execute!
         end
       end
     end
 
-    def attributes
-      attributes = { attributes: resource.attributes }
-
-      # Collect to_s representations of all belongs_to associations
-      (resource.class.try(:reflect_on_all_associations, :belongs_to) || []).each do |association|
-        attributes[association.name] = resource.send(association.name).to_s.presence
-      end
-
-      # Collect to_s representations for all has_one associations
-      (resource.class.try(:reflect_on_all_associations, :has_one) || []).each do |association|
-        attributes[association.name] = resource.send(association.name).to_s.presence
-      end
-
-      # Collects attributes for all accepts_as_nested_parameters has_many associations
-      (resource.class.try(:reflect_on_all_autosave_associations) || []).each do |association|
-        attributes[association.name] = {}
-
-        Array(resource.send(association.name)).each_with_index do |child, index|
-          attributes[association.name][index+1] = ActiveRecordLogger.new(child, options.merge(logger: logger)).attributes
-        end
-
-        attributes[association.name].presence
-      end
-
-      attributes
-    end
-
-    def changes
-      changes = resource.changes
-
-      # Log to_s changes on all belongs_to associations
-      (resource.class.try(:reflect_on_all_associations, :belongs_to) || []).each do |association|
-        if (change = changes.delete(association.foreign_key)).present?
-          changes[association.name] = [(association.klass.find_by_id(change.first) if changes.first), resource.send(association.name)]
-        end
-      end
-
-      changes
-    end
-
     private
 
     def log(message, details: {})
@@ -113,8 +75,7 @@ module EffectiveLogging
         user: EffectiveLogging.current_user,
         status: EffectiveLogging.log_changes_status,
         message: "#{"\t" * depth}#{options[:prefix]}#{message}",
-        associated: resource,
-        associated_to_s: (resource.to_s rescue nil),
+        associated_to_s: (logger.to_s rescue nil),
         details: details
       ).tap { |log| log.save }
     end
@@ -130,7 +91,7 @@ module EffectiveLogging
       end
 
       (options[:additionally] || []).each do |attribute|
-        value = (resource.send(attribute) rescue :effective_logging_nope)
+        value = (object.send(attribute) rescue :effective_logging_nope)
         next if attributes[attribute].present? || value == :effective_logging_nope
 
         atts[attribute] = value

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.10.2'.freeze
+  VERSION = '1.10.3'.freeze
 end

data/lib/effective_logging.rb

@@ -1,4 +1,5 @@
 require 'haml-rails'
+require 'effective_resources'
 require 'effective_logging/engine'
 require 'effective_logging/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: effective_resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement