effective_logging 1.10.6 → 1.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4505eb9d63d37917638f060aa88ec3bba0ab1eb7
-  data.tar.gz: 7003902e81dc178bd313135f9a199413380a98ef
+  metadata.gz: d829635a3ee649017e547dee63b92aa3971493b3
+  data.tar.gz: 8f515ec5922a6e4861394bd426e7608d3cfcde88
 SHA512:
-  metadata.gz: 022241e504a0616086c903a81dbac1d127ff1f9565a7a1d44338dc6207c061ea5e57fb6d15f08404621ee61b00399ddfed4c2f1f4b0639369e36f45301e62f54
-  data.tar.gz: 286cec2bbe861908b2f6279b404342ca145ede8733b5a80e77bd6dc9b39fe3eb5caa6f80ac18815a056511da2358263312649bf032588e8d03a3c306c750d04f
+  metadata.gz: 9c00de12b0954fa2372fa5b5cd6753781044bb992499a543035e218a6db85bf43363a52369c6052726496450e1b40a75bcd819cd64552b521a44d283eb2a5c34
+  data.tar.gz: 9cb295a0bc4c563ddb4262dc37728151767a395773124e5d9c5146af1b116bb9c09ff5317960501034d97bf059dc76af50f0e3e60671e93d53918e33fc662f20

data/app/datatables/effective_logs_datatable.rb

@@ -21,9 +21,10 @@ unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
       end
 
       unless attributes[:log_changes]
-        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
+        #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|

data/app/models/concerns/acts_as_loggable.rb

@@ -18,7 +18,11 @@ module ActsAsLoggable
 
     around_save do |_, block|
       @acts_as_loggable_new_record = new_record?
-      EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).changed! unless @acts_as_loggable_new_record
+
+      unless @acts_as_loggable_new_record
+        @acts_as_loggable_update_record = EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).changed!
+      end
+
       block.call
       true
     end
@@ -32,7 +36,7 @@ module ActsAsLoggable
     after_commit do
       if @acts_as_loggable_new_record
         EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).created!
-      elsif !@acts_as_loggable_destroy_record
+      elsif !@acts_as_loggable_destroy_record && @acts_as_loggable_update_record
         EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).updated!
       end
 

data/lib/effective_logging/active_record_logger.rb

@@ -51,6 +51,9 @@ module EffectiveLogging
           after = object.log_changes_formatted_value(attribute, after) || after
         end
 
+        before = before.to_s if before.kind_of?(ActiveRecord::Base)
+        after = after.to_s if after.kind_of?(ActiveRecord::Base)
+
         attribute = if object.respond_to?(:log_changes_formatted_attribute)
           object.log_changes_formatted_attribute(attribute)
         end || attribute.titleize
@@ -66,18 +69,25 @@ module EffectiveLogging
           ActiveRecordLogger.new(child, options.merge(logger: logger, depth: (depth + 1), prefix: "#{title} ##{index+1}: ")).execute!
         end
       end
+
+      @logged == true
     end
 
     private
 
     def log(message, details: {})
-      logger.logged_changes.build(
+      @logged = true
+
+      log = logger.logged_changes.build(
         user: EffectiveLogging.current_user,
         status: EffectiveLogging.log_changes_status,
         message: "#{"\t" * depth}#{options[:prefix]}#{message}",
         associated_to_s: (logger.to_s rescue nil),
         details: details
-      ).tap { |log| log.save }
+      )
+
+      log.save
+      log
     end
 
     # TODO: Make this work better with nested objects

data/lib/effective_logging/version.rb

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

metadata

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