cia 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cia (0.4.2)
+    cia (0.4.3)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/cia
   specs:
-    cia (0.4.1)
+    cia (0.4.2)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/cia
   specs:
-    cia (0.4.1)
+    cia (0.4.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/cia.rb

@@ -36,7 +36,7 @@ module CIA
     return if options and options[:if] and not source.send(options[:if])
     return if options and options[:unless] and source.send(options[:unless])
 
-    changes = source.cia_changes.slice(*source.class.audited_attributes)
+    changes = (source.stored_cia_changes || source.cia_changes).slice(*source.class.audited_attributes)
     message = source.audit_message if source.respond_to?(:audit_message)
 
     return if not message and changes.empty? and action.to_s == "update"

data/lib/cia/auditable.rb

@@ -9,6 +9,15 @@ module CIA
       changes
     end
 
+    def stored_cia_changes(changes=nil)
+      if changes
+        @stored_cia_changes = changes
+      else
+        old, @stored_cia_changes = @stored_cia_changes, nil
+        old
+      end
+    end
+
     module ClassMethods
       def audit_attribute(*attributes)
         options = (attributes.last.is_a?(Hash) ? attributes.pop : {})
@@ -28,11 +37,12 @@ module CIA
         self.audited_attributes_callbacks_added = true
 
         [:create, :update, :destroy].each do |callback|
-          method, args = if options[:callback]
-            if ActiveRecord::VERSION::MAJOR == 2 && options[:callback] == :after_commit
+          method, args = if options[:callback] == :after_commit
+            send("after_#{callback}"){ |record| record.stored_cia_changes(record.cia_changes) }
+            if ActiveRecord::VERSION::MAJOR == 2
               ["after_commit_on_#{callback}", []]
             else # rails 3+
-              [options[:callback], [{:on => callback}]]
+              [:after_commit, [{:on => callback}]]
             end
           else
             ["after_#{callback}", []]

data/lib/cia/version.rb

@@ -1,3 +1,3 @@
 module CIA
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/cia_spec.rb

@@ -315,12 +315,28 @@ describe CIA do
     end
 
     context "with after_commit" do
-      let(:object){ CarWithTransactions.new }
+      let(:object){ CarWithTransactions.new(:wheels => 1) }
 
       it "still tracks" do
         expect{
           CIA.audit{ object.save! }
         }.to change{ CIA::Event.count }.by(+1)
+        CIA::Event.last.attribute_change_hash.should == {"wheels" => [nil, "1"]}
+      end
+
+      it "unsets temp-changes after the save" do
+        object.save!
+
+        # does not re-track old changes
+        expect{
+          CIA.audit{ object.update_attributes(:drivers => 2) }
+        }.to change{ CIA::Event.count }.by(+1)
+        CIA::Event.last.attribute_change_hash.should == {"drivers" => [nil, "2"]}
+
+        # empty changes
+        expect{
+          CIA.audit{ object.update_attributes(:drivers => 2) }
+        }.to_not change{ CIA::Event.count }
       end
 
       it "is not rolled back if auditing fails" do

data/spec/spec_helper.rb

@@ -89,7 +89,7 @@ end
 class CarWithTransactions < ActiveRecord::Base
   self.table_name = "cars"
   include CIA::Auditable
-  audit_attribute :wheels, :callback => :after_commit
+  audit_attribute :wheels, :drivers, :callback => :after_commit
 end
 
 class NestedCar < Car

metadata

@@ -1,22 +1,32 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cia
-version: !ruby/object:Gem::Version
-  version: 0.4.2
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+
+date: 2013-01-10 00:00:00 Z
 dependencies: []
+
 description: 
 email: michael@grosser.it
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .travis.yml
 - Appraisals
 - Gemfile
@@ -39,35 +49,37 @@ files:
 - spec/cia_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/cia
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3726638630951878810
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3726638630951878810
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Audit model events like update/create/delete + attribute changes + group
-  them by transaction, in normalized table layout for easy query access.
+summary: Audit model events like update/create/delete + attribute changes + group them by transaction, in normalized table layout for easy query access.
 test_files: []
+