tartarus 2.2 → 2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tartarus (2.0.4)
+    tartarus (2.3)
       json
       will_paginate
 

data/Rakefile

@@ -13,7 +13,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION')
     version = File.read('VERSION')
@@ -26,3 +26,9 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+desc 'Setup spec env for running tests'
+task 'spec:setup' do
+  t = `cd spec/rails_app && bundle exec rake db:migrate && bundle exec rake db:test:clone`
+  puts "Setup spec env\n#{t}"
+end

data/lib/tartarus.rb

@@ -5,8 +5,12 @@ class Tartarus
   module Notifiers; end
 
   class << self
-    def configuration
-      @cached_configuration ||= YAML.load_file("#{Rails.root}/config/exceptions.yml")[Rails.env]
+    def configuration( file = nil )
+      if defined?(Rails)
+        @cached_configuration ||= YAML.load_file(file || "#{Rails.root}/config/exceptions.yml" )[Rails.env]
+      else
+        @cached_configuration ||= YAML.load_file(file)
+      end
     end
 
     def logger_class
@@ -26,5 +30,5 @@ end
 require 'tartarus/rack'
 require 'tartarus/logger'
 require 'tartarus/notifiers/mail'
-require 'tartarus/railtie'
+require 'tartarus/railtie' if defined?(Rails)
 

data/lib/tartarus/logger.rb

@@ -21,16 +21,19 @@ module Tartarus::Logger
   module ClassMethods
     def log(env, exception)
       logged = create do |logged_exception|
-        controller = env['action_controller.instance']
-        group_id = "#{exception.class.name}#{exception.message.gsub(/(#<.+):(.+)(>)/,'\1\3')}#{controller.controller_path}#{controller.action_name}" 
+        if env['action_controller.instance']
+          controller = env['action_controller.instance']
+          group_id = "#{exception.class.name}#{exception.message.gsub(/(#<.+):(.+)(>)/,'\1\3')}#{controller.controller_path}#{controller.action_name}" 
+        end
 
         logged_exception.exception_class = exception.class.name
-        logged_exception.controller_path = controller.controller_path
-        logged_exception.action_name = controller.action_name
         logged_exception.message = exception.message
         logged_exception.backtrace = exception.backtrace * "\n"
-        logged_exception.request = self.normalize_request_data(env)
-        logged_exception.group_id = Digest::SHA1.hexdigest(group_id)
+
+        logged_exception.request = self.normalize_request_data(env) if env['action_controller.instance']
+        logged_exception.controller_path = controller.controller_path if controller
+        logged_exception.action_name = controller.action_name if controller
+        logged_exception.group_id = Digest::SHA1.hexdigest(group_id) if group_id
       end
       logged.handle_notifications
       logged

data/spec/rails_app/Gemfile

@@ -21,7 +21,7 @@ group :assets do
 end
 
 gem 'jquery-rails'
-gem 'tartarus', :path => '~/Projects/tartarus'
+gem 'tartarus', :path => '../..'
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'

data/spec/rails_app/Gemfile.lock

@@ -1,5 +1,5 @@
 PATH
-  remote: ~/Projects/tartarus
+  remote: ../..
   specs:
     tartarus (2.0.4)
       json

data/tartarus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{tartarus}
-  s.version = "2.2"
+  s.version = "2.3"
   s.platform    = Gem::Platform::RUBY 
   
   s.authors = ["Daniel Insley"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tartarus
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate