tartarus 2.0.1 → 2.0.3

data/.rvmrc

@@ -1,2 +1,9 @@
-rvm_install_on_use_flag=1
-rvm ruby-1.8.7-p302@tartarus
+export rvm_gemset_create_on_use_flag=1
+rvm_gemset_create_on_use_flag=1
+rvm ruby-1.8.7-p334@tartarus
+
+if ! command -v bundle ; then
+  printf "The rubygem 'bundler' is not installed, installing it now.\n"
+  gem install bundler
+fi
+

data/Gemfile.lock

@@ -101,4 +101,3 @@ DEPENDENCIES
   rspec-rails (~> 2.3.1)
   sqlite3-ruby
   tartarus!
-  will_paginate (~> 3.0.pre2)

data/Rakefile

@@ -9,10 +9,6 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ['--color', '--format progress']
   spec.pattern = 'spec/**/*_spec.rb'
-#  spec.rcov = true
-#  spec.rcov_opts = lambda do
-#    IO.readlines("spec/rcov.opts").map { |l| l.chomp.split " " }.flatten
-#  end
 end
 
 task :default => :spec

data/lib/tartarus/logger.rb

@@ -15,7 +15,7 @@ module Tartarus::Logger
     def handle_notifications
       notification_address =  Tartarus.configuration['notification_address']
       return unless notification_address.present? 
-      Tartarus::Notifiers::Mail.deliver_notification( notification_address, self ) if group_count == 1 or (group_count%Tartarus.configuration['notification_threshold']).zero?
+      Tartarus::Notifiers::Mail.notification( notification_address, self ).deliver if group_count == 1 or (group_count%Tartarus.configuration['notification_threshold']).zero?
     end
 
     def json_serialize    

data/lib/tartarus/version.rb

@@ -1,3 +1,3 @@
 module Tartarus 
-  VERSION = "2.0.1"  
+  VERSION = "2.0.3"  
 end  

data/spec/rails_app/Gemfile.lock

@@ -2,6 +2,7 @@ PATH
   remote: ../../
   specs:
     tartarus (2.0.0)
+      json (~> 1.4.6)
       will_paginate (~> 3.0.pre2)
 
 GEM
@@ -40,6 +41,7 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
+    json (1.4.6)
     mail (2.2.13)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)

data/spec/tartarus/logger_spec.rb

@@ -39,32 +39,35 @@ describe Tartarus::Logger do
   end
   
   describe '#handle_notifications' do 
-    before(:each) do 
+    before(:each) do
+      @notification = stub('notification', :deliver => true)
       @logged_exception = LoggedException.create(:request => {})
       Tartarus.stub(:configuration).and_return({ 'notification_threshold' => 10, 'notification_address' => 'test@example.com', 'enabled' => true, "logger_class"=>"LoggedException" })
     end
     
     it 'should return and not deliver notification if there is no address present' do
       Tartarus.should_receive(:configuration).and_return({ 'enabled' => true, "logger_class"=>"LoggedException" })
-      Tartarus::Notifiers::Mail.should_receive( :deliver_notification ).never
+      Tartarus::Notifiers::Mail.should_receive( :notification ).never
 
       @logged_exception.handle_notifications
     end
 
     it 'should send email if there is an address present and the count matches the threshold' do 
-      Tartarus::Notifiers::Mail.should_receive( :deliver_notification ).with( 'test@example.com', @logged_exception )
+      Tartarus::Notifiers::Mail.should_receive( :notification ).with( 'test@example.com', @logged_exception ).and_return(@notification)
+      @notification.should_receive(:deliver)
       @logged_exception.stub( :group_count ).and_return( 20 )
       @logged_exception.handle_notifications
     end
     
     it 'should send email if there is an address present and it is the first exception in a group' do 
-      Tartarus::Notifiers::Mail.should_receive( :deliver_notification ).with( 'test@example.com', @logged_exception )
+      Tartarus::Notifiers::Mail.should_receive( :notification ).with( 'test@example.com', @logged_exception ).and_return(@notification)
+      @notification.should_receive(:deliver)
       @logged_exception.stub( :group_count ).and_return( 1 )
       @logged_exception.handle_notifications
     end
     
     it 'should not send email if there is an address present and the count does not match the threshold' do 
-      Tartarus::Notifiers::Mail.should_receive( :deliver_notification ).never
+      Tartarus::Notifiers::Mail.should_receive( :notification ).never
       @logged_exception.stub( :group_count ).and_return( 22 )
       @logged_exception.handle_notifications
     end

data/tartarus.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tartarus
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Daniel Insley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -08:00
+date: 2011-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1876988247
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id001
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Exception Logging for Rails