cia 0.3.0 → 0.3.1

data/Gemfile.lock

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

data/lib/cia.rb

@@ -10,10 +10,11 @@ module CIA
   end
 
   def self.audit(options = {})
+    old = Thread.current[:cia_transaction]
     Thread.current[:cia_transaction] = options
     yield
   ensure
-    Thread.current[:cia_transaction] = nil
+    Thread.current[:cia_transaction] = old
   end
 
   def self.current_transaction
@@ -28,11 +29,11 @@ module CIA
 
     return if not message and changes.empty? and action.to_s == "update"
 
-    event = CIA::Event.create!(
+    event = CIA::Event.create!(current_transaction.merge(
       :action => action.to_s,
       :source => source,
       :message => message
-    )
+    ))
     event.record_attribute_changes!(changes)
     event
   rescue Object => e

data/lib/cia/version.rb

@@ -1,3 +1,3 @@
 module CIA
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/cia_spec.rb

@@ -37,6 +37,19 @@ describe CIA do
       CIA.current_transaction.should == nil
       sleep 0.04 # so next tests dont fail
     end
+
+    it "can stack" do
+      states = []
+      CIA.audit(:a => 1) do
+        states << CIA.current_transaction
+        CIA.audit(:b => 1) do
+          states << CIA.current_transaction
+        end
+        states << CIA.current_transaction
+      end
+      states << CIA.current_transaction
+      states.should == [{:a => 1}, {:b => 1}, {:a => 1}, nil]
+    end
   end
 
   describe ".record" do
@@ -76,6 +89,14 @@ describe CIA do
         event.attribute_changes.map { |c| [c.attribute_name, c.old_value, c.new_value] }
       end
 
+      it "records attributes in transaction" do
+        event = nil
+        CIA.audit :actor => User.create!, :ip_address => "1.2.3.4" do
+          event = CIA.record(:destroy, Car.create!)
+        end
+        event.ip_address.should == "1.2.3.4"
+      end
+
       it "records attribute creations" do
         source = Car.create!
         source.wheels = 4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cia
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1846204307001126824
+      hash: -507458673584956374
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1846204307001126824
+      hash: -507458673584956374
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24