whenauser 0.5.0 → 0.6.0

data/README.md

@@ -36,7 +36,7 @@ You should create two incoming channels (event streams) in WhenAUser, and config
 Using girl_friday for asynchronous communication and persistence
 -----------------
 
-By default this gem sends a batch of events to the WhenAUser service synchronously, at the end of each request to your application. This means that each request to your app will be slowed down by the time it takes to do that communication. In general, this is not going to be acceptable. To avoid this delay, WhenAUser supports the use of the [girl_friday](https://github.com/mperham/girl_friday) gem, which you can enable in your whenauser.rb file:
+By default this gem sends a batch of events to the WhenAUser service synchronously, at the end of each request to your application. This means that each request to your app will be slowed down by the time it takes to do that communication. While this is fine for development or for low-volume sites, for those who wish to avoid this delay WhenAUser supports the use of the [girl_friday](https://github.com/mperham/girl_friday) gem, which you can enable in your whenauser.rb file:
 
     queue WhenAUser::GirlFridayQueue
 

data/lib/whenauser/exceptions.rb

@@ -29,6 +29,7 @@ module WhenAUser
       begin
         @app.call(env)
       rescue Exception => exception
+        env['whenauser.exception'] = exception
         send_event_now event(env, exception), @options[:token] unless should_be_ignored(env, exception)
         raise exception
       end
@@ -55,24 +56,15 @@ module WhenAUser
       false
     end
 
-    def clean_backtrace(exception)
-      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
-        Rails.backtrace_cleaner.send(:filter, exception.backtrace)
-      else
-        exception.backtrace
-      end
-    end
-
     def event(env, exception)
       request = ActionDispatch::Request.new(env)
       backtrace = clean_backtrace(exception)
-      actor = backtrace.first.match(/^(.*:.*):/)[1] rescue @app.to_s
       event = {
-        :_actor => actor,
+        :_actor => actor_for_exception(exception),
         :_domain => 'exception',
         :_name => exception.class.to_s,
         :message => exception.to_s,
-        :backtrace => backtrace.join("; "),
+        :backtrace => backtrace.join("\n"),
         :request_url => request.url,
         :request_method => request.request_method,
         :params => request.params.except(*WhenAUser.filter_parameters),

data/lib/whenauser/helpers.rb

@@ -18,5 +18,19 @@ module WhenAUser
     rescue
       nil
     end
+
+    def clean_backtrace(exception)
+      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
+        Rails.backtrace_cleaner.send(:filter, exception.backtrace)
+      else
+        exception.backtrace
+      end
+    end
+
+    def actor_for_exception(exception)
+      backtrace = clean_backtrace(exception)
+      fileline = backtrace.first.match(/^(.*:.*):/)[1] rescue @app.to_s
+      "#{exception.class.to_s}:#{fileline}"
+    end
   end
 end

data/lib/whenauser/pageviews.rb

@@ -16,6 +16,7 @@ module WhenAUser
     end
 
     def call(env)
+      request = ActionDispatch::Request.new(env)
       before = Time.now
       status, headers, response = @app.call(env)
       [status, headers, response]
@@ -24,7 +25,6 @@ module WhenAUser
       raise e
     ensure
       after = Time.now
-      request = ActionDispatch::Request.new(env)
       WhenAUser.send_event event(env, request, status, after - before) unless should_be_ignored(env, request)
     end
 
@@ -45,7 +45,7 @@ module WhenAUser
       false
     end
 
-    def event_name(request)
+    def page_event_name(request)
       if (params = request.params)['controller']
         "#{params['controller']}##{params['action']}"
       else
@@ -57,8 +57,8 @@ module WhenAUser
       actor = current_user(env) || 'anonymous'
       event = {
         :_actor => actor,
-        :_domain => 'pageview',
-        :_name => event_name(request),
+        :_domain => (status >= 400) ? 'pageerror' : 'pageview',
+        :_name => page_event_name(request),
         :request_url => request.url,
         :request_method => request.request_method,
         :params => request.params.except(*WhenAUser.filter_parameters),
@@ -66,6 +66,10 @@ module WhenAUser
         :status => status,
         :duration => "%.2f" % (duration * 1000)
       }
+      if exception = env['whenauser.exception']
+        event.merge!(:error => actor_for_exception(exception))
+        event.merge!(:message => exception.to_s)
+      end
       event.merge!(:referer_url => request.referer) if request.referer
       event.merge!(:rails_env => Rails.env) if defined?(Rails)
       event.merge!(@options[:custom_data].call(env))

data/lib/whenauser/version.rb

@@ -1,3 +1,3 @@
 module WhenAUser
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenauser
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport