fiveruns-dash-merb 0.6.4 → 0.7.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 0
 :major: 0
-:minor: 6
+:minor: 7

data/lib/fiveruns/dash/merb/recipe.rb

@@ -1,9 +1,23 @@
 Fiveruns::Dash.register_recipe :merb, :url => 'http://dash.fiveruns.com' do |recipe|
-  recipe.time :response_time, :method => 'Merb::Request#dispatch_action'
   
-  recipe.counter :requests, :incremented_by => 'Merb::Request#dispatch_action'
+  recipe.time :response_time, :method => 'Merb::Request#dispatch_action',
+                              :context => lambda { |request, *args|
+                                [
+                                  [],
+                                  [:action, "#{request.controller}##{request.params[:action]}"]
+                                ]
+                              }
+  
+  recipe.counter :requests, :incremented_by => 'Merb::Request#dispatch_action',
+                            :context => lambda { |request, *args|
+                              [
+                                [],
+                                [:action, "#{request.controller}##{request.params[:action]}"]
+                              ]
+                            }
   
   # Mark re-entrant so this doesn't get counted multiple times if nested
+  # TODO: Track context (needed for barlist 'detail')
   recipe.time :render_time, :method => 'Merb::RenderMixin#render',
                             :reentrant => true
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-merb
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency