cia 0.3.5 → 0.3.6

data/Gemfile.lock

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

data/Readme.md

@@ -58,6 +58,9 @@ class User < ActiveRecord::Base
     ...
   end
 end
+
+# adding an actor e.g. for user creation
+CIA.current_actor = @user
 ```
 
 

data/gemfiles/rails2.gemfile.lock

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

data/gemfiles/rails3.gemfile.lock

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

data/lib/cia.rb

@@ -22,10 +22,19 @@ module CIA
     Thread.current[:cia_transaction]
   end
 
+  def self.current_actor=(user)
+    current_transaction[:actor] = user if current_transaction
+  end
+
+  def self.current_actor
+    current_transaction[:actor] if current_transaction
+  end
+
   def self.record(action, source)
     return unless current_transaction
     options = source.class.audited_attribute_options
     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.changes.slice(*source.class.audited_attributes)
     message = source.audit_message if source.respond_to?(:audit_message)

data/lib/cia/auditable.rb

@@ -15,6 +15,7 @@ module CIA
         self.audited_attributes = Set.new unless audited_attributes
         self.audited_attributes += attributes.map(&:to_s)
 
+        raise "cannot have :if and :unless" if options[:if] && options[:unless]
         self.audited_attribute_options ||= {}
         self.audited_attribute_options.merge!(options)
 

data/lib/cia/version.rb

@@ -1,3 +1,3 @@
 module CIA
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/spec/cia/attribute_change_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe CIA::AttributeChange do
   it "stores times as db format" do
-    create_change(:old_value => Time.at(123456789)).reload.old_value.sub(/\.\d+$/,'').should == "1973-11-29 13:33:09"
+    t = Time.now
+    create_change(:old_value => t).reload.old_value.sub(/\.\d+$/,'').should == t.to_s(:db)
   end
 
   it "stores dates as db format" do

data/spec/cia_spec.rb

@@ -89,7 +89,7 @@ describe CIA do
 
       it "tracks if :if is true" do
         expect{
-          object.bar = true
+          object.tested = true
           object.save!
         }.to change{ CIA::Event.count }.by(+1)
         CIA::Event.last.action.should == "create"
@@ -103,6 +103,25 @@ describe CIA do
       end
     end
 
+    context ":unless" do
+      let(:object) { CarWithUnless.new }
+
+      it "tracks if :unless is false" do
+        expect{
+          object.save!
+        }.to change{ CIA::Event.count }.by(+1)
+        CIA::Event.last.action.should == "create"
+      end
+
+      it "does not track if :unless is true" do
+        expect{
+          object.tested = true
+          object.save!
+        }.to_not change{ CIA::Event.count }
+        CIA::Event.last.should == nil
+      end
+    end
+
     context "events" do
       def parse_event_changes(event)
         event.attribute_changes.map { |c| [c.attribute_name, c.old_value, c.new_value] }
@@ -220,4 +239,36 @@ describe CIA do
       end
     end
   end
+
+  context ".current_actor" do
+    it "is nil when nothing is set" do
+      CIA.current_actor.should == nil
+    end
+
+    it "is nil when no actor is set" do
+      CIA.audit do
+        CIA.current_actor.should == nil
+      end
+    end
+
+    it "is the current :actor" do
+      CIA.audit :actor => 111 do
+        CIA.current_actor.should == 111
+      end
+    end
+  end
+
+  context ".current_actor=" do
+    it "does nothing if no transaction is running" do
+      CIA.current_actor = 111
+      CIA.current_transaction.should == nil
+    end
+
+    it "sets when transaction is started" do
+      CIA.audit :actor => 222 do
+        CIA.current_actor = 111
+        CIA.current_transaction.should == {:actor => 111}
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -52,12 +52,15 @@ end
 class CarWithIf < ActiveRecord::Base
   self.table_name = "cars"
   include CIA::Auditable
-  audit_attribute :wheels, :if => :foo?
-  attr_accessor :bar
+  audit_attribute :wheels, :if => :tested
+  attr_accessor :tested
+end
 
-  def foo?
-    bar
-  end
+class CarWithUnless < ActiveRecord::Base
+  self.table_name = "cars"
+  include CIA::Auditable
+  audit_attribute :wheels, :unless => :tested
+  attr_accessor :tested
 end
 
 def create_event(options={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cia
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4110523684065790258
+      hash: -3737857467428511425
 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: 4110523684065790258
+      hash: -3737857467428511425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24