active-audit 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415a536bf1baa3b6406ab790ceb32011b4b4bf93
-  data.tar.gz: 6053cc7939434e6ab197634f0f0b60c499ee2b7a
+  metadata.gz: 1319b7111b54ac97687b736ad1101c522f69dfd4
+  data.tar.gz: 69b1ff6a16208158898598b169c621ee82ef5138
 SHA512:
-  metadata.gz: 5ac94740df196d66b91db31f820b7a796a4abd3a076149501474c5b2e26de18a26361fcf0dcfd44b58f15376babe909fee82d51a998014688b9b5b782d68391f
-  data.tar.gz: af5f84180dd9f6d9cd582aab0b1b00b345b39e0fce75f1b6d344d74039f532c571f90f08a889a4c9a4f7fb97eb0a214cbb90e95d25560b5d23691e44ec2a97b7
+  metadata.gz: 76d46d974a83c641a6c3892bbceab7523b11c3627a6af24f7db71c404a1064138048238dddf5b525187c3c33668c4a14b50d3fe5c74a43c153083284f66b00f9
+  data.tar.gz: 666fc0d4d1259e2556ae74e045b1bb5875b35683550eaab8639efbd43e3a54f855ff676800e599ef3f7930be1a84128b07bf8595bc71aaa18912d47d85609ac8

data/lib/active_audit/audit.rb

@@ -8,6 +8,7 @@ module ActiveAudit
 
     extend  ActiveModel::Callbacks
     define_model_callbacks :create, :save
+    define_model_callbacks :initialize, :only => :after
 
     include ActiveModel::Observing
 
@@ -19,16 +20,12 @@ module ActiveAudit
     attribute :comment, String
     attribute :recorded_at, Time, default: lambda { |o,a| Time.now.utc }
 
-    before_save do
-      self.recorded_at = Time.at(self.recorded_at) if self.recorded_at.is_a? Integer
-      self.attributed_to = ActiveAudit.extract_user_profile.call(self.attributed_to) unless self.attributed_to.nil? || self.attributed_to.is_a?(Hash)
-    end
-
     def initialize *args
       attributes = args.extract_options!
       if attributes.empty?
         if args.count == 2
           initialize_from_record(*args)
+          run_callbacks :initialize
         else
           raise ArgumentError, "You need to supply at least one attribute"
         end
@@ -76,8 +73,12 @@ module ActiveAudit
       object
     end
 
-    def serialize
-      self.attributes.select {|k,v| v.present?}.merge(recorded_at: self.recorded_at.to_i, type: self.type)
+    def self.serialize audit
+      audit.attributes.select {|k,v| v.present?}.merge(recorded_at: audit.recorded_at.to_i)
+    end
+
+    def self.deserialize attributes
+      self.new attributes.update(recorded_at: Time.at(attributes[:recorded_at]))
     end
   end
 end

data/lib/active_audit/audit_repository.rb

@@ -14,7 +14,7 @@ module ActiveAudit
       end
 
       def create attributes
-        save Audit.new(attributes)
+        save Audit.deserialize(attributes)
       end
 
       def save audit

data/lib/active_audit/base.rb

@@ -70,7 +70,7 @@ module ActiveAudit
           audit = Audit.new event, self
           if audit.changed?
             if ActiveAudit.delayed_auditing
-              AuditPusher.perform_later audit.serialize
+              AuditPusher.perform_later Audit.serialize(audit)
             else
               AuditRepository.save(audit)
             end

data/lib/active_audit/sweeper.rb

@@ -16,8 +16,8 @@ module ActiveAudit
       end
     end
 
-    def before_create audit
-      audit.attributed_to = self.user if self.user
+    def after_initialize audit
+      audit.attributed_to = ActiveAudit.extract_user_profile.call(self.user) if self.user
       audit.comment = controller.params[:comment] if controller.respond_to?(:params, true)
       audit.comment ||= ActiveAudit.session[:comment]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-audit
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Tariq Abughofa