effective_logging 1.10.7 → 1.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d829635a3ee649017e547dee63b92aa3971493b3
-  data.tar.gz: 8f515ec5922a6e4861394bd426e7608d3cfcde88
+  metadata.gz: 920a2af8081f9e1e2fe559a021364991886fb1c5
+  data.tar.gz: 6f92283ff64d146864918064bf1c963dc12ef161
 SHA512:
-  metadata.gz: 9c00de12b0954fa2372fa5b5cd6753781044bb992499a543035e218a6db85bf43363a52369c6052726496450e1b40a75bcd819cd64552b521a44d283eb2a5c34
-  data.tar.gz: 9cb295a0bc4c563ddb4262dc37728151767a395773124e5d9c5146af1b116bb9c09ff5317960501034d97bf059dc76af50f0e3e60671e93d53918e33fc662f20
+  metadata.gz: c92036f53396c19543a05f374e10371506ab548eefa528bcf1d39a83871279af4a24a15e48f1a048a9078dc14ac30597fa643f694a7e64730bd7c37383d51074
+  data.tar.gz: e95c9fcfce61a22c01bc0e3b73f191705460efae4dcb852583a28e2c57572bdca49156a1551c0a31b3de7ba9d779caab57af54fe5f95bcd47d9ae254bab28662

data/app/datatables/effective_logs_datatable.rb

@@ -13,7 +13,7 @@ unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
       elsif attributes[:user].present?
         col :user, search: { collection: User.where(id: Array(attributes[:user]).map { |user| user.to_param }) }
       else
-        col :user, search: { as: :string }
+        col :user
       end
 
       unless attributes[:status] == false
@@ -21,14 +21,17 @@ unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
       end
 
       unless attributes[:log_changes]
-        col :associated
-        #col :associated_type, search: { as: :string }, visible: false
-        #col :associated_id, search: { as: :integer }, visible: false, label: 'Associated Id'
-        #col :associated_to_s, search: { as: :string }, label: 'Associated'
+        col :associated_type, search: { as: :string }, visible: false
+        col :associated_id, search: { as: :integer }, visible: false, label: 'Associated Id'
+        col :associated_to_s, search: { as: :string }, label: 'Associated'
       end
 
-      col :message do |log|
-        log.message.starts_with?("\t") ? log.message.gsub("\t", "&nbsp;&nbsp;") : log.message
+      if attributes[:log_changes]
+        col :message do |log|
+          log.message.starts_with?("\t") ? log.message.gsub("\t", "&nbsp;&nbsp;") : log.message
+        end
+      else
+        col :message
       end
 
       col :logs_count, visible: false
@@ -37,7 +40,9 @@ unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
         tableize_hash(log.details.except(:email), th: true, sub_th: false, width: '100%')
       end
 
-      actions_col partial: 'admin/logs/actions', partial_as: :log
+      unless attributes[:actions] == false
+        actions_col partial: 'admin/logs/actions', partial_as: :log
+      end
     end
 
     # A nil attributes[:log_id] means give me all the top level log entries

data/app/models/concerns/acts_as_loggable.rb

@@ -6,7 +6,7 @@ module ActsAsLoggable
       @acts_as_loggable_options = options.try(:first) || {}
 
       unless @acts_as_loggable_options.kind_of?(Hash)
-        raise ArgumentError.new("invalid arguments passed to (effective_logging) log_changes. Example usage: log_changes except: [:created_at]")
+        raise ArgumentError.new('invalid arguments passed to (effective_logging) log_changes. Example usage: log_changes except: [:created_at]')
       end
 
       include ::ActsAsLoggable
@@ -69,11 +69,15 @@ module ActsAsLoggable
   end
 
   def log_changes_datatable
-    if persisted?
-      @log_changes_datatable ||= (
+    return nil unless persisted?
+
+    @log_changes_datatable ||= (
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
         Effective::Datatables::Logs.new(associated_id: id, associated_type: self.class.name, log_changes: true, status: false)
-      )
-    end
+      else
+        EffectiveLogsDatatable.new(associated_id: id, associated_type: self.class.name, log_changes: true, status: false)
+      end
+    )
   end
 
 end

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

@@ -30,8 +30,12 @@ if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
             table_column :associated_to_s, label: 'Associated'
           end
 
-          table_column :message do |log|
-            log.message.starts_with?("\t") ? log.message.gsub("\t", "&nbsp;&nbsp;") : log.message
+          if attributes[:log_changes]
+            table_column :message do |log|
+              log.message.starts_with?("\t") ? log.message.gsub("\t", "&nbsp;&nbsp;") : log.message
+            end
+          else
+            table_column :message
           end
 
           table_column :logs_count, visible: false

data/app/views/effective/logs/_log.html.haml

@@ -5,7 +5,7 @@
         - parents_of_log(log).each do |parent|
           = link_to(log.message, (request.fullpath.gsub(log.to_param, parent.to_param) rescue '#'))
           = ' > '
-        %p= log.message
+        %p= log.message.html_safe
       .col-sm-2.text-right
         = link_to 'Prev', request.fullpath.gsub(log.to_param, log.prev_log.try(:to_param).to_s), class: 'btn btn-default', disabled: log.prev_log.blank?
         = link_to 'Next', request.fullpath.gsub(log.to_param, log.next_log.try(:to_param).to_s), class: 'btn btn-default', disabled: log.next_log.blank?

data/lib/effective_logging/active_record_logger.rb

@@ -46,6 +46,8 @@ module EffectiveLogging
     # before_save
     def changed!
       applicable(resource.instance_changes).each do |attribute, (before, after)|
+        next if before == nil && after == ''.freeze
+
         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
@@ -66,7 +68,7 @@ module EffectiveLogging
         title = association.name.to_s.singularize.titleize
 
         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!
+          ActiveRecordLogger.new(child, options.merge(logger: logger, depth: (depth + 1), prefix: "#{title} #{index} - #{child} - ")).execute!
         end
       end
 

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.10.7'.freeze
+  VERSION = '1.10.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.10.7
+  version: 1.10.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails