saucy 0.11.5 → 0.12.0

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.12.0
+
+* Add a dependency on Airbrake for exception notification.
+* Notify Airbrake if an expiring/completed/unactivated notification fails, and
+  continue.
+
+If you use Saucy in a project without Airbrake, it will fail to deliver some
+account-related emails.
+
 0.11.5
 
 Trying to fix gemspec.

data/Gemfile

@@ -14,6 +14,7 @@ gem "sinatra"
 gem "sham_rack"
 gem "braintree"
 gem "timecop"
+gem "airbrake", "~> 3.0.4"
 
 # used by the rails app in cucumber
 gem "cucumber-rails", :require => false

data/Gemfile.lock

@@ -31,6 +31,9 @@ GEM
     activesupport (3.1.0)
       multi_json (~> 1.0)
     addressable (2.2.6)
+    airbrake (3.0.4)
+      activesupport
+      builder
     arel (2.2.1)
     aruba (0.4.6)
       bcat (>= 0.6.1)
@@ -184,6 +187,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  airbrake (~> 3.0.4)
   aruba
   bourne
   braintree

data/README.md

@@ -56,6 +56,8 @@ You definitely should change that in your config.
 
 There is a `saucy:daily` rake task which should be run on a regular basis to send receipts and payment processing problem emails.
 
+Saucy depends on having an Airbrake account to deliver exception notifications.
+
 Saucy accounts become "activated" once an initial setup step is complete.
 This could be creating the first bug for a bug tracker, or setting up a client
 gem for a server API. Once the application detects that the account is

data/lib/saucy/account.rb

@@ -1,3 +1,5 @@
+require 'airbrake'
+
 module Saucy
   module Account
     extend ActiveSupport::Concern
@@ -102,25 +104,37 @@ module Saucy
 
       def deliver_new_unactivated_notifications
         new_unactivated.each do |account|
-          BillingMailer.new_unactivated(account).deliver
-          account.asked_to_activate = true
-          account.save!
+          begin
+            BillingMailer.new_unactivated(account).deliver
+            account.asked_to_activate = true
+            account.save!
+          rescue Exception => e
+            Airbrake.notify(e)
+          end
         end
       end
 
       def deliver_expiring_trial_notifications
         trial_expiring.each do |account|
-          BillingMailer.expiring_trial(account).deliver
-          account.notified_of_expiration = true
-          account.save!
+          begin
+            BillingMailer.expiring_trial(account).deliver
+            account.notified_of_expiration = true
+            account.save!
+          rescue Exception => e
+            Airbrake.notify(e)
+          end
         end
       end
 
       def deliver_completed_trial_notifications
         trial_completed.each do |account|
-          BillingMailer.completed_trial(account).deliver
-          account.notified_of_completed_trial = true
-          account.save!
+          begin
+            BillingMailer.completed_trial(account).deliver
+            account.notified_of_completed_trial = true
+            account.save!
+          rescue Exception => e
+            Airbrake.notify(e)
+          end
         end
       end
 

data/spec/models/account_spec.rb

@@ -133,87 +133,138 @@ describe Account do
     account.should_not be_expired
   end
 
-  it "sends notifications for expiring accounts" do
-    trial   = Factory(:plan, :trial => true)
-    forever = Factory(:plan, :trial => false)
-
-    created_23_days  = Factory(:account, :plan => trial, :created_at => 23.days.ago)
-    expires_7_days   = Factory(:account, :plan => trial, :created_at => 1.day.ago)
-    expiring         = [created_23_days, expires_7_days]
-    forever          = Factory(:account, :plan => forever, :created_at => 23.days.ago)
-    new_trial        = Factory(:account, :plan => trial, :created_at => 22.days.ago)
-    already_notified = Factory(:account, :plan                   => trial,
-                                         :created_at             => 24.days.ago,
-                                         :notified_of_expiration => true)
+  context "with expiring accounts" do
+    before do
+      trial   = Factory(:plan, :trial => true)
+      forever = Factory(:plan, :trial => false)
+
+      created_23_days  = Factory(:account, :plan => trial, :created_at => 23.days.ago)
+      expires_7_days   = Factory(:account, :plan => trial, :created_at => 1.day.ago)
+      @expiring        = [created_23_days, expires_7_days]
+      forever          = Factory(:account, :plan => forever, :created_at => 23.days.ago)
+      new_trial        = Factory(:account, :plan => trial, :created_at => 22.days.ago)
+      already_notified = Factory(:account, :plan                   => trial,
+                                           :created_at             => 24.days.ago,
+                                           :notified_of_expiration => true)
+
+      expires_7_days.trial_expires_at = 7.days.from_now
+      expires_7_days.save!
+
+      @mail = stub('mail', :deliver => true)
+      BillingMailer.stubs(:expiring_trial => @mail)
+      Airbrake.stubs(:notify => true)
+    end
 
-    expires_7_days.trial_expires_at = 7.days.from_now
-    expires_7_days.save!
+    it "sends notifications for expiring accounts" do
+      Account.deliver_expiring_trial_notifications
 
-    mail = stub('mail', :deliver => true)
-    BillingMailer.stubs(:expiring_trial => mail)
+      @expiring.each do |account|
+        BillingMailer.should have_received(:expiring_trial).with(account)
+      end
 
-    Account.deliver_expiring_trial_notifications
+      @mail.should have_received(:deliver).twice
 
-    expiring.each do |account|
-      BillingMailer.should have_received(:expiring_trial).with(account)
+      @expiring.each { |account| account.reload.should be_notified_of_expiration }
     end
 
-    mail.should have_received(:deliver).twice
+    it "notifies Airbrake if expiring account notifications fail" do
+      @mail.stubs(:deliver).raises(RuntimeError).then.returns(true)
+      Account.deliver_expiring_trial_notifications
+      Airbrake.should have_received(:notify).once()
+    end
 
-    expiring.each { |account| account.reload.should be_notified_of_expiration }
+    it "delivers the rest of the emails even if one fails" do
+      @mail.stubs(:deliver).raises(RuntimeError)
+      Account.deliver_expiring_trial_notifications
+      @mail.should have_received(:deliver).twice()
+    end
   end
 
-  it "sends notifications for completed trials" do
-    trial   = Factory(:plan, :trial => true)
-    forever = Factory(:plan, :trial => false)
+  context "with completed trials" do
+    before do
+      trial   = Factory(:plan, :trial => true)
+      forever = Factory(:plan, :trial => false)
 
-    unexpired_trial          = Factory(:account, :plan => trial, :created_at => 29.days.ago)
-    unnotified_expired_trial = Factory(:account, :plan => trial, :created_at => 31.days.ago)
-    expiring_now             = Factory(:account, :plan => trial, :created_at => 1.day.ago)
-    notified_expired_trial   = Factory(:account, :plan                         => trial,
-                                                 :created_at                   => 31.days.ago,
-                                                 :notified_of_completed_trial  => true)
-    forever                  = Factory(:account, :plan => forever, :created_at => 31.days.ago)
+      unexpired_trial          = Factory(:account, :plan => trial, :created_at => 29.days.ago)
+      unnotified_expired_trial = Factory(:account, :plan => trial, :created_at => 31.days.ago)
+      expiring_now             = Factory(:account, :plan => trial, :created_at => 1.day.ago)
+      notified_expired_trial   = Factory(:account, :plan                         => trial,
+                                                   :created_at                   => 31.days.ago,
+                                                   :notified_of_completed_trial  => true)
+      forever                  = Factory(:account, :plan => forever, :created_at => 31.days.ago)
 
-    expiring_now.trial_expires_at = 1.day.ago
-    expiring_now.save!
+      expiring_now.trial_expires_at = 1.day.ago
+      expiring_now.save!
 
-    requires_notification = [unnotified_expired_trial, expiring_now]
+      @requires_notification = [unnotified_expired_trial, expiring_now]
+
+      @mail = stub('mail', :deliver => true)
+      BillingMailer.stubs(:completed_trial => @mail)
+      Airbrake.stubs(:notify => true)
+    end
 
-    mail = stub('mail', :deliver => true)
-    BillingMailer.stubs(:completed_trial => mail)
+    it "sends notifications for completed trials" do
+      Account.deliver_completed_trial_notifications
 
-    Account.deliver_completed_trial_notifications
+      @requires_notification.each do |account|
+        BillingMailer.should have_received(:completed_trial).with(account)
+      end
 
-    requires_notification.each do |account|
-      BillingMailer.should have_received(:completed_trial).with(account)
+      @mail.should have_received(:deliver).twice
+
+      @requires_notification.each { |account| account.reload.should be_notified_of_completed_trial }
     end
 
-    mail.should have_received(:deliver).twice
+    it "notifies Airbrake if completed trial notifications fail" do
+      @mail.stubs(:deliver).raises(RuntimeError).then.returns(true)
+      Account.deliver_completed_trial_notifications
+      Airbrake.should have_received(:notify).once()
+    end
 
-    requires_notification.each { |account| account.reload.should be_notified_of_completed_trial }
+    it "delivers the rest of the emails even if one fails" do
+      @mail.stubs(:deliver).raises(RuntimeError)
+      Account.deliver_completed_trial_notifications
+      @mail.should have_received(:deliver).twice()
+    end
   end
 
-  it "sends notifications for unactivated accounts after 7 days" do
-    unactivated = [Factory(:account, :created_at => 7.days.ago),
-                   Factory(:account, :created_at => 8.days.ago)]
-    fresh = Factory(:account, :created_at => 6.days.ago)
-    activated = Factory(:account, :created_at => 9.days.ago, :activated => true)
-    already_notified = Factory(:account, :created_at        => 9.days.ago,
-                                         :asked_to_activate => true)
+  context "with unactivated accounts" do
+    before do
+      @unactivated = [Factory(:account, :created_at => 7.days.ago),
+                      Factory(:account, :created_at => 8.days.ago)]
+      fresh = Factory(:account, :created_at => 6.days.ago)
+      activated = Factory(:account, :created_at => 9.days.ago, :activated => true)
+      already_notified = Factory(:account, :created_at        => 9.days.ago,
+                                           :asked_to_activate => true)
+
+      @mail = stub('mail', :deliver => true)
+      BillingMailer.stubs(:new_unactivated => @mail)
+      Airbrake.stubs(:notify => true)
+    end
 
-    mail = stub('mail', :deliver => true)
-    BillingMailer.stubs(:new_unactivated => mail)
+    it "sends notifications after 7 days" do
+      Account.deliver_new_unactivated_notifications
 
-    Account.deliver_new_unactivated_notifications
+      @unactivated.each do |account|
+        BillingMailer.should have_received(:new_unactivated).with(account)
+      end
 
-    unactivated.each do |account|
-      BillingMailer.should have_received(:new_unactivated).with(account)
+      @mail.should have_received(:deliver).twice
+
+      @unactivated.each { |account| account.reload.should be_asked_to_activate }
     end
 
-    mail.should have_received(:deliver).twice
+    it "notifies Airbrake if completed trial notifications fail" do
+      @mail.stubs(:deliver).raises(RuntimeError).then.returns(true)
+      Account.deliver_new_unactivated_notifications
+      Airbrake.should have_received(:notify).once()
+    end
 
-    unactivated.each { |account| account.reload.should be_asked_to_activate }
+    it "delivers the rest of the emails even if one fails" do
+      @mail.stubs(:deliver).raises(RuntimeError)
+      Account.deliver_new_unactivated_notifications
+      @mail.should have_received(:deliver).twice()
+    end
   end
   
   it "searches records for keyword and name" do

metadata

@@ -2,7 +2,7 @@
 name: saucy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2011-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
@@ -84,16 +84,27 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: airbrake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.4
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.2.6
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []