appstats 0.20.12 → 0.21.1

data/.gitignore

@@ -6,6 +6,6 @@ doc
 config/appstats.yml
 config/initializers/appstats.rb
 log
-appstats_2010-09-21.log
+appstats_*.log
 tmp
 .rvmrc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    appstats (0.20.12)
+    appstats (0.21.1)
       daemons
       net-scp
       rails (>= 2.3.0)

data/Gemfile.lock.rails2

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    appstats (0.20.12)
+    appstats (0.21.1)
       daemons
       net-scp
       rails (>= 2.3.0)

data/db/migrations/20110510141236_create_audits.rb

@@ -0,0 +1,22 @@
+class CreateAudits < ActiveRecord::Migration
+  def self.up
+    create_table :appstats_audits do |t|
+      t.string :table_name
+      t.string :column_type
+      t.string :obj_name
+      t.string :obj_attr
+      t.string :obj_type
+      t.integer :obj_id
+      t.string :action
+      t.string :old_value
+      t.string :new_value
+      t.text :old_value_full
+      t.text :new_value_full
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :appstats_audits
+  end
+end

data/db/migrations/20110510173343_add_test_object_columns.rb

@@ -0,0 +1,16 @@
+class AddTestObjectColumns < ActiveRecord::Migration
+  def self.up
+    add_column :appstats_test_objects, :last_name, :string
+    [:binary,:boolean,:date,:datetime,:decimal,:float,:integer,:string,:text,:time,:timestamp].each do |type|
+      add_column :appstats_test_objects, "blah_#{type}", type  
+    end
+  end
+
+  def self.down
+    remove_column :appstats_test_objects, :last_name
+    [:binary,:boolean,:date,:datetime,:decimal,:float,:integer,:string,:text,:time,:timestamp].each do |type|
+      remove_column :appstats_test_objects, "blah_#{type}"
+    end
+  end
+
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110330171745) do
+ActiveRecord::Schema.define(:version => 20110510173343) do
 
   create_table "appstats_action_context_keys", :force => true do |t|
     t.string   "action_name"
@@ -28,6 +28,22 @@ ActiveRecord::Schema.define(:version => 20110330171745) do
     t.datetime "updated_at"
   end
 
+  create_table "appstats_audits", :force => true do |t|
+    t.string   "table_name"
+    t.string   "column_type"
+    t.string   "obj_name"
+    t.string   "obj_attr"
+    t.string   "obj_type"
+    t.integer  "obj_id"
+    t.string   "action"
+    t.string   "old_value"
+    t.string   "new_value"
+    t.text     "old_value_full"
+    t.text     "new_value_full"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "appstats_context_keys", :force => true do |t|
     t.string   "name"
     t.string   "status"
@@ -159,6 +175,18 @@ ActiveRecord::Schema.define(:version => 20110330171745) do
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "last_name"
+    t.binary   "blah_binary"
+    t.boolean  "blah_boolean"
+    t.date     "blah_date"
+    t.datetime "blah_datetime"
+    t.decimal  "blah_decimal",   :precision => 10, :scale => 0
+    t.float    "blah_float"
+    t.integer  "blah_integer"
+    t.string   "blah_string"
+    t.text     "blah_text"
+    t.time     "blah_time"
+    t.datetime "blah_timestamp"
   end
 
 end

data/lib/appstats.rb

@@ -1,8 +1,10 @@
 require 'rubygems'
 require 'active_record'
 require "#{File.dirname(__FILE__)}/appstats/acts_as_appstatsable"
+require "#{File.dirname(__FILE__)}/appstats/acts_as_auditable"
 require "#{File.dirname(__FILE__)}/appstats/code_injections"
 require "#{File.dirname(__FILE__)}/appstats/entry"
+require "#{File.dirname(__FILE__)}/appstats/audit"
 require "#{File.dirname(__FILE__)}/appstats/entry_date"
 require "#{File.dirname(__FILE__)}/appstats/date_range"
 require "#{File.dirname(__FILE__)}/appstats/action"

data/lib/appstats/acts_as_appstatsable.rb

@@ -18,7 +18,6 @@ module ActsAsAppstatsable
       EOV
       
       acts_as_appstatsable_options(options)
-      
     end
     
     def acts_as_appstatsable_options(options = {})

data/lib/appstats/acts_as_auditable.rb

@@ -0,0 +1,45 @@
+module ActsAsAuditable
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+  
+  module ClassMethods
+
+    def acts_as_auditable(options = {})
+      self.cattr_accessor :auditable_options
+
+      class_eval <<-EOV
+         include ActsAsAuditable::InstanceMethods
+      
+         after_create :audit_create
+         after_destroy :audit_destroy
+         after_update :audit_update
+      EOV
+      
+      acts_as_auditable_options(options)
+    end
+
+    def acts_as_auditable_options(options = {})
+      self.auditable_options = options
+    end    
+  end
+
+  module InstanceMethods
+
+    def audit_create
+      Appstats::Audit.audit_create(self,self.class.auditable_options)
+    end
+    
+    def audit_destroy
+      Appstats::Audit.audit_destroy(self,self.class.auditable_options)
+    end
+    
+    def audit_update
+      Appstats::Audit.audit_update(self,self.class.auditable_options)
+    end
+
+  end
+end       
+
+ActiveRecord::Base.class_eval { include ActsAsAuditable }

data/lib/appstats/audit.rb

@@ -0,0 +1,60 @@
+
+module Appstats
+  class Audit < ActiveRecord::Base
+    set_table_name "appstats_audits"
+    
+    attr_accessible :table_name, :column_type, :obj_name, :obj_attr, :obj_type, :obj_id, :action, :old_value, :new_value, :old_value_full, :new_value_full
+  
+    
+    def self.audit_create(obj, options = {})
+      count = 0
+      return count if obj.nil?
+      table_name = obj.class.table_name
+      obj_name = obj.class.name
+
+      count += save_audit(obj, { :action => "created"}, options)
+      obj.attributes.each do |obj_attr,new_value|
+        next if new_value.nil?
+        old_value = nil
+        count += save_audit(obj, { :action => "created", :obj_attr => obj_attr, :old_value => old_value, :new_value => new_value }, options)
+      end
+      count
+    end
+    
+    def self.audit_update(obj, options = {})
+      count = 0
+      return count if obj.nil?
+
+      obj.changed_attributes.each do |obj_attr,old_value|
+        new_value = obj.send("#{obj_attr}")
+        count += save_audit(obj, { :action => "updated", :obj_attr => obj_attr, :old_value => old_value, :new_value => new_value}, options)
+      end
+      count
+    end
+
+    def self.audit_destroy(obj, options = {})
+      count = save_audit(obj, { :action => "destroyed" }, options)
+      count
+    end
+
+    private
+    
+      def self.save_audit(obj,custom_fields,options = {})
+        return 0 if obj.nil?
+
+        if custom_fields.key?(:obj_attr)
+          obj_attr = custom_fields[:obj_attr]
+          return 0 if (options.key?(:except) && options[:except].include?(obj_attr.to_sym))
+          return 0 if (options.key?(:only) && !options[:only].include?(obj_attr.to_sym))
+        end
+
+        column_type = custom_fields.key?(:obj_attr) ? obj.class.columns_hash[custom_fields[:obj_attr]].sql_type : nil
+        obj_type = custom_fields.key?(:obj_attr) ? obj.class.columns_hash[custom_fields[:obj_attr]].type : nil
+        default_fields = { :table_name => obj.class.table_name, :column_type => column_type, :obj_type => obj_type, :obj_name => obj.class.name, :obj_id => obj.id, :old_value_full => custom_fields[:old_value], :new_value_full => custom_fields[:new_value] }
+        Audit.create(default_fields.merge(custom_fields))
+        1
+      end
+
+  
+  end
+end

data/lib/appstats/test_object.rb

@@ -2,8 +2,15 @@ module Appstats
   class TestObject < ActiveRecord::Base
     set_table_name "appstats_test_objects"
     acts_as_appstatsable
+    acts_as_auditable
 
-    attr_accessible :name
+    attr_accessible :name, :last_name
+
+    # after_save :blah
+    # 
+    # def blah
+    #   puts "#{changed_attributes.inspect}"
+    # end
 
     def to_s
       return "NILL" if name.nil?

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.20.12"
+  VERSION = "0.21.1"
 end

data/spec/acts_as_auditable_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe ActsAsAuditable do
+
+  before(:each) do
+    Time.stub!(:now).and_return(Time.parse('2010-09-21 23:15:20'))
+    Appstats::TestObject.acts_as_auditable_options
+    Appstats::Audit.delete_all
+  end
+
+  after(:all) do
+    Appstats::TestObject.acts_as_auditable_options
+  end
+
+  describe "should be settable in the options" do
+
+    describe "create" do
+
+      it "should only track included options" do
+        Appstats::TestObject.acts_as_auditable_options(:only => [:name])
+        @obj = Appstats::TestObject.create(:name => "x")
+        Appstats::Audit.count.should == 2
+      end
+
+      it "should exclude track excluded options" do
+        Appstats::TestObject.acts_as_auditable_options(:except => [:name])
+        @obj = Appstats::TestObject.create(:name => "x")
+        Appstats::Audit.count.should == 4
+      end    
+
+      it "should default to all " do
+        Appstats::TestObject.acts_as_auditable_options
+        @obj = Appstats::TestObject.create(:name => "x")
+        Appstats::Audit.count.should == 5
+      end
+            
+    end
+
+    describe "update" do
+
+      before(:each) do
+        @obj = Appstats::TestObject.create(:name => "x")
+        Appstats::Audit.delete_all
+        @obj.name = "y"
+        @obj.last_name = "z"
+        @obj.blah_string = "x"
+      end
+
+      it "should only track included options" do
+        Appstats::TestObject.acts_as_auditable_options(:only => [:name])
+        @obj.save
+        Appstats::Audit.count.should == 1
+      end
+
+      it "should exclude track excluded options" do
+        Appstats::TestObject.acts_as_auditable_options(:except => [:name])
+        @obj.save
+        Appstats::Audit.count.should == 2
+      end    
+
+      it "should default to all " do
+        @obj.save
+        Appstats::Audit.count.should == 3
+      end
+      
+    end
+
+  end
+
+  
+  # describe "default behaviour" do
+  # 
+  #   it "should track after_save" do
+  #     @obj = Appstats::TestObject.create(:name => "x")
+  #     Appstats::Logger.raw_read.last.should == Appstats::Logger.entry_to_s("object-created", :class_name => "Appstats::TestObject", :class_id => @obj.id, :details => "[x]")
+  #   end
+  # 
+  #   it "should track after_destroy" do
+  #     Appstats::TestObject.acts_as_auditable(:only => [:destroy])
+  #     @obj = Appstats::TestObject.create(:name => "x")
+  #     @obj.destroy
+  #     Appstats::Logger.raw_read.last.should == Appstats::Logger.entry_to_s("object-destroyed", :class_name => "Appstats::TestObject", :class_id => @obj.id, :details => "[x]")
+  #   end
+  # 
+  #   it "should track after_update" do
+  #     Appstats::TestObject.acts_as_auditable(:only => [:update])
+  #     @obj = Appstats::TestObject.create(:name => "x")
+  #     @obj.name = "y"
+  #     @obj.save
+  #     Appstats::Logger.raw_read.last.should == Appstats::Logger.entry_to_s("object-updated", :class_name => "Appstats::TestObject", :class_id => @obj.id, :details => "[y]")
+  #   end
+  # 
+  # 
+  #   it "should handle exceptions" do
+  #     @cheating = Appstats::TestObject.create(:name => "y")
+  #     Appstats::Logger.stub!(:entry).with("object-created", :class_name => "Appstats::TestObject", :class_id => @cheating.id + 1, :details => "[x]").and_raise("something bad")
+  #     @obj = Appstats::TestObject.create(:name => "x")
+  #     Appstats::Logger.raw_read.last.should == Appstats::Logger.entry_to_s("appstats-exception", :on => "object-created", :error => "something bad")
+  #   end
+  # end
+
+end

data/spec/audit_spec.rb

@@ -0,0 +1,354 @@
+require 'spec_helper'
+
+module Appstats
+  describe Audit do
+
+    before(:each) do
+      Appstats::Audit.delete_all
+      @audit = Appstats::Audit.new
+    end
+    
+    describe "#initialize" do
+
+      it "should set info to nil" do
+        @audit.table_name.should == nil
+        @audit.column_type.should == nil
+        @audit.obj_name.should == nil
+        @audit.obj_attr.should == nil
+        @audit.obj_type.should == nil
+        @audit.obj_id.should == nil
+        @audit.action.should == nil
+        @audit.old_value.should == nil
+        @audit.new_value.should == nil
+        @audit.old_value_full.should == nil
+        @audit.new_value_full.should == nil
+      end
+
+      it "should set on constructor" do
+        audit = Appstats::Audit.new(:table_name => 'a', :column_type => 'aa', :obj_name => 'c', :obj_attr => 'd', :obj_type => 'dd', :obj_id => 99, :action => 'x', :old_value => 'e', :new_value => 'f', :old_value_full => 'g', :new_value_full => 'h')
+        audit.table_name.should == 'a'
+        audit.column_type.should == 'aa'
+        audit.obj_name.should == 'c'
+        audit.obj_attr.should == 'd'
+        audit.obj_type.should == 'dd'
+        audit.obj_id.should == 99
+        audit.action.should == 'x'
+        audit.old_value.should == 'e'
+        audit.new_value.should == 'f'
+        audit.old_value_full.should == 'g'
+        audit.new_value_full.should == 'h'
+      end
+    
+    end
+    
+    describe "save a new object" do
+      
+      it "should call audit_create" do
+        t = TestObject.new(:name => 'a')
+        Audit.should_receive(:audit_create).with(t,{}).and_return(5)
+        t.save.should == true
+      end
+         
+    end
+    
+    describe "update an existing object" do
+      
+      it "should call audit_update" do
+        t = TestObject.create(:name => 'a')
+        t.name = "x"
+        Audit.should_receive(:audit_update).with(t,{}).and_return(2)
+        t.save
+      end
+      
+      it "should store the type" do
+        t = TestObject.new
+        
+        t.blah_binary = "b"
+        t.blah_boolean = true
+        t.blah_date = Date.parse("2011-09-21")
+        t.blah_datetime = DateTime.parse("2011-09-21 10:11:12")
+        t.blah_decimal = 10.11
+        t.blah_float = 0.33
+        t.blah_integer = 10
+        t.blah_string = "sss"
+        t.blah_text = "moresss"
+        t.blah_time = Time.parse("10:11:12")
+        t.blah_timestamp = Time.parse("10:11:12").to_i
+
+        t.save.should == true
+
+
+        Audit.count.should == 15
+        
+        all = Audit.all
+        all[0].column_type.should == nil
+        all[0].obj_type.should == nil
+        
+        all[1].obj_attr.should == "blah_string"
+        all[1].column_type.should == "varchar(255)"
+        all[1].obj_type.should == "string"
+
+        all[2].obj_attr.should == "created_at"
+        all[2].column_type.should == "datetime"
+        all[2].obj_type.should == "datetime"
+
+        all[3].obj_attr.should == "blah_timestamp"
+        all[3].column_type.should == "datetime"
+        all[3].obj_type.should == "datetime"
+
+        all[4].obj_attr.should == "updated_at"
+        all[4].column_type.should == "datetime"
+        all[4].obj_type.should == "datetime"
+
+        all[5].obj_attr.should == "id"
+        all[5].column_type.should == "int(11)"
+        all[5].obj_type.should == "integer"
+
+        all[6].obj_attr.should == "blah_decimal"
+        all[6].column_type.should == "decimal(10,0)"
+        all[6].obj_type.should == "integer"
+
+        all[7].obj_attr.should == "blah_boolean"
+        all[7].column_type.should == "tinyint(1)"
+        all[7].obj_type.should == "boolean"
+
+        all[8].obj_attr.should == "blah_binary"
+        all[8].column_type.should == "blob"
+        all[8].obj_type.should == "binary"
+
+        all[9].obj_attr.should == "blah_time"
+        all[9].column_type.should == "time"
+        all[9].obj_type.should == "time"
+
+        all[10].obj_attr.should == "blah_text"
+        all[10].column_type.should == "text"
+        all[10].obj_type.should == "text"
+
+        all[11].obj_attr.should == "blah_integer"
+        all[11].column_type.should == "int(11)"
+        all[11].obj_type.should == "integer"
+      end
+      
+    end
+
+    describe "destroy an object" do
+      
+      it "should call audit_destroy" do
+        t = TestObject.create(:name => 'a')
+        Audit.should_receive(:audit_destroy).with(t,{}).and_return(2)
+        t.destroy
+      end
+      
+    end
+
+    
+    describe "#audit_destroy" do
+
+      it "should ignore nil" do
+        Audit.audit_destroy(nil).should == 0
+        Audit.count.should == 0
+      end
+      
+      it "should track changed and initialized attributes" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+        
+        Audit.audit_destroy(t).should == 1
+        
+        all = Audit.all
+        audit = all[0]
+        audit.table_name.should == "appstats_test_objects"
+        audit.column_type.should == nil
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == nil
+        audit.obj_id.should == t.id
+        audit.action.should == "destroyed"
+        audit.old_value.should == nil
+        audit.new_value.should == nil
+        audit.old_value_full.should == nil
+        audit.new_value_full.should == nil
+      end
+      
+      it "should do the same on :except" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+        Audit.audit_destroy(t, :except => [:name]).should == 1
+      end
+
+      it "should do the same on :only" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+        Audit.audit_destroy(t, :only => [:name]).should == 1
+      end
+
+    end
+    
+    describe "#audit_update" do
+      
+      it "should ignore nil" do
+        Audit.audit_update(nil).should == 0
+        Audit.count.should == 0
+      end
+      
+      it "should be filterable on :except" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+        
+        t.name = 'b'
+        t.last_name = 'c'
+        Audit.audit_update(t, :except => [:name]).should == 1
+
+        all = Audit.all
+        audit = all[0]
+        audit.table_name.should == "appstats_test_objects"
+        audit.column_type.should == "varchar(255)"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'last_name'
+      end
+
+      it "should be filterable on :only" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+        
+        t.name = 'b'
+        t.last_name = 'c'
+        Audit.audit_update(t, :only => [:name]).should == 1
+
+        all = Audit.all
+        audit = all[0]
+        audit.table_name.should == "appstats_test_objects"
+        audit.column_type.should == "varchar(255)"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'name'
+      end      
+      
+      it "should track changed and initialized attributes" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+        
+        t.name = 'b'
+        t.last_name = 'c'
+        Audit.audit_update(t).should == 2
+        
+        all = Audit.all
+        audit = all[0]
+        audit.table_name.should == "appstats_test_objects"
+        audit.column_type.should == "varchar(255)"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'name'
+        audit.obj_id.should == t.id
+        audit.action.should == "updated"
+        audit.old_value.should == 'a'
+        audit.new_value.should == 'b'
+        audit.old_value_full.should == 'a'
+        audit.new_value_full.should == 'b'
+
+        audit = all[1]
+        audit.table_name.should == "appstats_test_objects"
+        audit.column_type.should == "varchar(255)"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'last_name'
+        audit.obj_id.should == t.id
+        audit.action.should == "updated"
+        audit.old_value.should == nil
+        audit.new_value.should == 'c'
+        audit.old_value_full.should == nil
+        audit.new_value_full.should == 'c'
+        
+      end
+      
+      
+    end
+    
+    describe "#audit_create" do
+      
+      it "should ignore nil" do
+        Audit.audit_create(nil).should == 0
+        Audit.count.should == 0
+      end
+      
+      it "should be filterable on :except" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+
+        Audit.audit_create(t, :except => [:name]).should == 4
+        Audit.count.should == 4
+      end
+
+      it "should be filterable on :only" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+
+        Audit.audit_create(t, :only => [:name]).should == 2
+        Audit.count.should == 2
+        
+        all = Audit.all
+        audit = all[0]
+        audit.table_name.should == "appstats_test_objects"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == nil
+
+        audit = all[1]
+        audit.table_name.should == "appstats_test_objects"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'name'
+      end
+
+      it "should store all non nil properties on create" do
+        t = TestObject.create(:name => 'a')
+        Audit.delete_all
+
+        Audit.audit_create(t).should == 5
+        Audit.count.should == 5
+        
+        all = Audit.all
+        audit = all[0]
+        audit.table_name.should == "appstats_test_objects"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == nil
+        audit.obj_id.should == t.id
+        audit.action.should == "created"
+        audit.old_value.should == nil
+        audit.new_value.should == nil
+        audit.old_value_full.should == nil
+        audit.new_value_full.should == nil
+
+        audit = all[1]
+        audit.table_name.should == "appstats_test_objects"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'name'
+        audit.obj_id.should == t.id
+        audit.action.should == "created"
+        audit.old_value.should == nil
+        audit.new_value.should == 'a'
+        audit.old_value_full.should == nil
+        audit.new_value_full.should == 'a'
+
+        audit = all[2]
+        audit.table_name.should == "appstats_test_objects"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'created_at'
+        audit.obj_id.should == t.id
+        audit.action.should == "created"
+        audit.old_value.should == nil
+        audit.new_value.should == t.created_at.strftime("%Y-%m-%d %H:%M:%S")
+        audit.old_value_full.should == nil
+        audit.new_value_full.should == t.created_at.strftime("%Y-%m-%d %H:%M:%S")
+
+        audit = all[3]
+        audit.table_name.should == "appstats_test_objects"
+        audit.obj_name.should == "Appstats::TestObject"
+        audit.obj_attr.should == 'updated_at'
+        audit.obj_id.should == t.id
+        audit.action.should == "created"
+        audit.old_value.should == nil
+        audit.new_value.should == t.created_at.strftime("%Y-%m-%d %H:%M:%S")
+        audit.old_value_full.should == nil
+        audit.new_value_full.should == t.created_at.strftime("%Y-%m-%d %H:%M:%S")
+      end
+      
+    end
+
+
+  end
+end

data/spec/entry_spec.rb

@@ -193,18 +193,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.create_from_logger_string("0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_search"
-        entry.raw_entry.should == "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
       end
       
       it "should understand contexts" do
-        entry = Entry.create_from_logger_string("0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_filter"
-        entry.raw_entry.should == "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "app_name"
@@ -214,10 +214,10 @@ module Appstats
       end
       
       it "should handle 'action' as a context" do
-        entry = Entry.create_from_logger_string('0.20.12 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.21.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
         Entry.count.should == @before_count + 1
         entry.action.should == "page-view"
-        entry.raw_entry.should == "0.20.12 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
+        entry.raw_entry.should == "0.21.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
         entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "action"
@@ -228,10 +228,10 @@ module Appstats
       end
       
       it "should handle multiple of the same 'context'" do
-        entry = Entry.create_from_logger_string('0.20.12 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
+        entry = Entry.create_from_logger_string('0.21.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
         Entry.count.should == @before_count + 1
         entry.action.should == "page-view"
-        entry.raw_entry.should == "0.20.12 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
+        entry.raw_entry.should == "0.21.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
         entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "app_name"

data/spec/logger_spec.rb

@@ -122,12 +122,12 @@ module Appstats
       
       it "should accept numbers" do
         Appstats::Logger.entry(5, :blah => 6)   
-        Appstats::Logger.raw_read.should == ["0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
       end
 
       it "should accept arrays" do
         Appstats::Logger.entry('search', :provider => [ 'one', 'two' ])   
-        Appstats::Logger.raw_read.should == ["0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
+        Appstats::Logger.raw_read.should == ["0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
       end
 
 
@@ -137,7 +137,7 @@ module Appstats
 
       it "should look similar to regular entry" do
         Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")   
-        Appstats::Logger.raw_read.should == ["0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
       end
       
     end
@@ -154,47 +154,47 @@ module Appstats
     
        it "should handle a statistics entry" do
          expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
          actual.should == expected
        end
        
        it "should handle contexts" do
          expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
          actual.should == expected
        end
 
        it "should handle multiple actions" do
          expected = { :action => ["address_filter", "blah"], :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : action=blah : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : action=blah : app_name=Market : server=Live")
          actual.should == expected
        end
 
        it "should handle multiple of same context" do
          expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => ['Sin','Market'] }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Sin : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Sin : app_name=Market : server=Live")
          actual.should == expected
        end
 
        it "should handle no actions" do
          expected = { :action => "UNKNOWN_ACTION", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
          actual.should == expected
        end
     
        it "should handle actions with the delimiter (and change the delimiter)" do
          expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
          actual.should == expected
     
          expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
          actual.should == expected
        end
     
        it "should handle contexts with the delimiter (and change the delimiter)" do
          expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
-         actual = Appstats::Logger.entry_to_hash("0.20.12 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.21.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -203,66 +203,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle numbers" do
-        expected = "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
         actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
         actual.should == expected
       end
       
       it "should handle default contexts" do
         Appstats::Logger.default_contexts[:app_name] = "market"
-        expected = "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle contexts (and sort them by symbol)" do
-        expected = "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
         actual.should == expected
       end
 
       it "should handle actions with the delimiter (and change the delimiter)" do
-        expected = "0.20.12 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.21.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
         actual = Appstats::Logger.entry_to_s("address:=search-n")
         actual.should == expected
 
-        expected = "0.20.12 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.21.1 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
         actual = Appstats::Logger.entry_to_s("address::search==--n")
         actual.should == expected
       end
 
       it "should handle contexts with the delimiter (and change the delimiter)" do
-        expected = "0.20.12 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.21.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
         actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
         actual.should == expected
       end
 
       it "should ignore spaces" do
-        expected = "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
         actual = Appstats::Logger.entry_to_s("address search")
         actual.should == expected
       end
       
       it "should convert newlines in action" do
-        expected = "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
         actual = Appstats::Logger.entry_to_s("address_\nsearch")
         actual.should == expected
       end
 
       it "should convert newlines in context" do
-        expected = "0.20.12 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.21.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
         actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
         actual.should == expected
       end
       
       it "should convert newlines based on the delimiter" do
-        expected = "0.20.12 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.21.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
         actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
         actual.should == expected
       end

data/spec/test_object_spec.rb

@@ -11,11 +11,13 @@ module Appstats
     
       it "should set name to nil" do
         @obj.name.should == nil
+        @obj.last_name.should == nil
       end
     
       it "should set on constructor" do
-        obj = Appstats::TestObject.new(:name => 'a')
+        obj = Appstats::TestObject.new(:name => 'a', :last_name => 'b')
         obj.name.should == 'a'
+        obj.last_name.should == 'b'
       end
     
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 73
   prerelease: 
   segments: 
   - 0
-  - 20
-  - 12
-  version: 0.20.12
+  - 21
+  - 1
+  version: 0.21.1
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-05-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,12 +182,16 @@ files:
 - db/migrations/20110318203339_add_appstats_results_latest_flag.rb
 - db/migrations/20110321154125_add_appstats_results_query_duration_in_seconds.rb
 - db/migrations/20110330171745_create_appstats_action_contexts.rb
+- db/migrations/20110510141236_create_audits.rb
+- db/migrations/20110510173343_add_test_object_columns.rb
 - db/schema.rb
 - lib/appstats.rb
 - lib/appstats/action.rb
 - lib/appstats/action_context_key.rb
 - lib/appstats/acts_as_appstatsable.rb
+- lib/appstats/acts_as_auditable.rb
 - lib/appstats/appstats_query.rb
+- lib/appstats/audit.rb
 - lib/appstats/ci.rake
 - lib/appstats/code_injections.rb
 - lib/appstats/context.rb
@@ -233,8 +237,10 @@ files:
 - spec/action_context_key_spec.rb
 - spec/action_spec.rb
 - spec/acts_as_appstatsble_spec.rb
+- spec/acts_as_auditable_spec.rb
 - spec/appstats_query_spec.rb
 - spec/appstats_spec.rb
+- spec/audit_spec.rb
 - spec/context_key_spec.rb
 - spec/context_spec.rb
 - spec/context_value_spec.rb
@@ -290,8 +296,10 @@ test_files:
 - spec/action_context_key_spec.rb
 - spec/action_spec.rb
 - spec/acts_as_appstatsble_spec.rb
+- spec/acts_as_auditable_spec.rb
 - spec/appstats_query_spec.rb
 - spec/appstats_spec.rb
+- spec/audit_spec.rb
 - spec/context_key_spec.rb
 - spec/context_spec.rb
 - spec/context_value_spec.rb