fiveruns-dash-rails 0.8.4 → 0.8.5

data/Rakefile

@@ -20,7 +20,7 @@ begin
     s.homepage = "http://github.com/fiveruns/dash-rails" 
     s.description = "Provides an API to send metrics from Rails applications to the FiveRuns Dash service" 
     s.authors = ["FiveRuns Development Team"] 
-    s.files = FileList['README.rdoc', 'Rakefile', 'VERSION.yml', 'init.rb', "{lib,rails,test}/**/*", ] 
+    s.files = FileList['README.rdoc', 'Rakefile', 'version.yml', 'init.rb', "{lib,rails,test}/**/*", ] 
     s.add_dependency 'fiveruns-dash-ruby', '>= 0.8.1' 
     s.add_dependency 'fiveruns-dash-activerecord', '>= 0.8.1'
   end 
@@ -38,4 +38,4 @@ task :coverage do
     FileUtils.cp_r 'coverage', ccout
   end
   system "open coverage/index.html" if PLATFORM['darwin']
-end
+end

data/lib/fiveruns/dash/rails.rb

@@ -7,8 +7,8 @@ if START_FIVERUNS_DASH_RAILS
     
       module Rails
         
-        version_file = File.dirname(__FILE__) << "/../../../VERSION.yml"
-        version = YAML.load(version_file)
+        version_file = File.expand_path(File.dirname(__FILE__) << "/../../../version.yml")
+        version = YAML.load(File.read(version_file))
         VERSION = [
           version[:major],
           version[:minor],

data/lib/fiveruns/dash/recipes/actionpack.rb

@@ -4,8 +4,12 @@ Fiveruns::Dash.register_recipe :actionpack, :url => 'http://dash.fiveruns.com' d
   recipe.counter :requests, 'Requests', :incremented_by => 'ActionController::Base#perform_action'
   
   targets = []
-  targets << 'ActionView::Template#render' if defined?(ActionView::Template)
-  targets << 'ActionView::PartialTemplate#render' if defined?(ActionView::PartialTemplate)
+  if defined?(ActionView::Renderable)
+    targets << 'ActionView::Renderable#render'
+  else
+    targets << 'ActionView::Template#render' if defined?(ActionView::Template)
+    targets << 'ActionView::PartialTemplate#render' if defined?(ActionView::PartialTemplate)
+  end
   if !targets.empty?
     recipe.time :render_time, :method => targets
   else

data/lib/fiveruns/dash/recipes/rails.rb

@@ -65,9 +65,14 @@ Fiveruns::Dash.register_recipe :rails, :url => 'http://dash.fiveruns.com' do |re
       ActiveRecord::Base.send(:include, Fiveruns::Dash::Rails::Context::ActiveRecord)
     end
     ActionController::Base.send(:include, Fiveruns::Dash::Rails::Context::Action)
-    ActionView::Template.send(:include, Fiveruns::Dash::Rails::Context::Template) if defined?(ActionView::Template)
-    ActionView::InlineTemplate.send(:include, Fiveruns::Dash::Rails::Context::Template) if defined?(ActionView::InlineTemplate)
-    ActionView::PartialTemplate.send(:include, Fiveruns::Dash::Rails::Context::Template) if defined?(ActionView::PartialTemplate)
+    
+    if defined?(ActionView::Renderable)
+      ActionView::Renderable.send(:include, Fiveruns::Dash::Rails::Context::Template) 
+    else
+      ActionView::Template.send(:include, Fiveruns::Dash::Rails::Context::Template) if defined?(ActionView::Template)
+      ActionView::InlineTemplate.send(:include, Fiveruns::Dash::Rails::Context::Template) if defined?(ActionView::InlineTemplate)
+      ActionView::PartialTemplate.send(:include, Fiveruns::Dash::Rails::Context::Template) if defined?(ActionView::PartialTemplate)
+    end
 
     begin
       if defined?(Mongrel)

data/version.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 0
+:minor: 8
+:patch: 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-rails
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ extra_rdoc_files: []
 files: 
 - README.rdoc
 - Rakefile
-- VERSION.yml
+- version.yml
 - init.rb
 - lib/fiveruns
 - lib/fiveruns/dash