atmos-merb_hoptoad_notifier 1.0.1 → 1.0.2.5

data/Rakefile

@@ -7,9 +7,9 @@ require 'merb-core/tasks/merb_rake_helper'
 require 'spec/rake/spectask'
 
 NAME = "merb_hoptoad_notifier"
-GEM_VERSION = "1.0.5"
+GEM_VERSION = "1.0.9"
 AUTHOR = "Corey Donohoe"
-EMAIL = "atmos@atmos.org"
+EMAIL = 'atmos@atmos.org'
 HOMEPAGE = "http://github.com/atmos"
 SUMMARY = "Merb plugin that provides hoptoad exception notification"
 

data/lib/merb_hoptoad_notifier.rb

@@ -1,4 +1,6 @@
 require File.expand_path(File.dirname(__FILE__)+'/merb_hoptoad_notifier/hoptoad_notifier')
+require File.expand_path(File.dirname(__FILE__)+'/merb_hoptoad_notifier/hoptoad_mixin')
+
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
   Merb::BootLoader.after_app_loads do

data/lib/merb_hoptoad_notifier/hoptoad_mixin.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__)+'/hoptoad_notifier')
+
+module HoptoadMixin
+  def notify_hoptoad(request=nil, session=nil)
+    request ||= self.request
+    session ||= self.session
+    
+    HoptoadNotifier.notify_hoptoad(request, session)
+  end
+  
+  def warn_hoptoad(message, request=nil, session=nil, options={})
+    request ||= self.request
+    session ||= self.session
+    
+    HoptoadNotifier.warn_hoptoad(message, request, session, options)
+  end
+end

data/lib/merb_hoptoad_notifier/hoptoad_notifier.rb

@@ -3,21 +3,49 @@ require 'net/http'
 module HoptoadNotifier
   class << self
     attr_accessor :api_key, :logger
-    
+
     def configure
       key = YAML.load_file(Merb.root / 'config' / 'hoptoad.yml')
       if key
         env = key[Merb.env.to_sym]
         env ? @api_key = env[:api_key] : raise(ArgumentError, "No hoptoad key for Merb environment #{Merb.env}")
       end
-    end    
-    
+    end
+
     def logger
       @logger || Merb.logger
     end
 
     def environment_filters
-      @environment_filters ||= %w(SSH_AUTH_SOCK)
+      @environment_filters ||= %w(AWS_ACCESS_KEY  AWS_SECRET_ACCESS_KEY AWS_ACCOUNT SSH_AUTH_SOCK)
+    end
+
+    def warn_hoptoad(message, request, session, options={})
+      return if request.nil?
+      params = request.params
+
+      data = {
+        :api_key       => HoptoadNotifier.api_key,
+        :error_class   => options[:error_class] || message,
+        :error_message => message,
+        :backtrace     => caller,
+        :environment   => ENV.to_hash
+      }
+
+      data[:request] = {
+        :params => params
+      }
+
+      data[:environment] = clean_hoptoad_environment(ENV.to_hash.merge(request.env))
+      data[:environment][:RAILS_ENV] = Merb.env
+
+      data[:session] = {
+         :key         => session.instance_variable_get("@session_id"),
+         :data        => session.to_hash
+      }
+
+      send_to_hoptoad :notice => default_notice_options.merge(data)
+      true
     end
     
     def notify_hoptoad(request, session)
@@ -34,7 +62,7 @@ module HoptoadNotifier
         }
 
         data[:request] = {
-          :params => params[:original_params]
+          :params => params
         }
 
         data[:environment] = clean_hoptoad_environment(ENV.to_hash.merge(request.env))
@@ -42,7 +70,7 @@ module HoptoadNotifier
 
         data[:session] = {
            :key         => session.instance_variable_get("@session_id"),
-           :data        => session.instance_variable_get("@data")
+           :data        => session.to_hash
         }
 
         send_to_hoptoad :notice => default_notice_options.merge(data)

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: atmos-merb_hoptoad_notifier
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2.5
 platform: ruby
 authors: 
 - Corey Donohoe
+- Phil Darnowsky
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -08:00
+date: 2009-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: Merb plugin that provides hoptoad exception notification
-email: atmos@atmos.org
+email: phil@darnowsky.com
 executables: []
 
 extensions: []
@@ -31,6 +32,7 @@ files:
 - lib/merb_hoptoad_notifier
 - lib/merb_hoptoad_notifier/hoptoad_notifier.rb
 - lib/merb_hoptoad_notifier/merbtasks.rb
+- lib/merb_hoptoad_notifier/hoptoad_mixin.rb
 - lib/merb_hoptoad_notifier.rb
 - spec/fixtures
 - spec/fixtures/hoptoad.yml
@@ -38,7 +40,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/atmos
+homepage: http://github.com/phildarnowsky
 post_install_message: 
 rdoc_options: []