@@ -21,12 +21,19 @@ class JsLogger::LoggingController < ApplicationController JsLogger::Mailer.filter_messages || [] end + def additional_data_proc + JsLogger::Mailer.additional_data || proc {} + end + def log_params - %w(message line url user_agent backtrace).inject({}) do |hsh, key| + base = %w(message line url user_agent backtrace).inject({}) do |hsh, key| val = params[key] hsh[key.to_sym] = val if val.present? hsh end + + base.merge({:additional_data => additional_data_proc.call(self)}) + base end end app/controllers/js_logger/logging_controller.rb @@ -7,6 +7,8 @@ class JsLogger::LogEntry < ActiveRecord::Base before_save :generate_log_hash + attr_accessor :additional_data + protected def generate_log_hash app/models/js_logger/log_entry.rb @@ -1,6 +1,7 @@ class JsLogger::Mailer < ActionMailer::Base cattr_accessor :mail_to cattr_accessor :filter_messages + cattr_accessor :additional_data def new_log_entry(log_entry) subject "JSLogger Error \"#{log_entry.message}\"" app/models/js_logger/mailer.rb @@ -4,6 +4,7 @@ Log Message: <%= @log_entry.message %> URL : <%= @log_entry.url %> Line: : <%= @log_entry.line %> User Agent : <%= @log_entry.user_agent %> +Data : <%= @log_entry.additional_data.inspect %> Backtrace : app/views/js_logger/mailer/new_log_entry.erb @@ -4,6 +4,7 @@ Log Message: something happened URL : http://google.com Line: : 20 User Agent : Ruby +Data : "foo" Backtrace : test/fixtures/js_logger/mailer/new_log_entry @@ -1,4 +1,4 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../../test_helper' class JsLogger::LoggingControllerTest < ActionController::TestCase tests JsLogger::LoggingController @@ -24,6 +24,19 @@ class JsLogger::LoggingControllerTest < ActionController::TestCase get :create, valid_params end + test "should add additional data when configured" do + begin + additional_data_proc = proc do |controller| + end + JsLogger::Mailer.additional_data = additional_data_proc + + additional_data_proc.expects(:call).once + get :create, valid_params + ensure + JsLogger::Mailer.additional_data = nil + end + end + test "should send an email when the message didnt matche any of JsLogger::Mailer.filter_messages" do begin test/functional/js_logger/logging_controller_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../../test_helper' class JsLogger::LogEntryTest < ActiveSupport::TestCase should_validate_presence_of :message test/unit/js_logger/log_entry_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../../test_helper' class JsLogger::MailerTest < ActionMailer::TestCase test "new_log_entry" do @@ -8,7 +8,8 @@ class JsLogger::MailerTest < ActionMailer::TestCase :line => "20", :url => "http://google.com", :user_agent => "Ruby", - :backtrace => "foo.js:12\nbar.js:1" + :backtrace => "foo.js:12\nbar.js:1", + :additional_data => "foo" ) JsLogger::Mailer.mail_to = "me@samedi.de" test/unit/js_logger/mailer_test.rb a6bb68c6340f63088cf82b2b59c433aa97266a73 Michael Siebert siebertm85@googlemail.com http://github.com/siebertm/js_logger/commit/c8c34a45ab346574ee435584b64a9259ad86ee51 c8c34a45ab346574ee435584b64a9259ad86ee51 2009-10-18T06:57:57-07:00 2009-10-18T06:57:57-07:00 add support for an additional_data proc to add some data to the mail 2b5ec4a176c33027d72cc7e71466b13d9983389f Michael Siebert siebertm85@googlemail.com