fixed bug with bad memoization of total active record instantiation c…

…ount; updating docs

README.rdoc

@@ -26,18 +26,26 @@ Currently oink can only parse logs in the Hodel3000Logger format
 
 === Install
 
-To print memory usage at the end of each request, include MemoryUsageLogger in your controller
+To print memory usage at the end of each request, include Oink::MemoryUsageLogger in your controller. This will add lines like:
 
-  class ApplicationController
-    include MemoryUsageLogger
-  end
+class ApplicationController
+  include Oink::MemoryUsageLogger
+end
 
-To print active record instantiation at the end of each request, include ActiveRecordCounter in your controller
+which results in lines like this added to each request:
+
+  Feb 08 11:39:54 ey33-s00302 rails[9076]: Memory usage: 316516 | PID: 9076
+
+To print active record instantiation at the end of each request, include Oink::InstanceTypeCounter in your controller. 
 
   class ApplicationController
-    include ActiveRecordCounter
+    include Oink::InstanceTypeCounter
   end
 
+which results in lines like this added to each request:
+
+  Feb 27 13:21:04 ey04-s00295 rails[11862]: Instantiation Breakdown: Total: 73 | User: 34 | Group: 20 | Medium: 20 | Sport: 10 | Post: 4 | Discussion: 2
+
 == Usage
 
 After installing the plugin and aggregating some enhanced logs, run the oink executable against the logs. Oink can point at a log file or a directory of log files

lib/oink/rails/instance_type_counter.rb

@@ -35,6 +35,7 @@ def self.included(klass)
 
         def self.reset_instance_type_count
           @@instantiated = {}
+          @@total = nil
         end
 
         def self.instantiated_hash

spec/rails/instance_type_counter_spec.rb

@@ -28,8 +28,18 @@
       Pen.create(:location => "Backyard")
       Pig.first
       ActiveRecord::Base.total_objects_instantiated.should == 3
+    end    
+  end
+
+  describe "reset" do
+    it "should reset the total count" do
+      Pig.create(:name => "Babe")
+      ActiveRecord::Base.instantiated_hash["Pig"].should == 1
+      ActiveRecord::Base.reset_instance_type_count
+      ActiveRecord::Base.total_objects_instantiated.should == 0
+      Pig.create(:name => "Babe")
+      ActiveRecord::Base.total_objects_instantiated.should == 0
     end
-
   end
 
 end