scout_rails 1.0.1.pre2 → 1.0.1.pre3

data/CHANGELOG.markdown

@@ -2,6 +2,7 @@
 
 * Unicorn support (requires "preload_app true" in unicorn config file)
 * Fix for Thin detection - ensure it's actually running
+* Fixing name conflict btw Tracer#store and ActiveRecord::Store
 
 # 1.0.0
 

data/lib/scout_rails/tracer.rb

@@ -12,10 +12,6 @@ module ScoutRails::Tracer
   end
   
   module ClassMethods
-    # An easier reference to the agent's associated store. 
-    def store
-      ScoutRails::Agent.instance.store
-    end
     
     # Use to trace a method call, possibly reporting slow transaction traces to Scout. 
     def trace(metric_name, options = {}, &block)
@@ -34,12 +30,12 @@ module ScoutRails::Tracer
       if options.delete(:scope)
         Thread::current[:scout_sub_scope] = metric_name 
       end
-      stack_item = store.record(metric_name)
+      stack_item = ScoutRails::Agent.instance.store.record(metric_name)
       begin
         yield
       ensure
         Thread::current[:scout_sub_scope] = nil if Thread::current[:scout_sub_scope] == metric_name
-        store.stop_recording(stack_item,options)
+        ScoutRails::Agent.instance.store.stop_recording(stack_item,options)
       end
     end
     

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.1.pre2"
+  VERSION = "1.0.1.pre3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre2
+  version: 1.0.1.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies: []
 description: Monitors a Ruby on Rails application and reports detailed metrics on
   performance to Scout, a hosted monitoring service.