fiveruns-dash-merb 0.7.0 → 0.8.0

data/VERSION.yml

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

data/lib/fiveruns/dash/merb.rb

@@ -7,12 +7,27 @@ module Fiveruns::Dash
       ::Fiveruns::Dash.logger.info "Starting FiveRuns Dash"
       Fiveruns::Dash.start(:app => ::Merb::Config[:dash][:token]) do |config|
         Array(::Merb::Config[:dash][:recipes]).each do |set|
-          name, url = Array(set)
+          name, options = Array(set)
           ::Fiveruns::Dash.logger.debug "Adding FiveRuns Dash recipe: #{set.inspect}"
-          config.add_recipe(name, :url => url)
+          config.add_recipe(name, options)
         end
       end
     end
+    
+    def self.autoadd_orm
+      return if !::Merb.orm || !::Merb::Config[:dash][:autoadd_orm]
+      require "fiveruns-dash-#{::Merb.orm}"
+      ::Merb::Config[:dash][:recipes].push([
+        ::Merb.orm,
+        {
+          :url => 'http://dash.fiveruns.com',
+          :total_time => 'response_time'
+        }
+      ])
+      Fiveruns::Dash.logger.info "Auto-added recipe for ORM from fiveruns-dash-#{::Merb.orm}"
+    rescue LoadError
+      Fiveruns::Dash.logger.warn "Could not auto-add recipe for ORM from fiveruns-dash-#{::Merb.orm}"
+    end
       
   end
 end

data/lib/fiveruns-dash-merb.rb

@@ -1,18 +1,21 @@
 # Depends on non-ActiveSupport fiveruns-dash-ruby (>= 0.8.0)
 dependency 'fiveruns-dash-ruby', '>= 0.8.0', :require_as => 'fiveruns/dash',
                                              :immediate => true
+
 Merb::Config[:dash] ||= {
   :token => nil,
+  :autoadd_orm => true,
   :recipes   => [
     # This recipe can be removed, if desired
-    [:merb, 'http://dash.fiveruns.com']
+    [:merb, {:url => 'http://dash.fiveruns.com'}]
   ]
 }
 
 Merb::BootLoader.after_app_loads do
-  Fiveruns::Dash.logger = Merb.logger
   require 'fiveruns/dash/merb'
   if Merb::Config[:adapter] != 'irb' && Merb::Config[:dash][:token]
+    Fiveruns::Dash.logger = Merb.logger
+    Fiveruns::Dash::Merb.autoadd_orm
     Fiveruns::Dash::Merb.start
   end
 end

metadata

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