fiveruns-dash-merb 0.6.1 → 0.6.2

data/VERSION.yml

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

data/lib/dash-merb.rb

@@ -1,7 +1,7 @@
 # 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] = {
+Merb::Config[:dash] ||= {
   :token => nil,
   :recipes   => [
     # This recipe can be removed, if desired
@@ -12,5 +12,7 @@ Merb::Config[:dash] = {
 Merb::BootLoader.after_app_loads do
   Fiveruns::Dash.logger = Merb.logger
   require 'fiveruns/dash/merb'
-  Fiveruns::Dash::Merb.start if Merb::Config[:dash][:token]
+  if Merb::Config[:adapter] != 'irb' && Merb::Config[:dash][:token]
+    Fiveruns::Dash::Merb.start
+  end
 end

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

@@ -1,5 +1,28 @@
 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 'render_time', :method => 'Merb::RenderMixin#render'
+  recipe.time :response_time, :method => 'Merb::Request#dispatch_action'
+  recipe.counter :requests, :incremented_by => 'Merb::Request#dispatch_action'
+  recipe.time :render_time, :method => 'Merb::RenderMixin#render'
+  merb_exceptions = Merb::ControllerExceptions.constants.map do |name|
+    "Merb::ControllerExceptions::#{name}"
+  end
+  recipe.ignore_exceptions do |ex|
+    merb_exceptions.include?(ex.class.name)
+  end
+  recipe.add_exceptions_from 'Merb::Request#dispatch_action' do |ex, request|
+    info = {:name => "#{ex.class.name} in #{request.controller}##{request.params[:action]}"}
+    # TODO: We shouldn't need to double-serialize to_json -- BW
+    begin
+      info[:params] = request.params.to_json
+    rescue
+      Merb.logger.warn "Could not capture request params for exception"
+    end
+    begin
+      info[:environment] = request.env.to_json
+    rescue
+      Merb.logger.warn "Could not capture request env for exception"
+    end
+    # TODO: capture session
+    # TODO: capture headers
+    info
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-merb
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: merb-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 description: Provides an API to send metrics from Merb 1.0+ applications to the FiveRuns Dash service
 email: dev@fiveruns.com
 executables: []