fiveruns-dash-rails 0.8.5 → 0.8.6

data/lib/fiveruns-dash-rails.rb

@@ -18,4 +18,4 @@ if START_FIVERUNS_DASH_RAILS
   end
   require 'fiveruns/dash/rails/context/template'
   require File.dirname(__FILE__) << "/../rails/init"  
-end
+end

data/lib/fiveruns/dash/rails.rb

@@ -189,4 +189,4 @@ if START_FIVERUNS_DASH_RAILS
     
   end
 
-end
+end

data/lib/fiveruns/dash/rails/context/template.rb

@@ -26,6 +26,7 @@ module Fiveruns::Dash::Rails::Context
       else
         path
       end
+
       # Remove extensions, if any
       path.sub(/\.[^\/\\]*$/, '')
     end
@@ -37,7 +38,7 @@ module Fiveruns::Dash::Rails::Context
       
         begin
           Fiveruns::Dash::Context.context << 'view'
-          if respond_to?(:path)
+          if respond_to?(:path) && !self.is_a?(ActionView::InlineTemplate)
             Fiveruns::Dash::Context.context << Fiveruns::Dash::Rails::Context::Template.sanitize_view_path(path)
           else
             Fiveruns::Dash::Context.context << '(inline)'
@@ -55,3 +56,4 @@ module Fiveruns::Dash::Rails::Context
   end
   
 end
+

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

@@ -16,4 +16,4 @@ Fiveruns::Dash.register_recipe :actionpack, :url => 'http://dash.fiveruns.com' d
     Fiveruns::Dash.logger.warn 'Collection of "render_time" unsupported for this version of Rails'
   end
   
-end
+end

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

@@ -1,4 +1,3 @@
-# Rails #######################################################################
 Fiveruns::Dash.register_recipe :rails, :url => 'http://dash.fiveruns.com' do |recipe|
   
   if defined?(ActiveRecord)
@@ -62,16 +61,33 @@ Fiveruns::Dash.register_recipe :rails, :url => 'http://dash.fiveruns.com' do |re
   recipe.added do
     
     if defined?(ActiveRecord)
-      ActiveRecord::Base.send(:include, Fiveruns::Dash::Rails::Context::ActiveRecord)
+      ActiveRecord::Base.send(:include, 
+        Fiveruns::Dash::Rails::Context::ActiveRecord)
     end
-    ActionController::Base.send(:include, Fiveruns::Dash::Rails::Context::Action)
+    
+    ActionController::Base.send(:include, 
+      Fiveruns::Dash::Rails::Context::Action)
     
     if defined?(ActionView::Renderable)
-      ActionView::Renderable.send(:include, Fiveruns::Dash::Rails::Context::Template) 
+      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)
+      if defined?(ActionView::Template)
+        ActionView::Template.send(:include, 
+          Fiveruns::Dash::Rails::Context::Template) 
+      end
+      
+      if defined?(ActionView::InlineTemplate) && 
+         Gem::Requirement.new('>= 2.2.0').
+           satisfied_by?(Gem::Version.new(Rails.version))
+        ActionView::InlineTemplate.send(:include, 
+          Fiveruns::Dash::Rails::Context::Template) 
+      end
+      
+      if defined?(ActionView::PartialTemplate)
+        ActionView::PartialTemplate.send(:include, 
+          Fiveruns::Dash::Rails::Context::Template) 
+      end
     end
 
     begin

data/version.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-rails
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency