appstats 0.21.1 → 0.21.2

data/lib/appstats/audit.rb

@@ -8,7 +8,8 @@ module Appstats
     
     def self.audit_create(obj, options = {})
       count = 0
-      return count if obj.nil?
+      return count unless auditable?(obj)
+      
       table_name = obj.class.table_name
       obj_name = obj.class.name
 
@@ -23,7 +24,7 @@ module Appstats
     
     def self.audit_update(obj, options = {})
       count = 0
-      return count if obj.nil?
+      return count unless auditable?(obj)
 
       obj.changed_attributes.each do |obj_attr,old_value|
         new_value = obj.send("#{obj_attr}")
@@ -33,21 +34,26 @@ module Appstats
     end
 
     def self.audit_destroy(obj, options = {})
-      count = save_audit(obj, { :action => "destroyed" }, options)
+      count = 0
+      return count unless auditable?(obj)
+      count += save_audit(obj, { :action => "destroyed" }, options)
       count
     end
 
     private
+      
+      def self.auditable?(obj)
+        return false if obj.nil?
+        return false if obj.class == Appstats::Audit # cannot audit yourself - infinite recursion issues
+        true
+      end
     
       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] }

data/lib/appstats/version.rb

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

data/spec/audit_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 module Appstats
+  
+  class Audit
+    acts_as_auditable
+  end 
+  
   describe Audit do
 
     before(:each) do
@@ -41,6 +46,10 @@ module Appstats
     
     end
     
+    it "should ignore itself - even if requested" do
+      Audit.create(:table_name => "ignore")
+    end
+
     describe "save a new object" do
       
       it "should call audit_create" do

data/spec/query_spec.rb

@@ -496,6 +496,8 @@ module Appstats
           result = query.run
           result.count.should == 10
           result.group_by.should == "service_provider, user"
+          
+          # sometimes it is four?!?
           result.sub_results.size.should == 3
           
           result.sub_results[0].should == SubResult.new(:context_filter => "a, 1", :count => 5, :ratio_of_total => 0.50)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 79
   prerelease: 
   segments: 
   - 0
   - 21
-  - 1
-  version: 0.21.1
+  - 2
+  version: 0.21.2
 platform: ruby
 authors: 
 - Andrew Forward
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-05-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency