saucy 0.11.2 → 0.11.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.11.3
+
+Bugfix: Billing emails previously used an arbitrarily chosen transaction.
+Now they always use the most recent one.
+
 0.11.0
 
 Update Saucy to be compatible with Rails 3.1 which includes:

data/README.md

@@ -43,10 +43,17 @@ Personalizable emails such as trial expiration notice and activation encourageme
 
 If you have an account with Braintree with multiple merchant accounts you'll want to configure the merchant account for this application:
 
-Saucy::Configuration.merchant_account_id = 'your merchant account id'
+    Saucy::Configuration.merchant_account_id = 'your merchant account id'
 
 In addition, there are a number of strings such as application name, support url, automated emails, etc. that are provided and customized with i18n translations.  You can customize these in your app, and you can see what they are by looking at config/locales/en.yml in saucy.
 
+Saucy comes with a basic admin area, which has http auth protection.  This defaults to admin/admin:
+
+    Saucy::Configuration.admin_username = 'admin'
+    Saucy::Configuration.admin_password = 'admin'
+
+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 accounts become "activated" once an initial setup step is complete.

data/app/mailers/billing_mailer.rb

@@ -12,6 +12,7 @@ class BillingMailer < ActionMailer::Base
 
   def problem(account, transaction)
     @account = account
+    @transaction = transaction
     mail(:to       => account.customer.email,
          :subject  => I18n.t(:subject,
                              :scope   => [:saucy, :mailers, :billing_mailer, :problem],

data/app/views/billing_mailer/problem.html.erb

@@ -1,4 +1,4 @@
-<p>Unfortunately there was a problem processing your latest payment for your <%= @account.name -%> account on <%= t("app_name") %>.</p>
+<p>Unfortunately there was a problem processing your latest payment on <%= @transaction.created_at.to_s(:short_date) %> for your <%= @account.name -%> account on <%= t("app_name") %>.</p>
 
 <p>Some functionality of your <%= @account.name -%> account on <%= t("app_name") %> is now disabled.</p>
 

data/app/views/billing_mailer/problem.text.erb

@@ -1,4 +1,4 @@
-Unfortunately there was a problem processing your latest payment for your <%= @account.name -%> account on <%= t("app_name") %>.
+Unfortunately there was a problem processing your latest payment on <%= @transaction.created_at.to_s(:short_date) %> for your <%= @account.name -%> account on <%= t("app_name") %>.
 
 Some functionality of your <%= @account.name -%> account on <%= t("app_name") %> is now disabled.
 

data/lib/saucy/subscription.rb

@@ -65,6 +65,10 @@ module Saucy
         subscription_status == Braintree::Subscription::Status::PastDue
       end
 
+      def most_recent_transaction
+        subscription.transactions.sort_by(&:created_at).last
+      end
+
       private
 
       def within_limits_for?(new_plan)
@@ -228,9 +232,9 @@ module Saucy
           account.next_billing_date = account.subscription.next_billing_date
           account.save!
           if account.past_due?
-            BillingMailer.problem(account, account.subscription.transactions.last).deliver!
+            BillingMailer.problem(account, account.most_recent_transaction).deliver!
           else
-            BillingMailer.receipt(account, account.subscription.transactions.last).deliver!
+            BillingMailer.receipt(account, account.most_recent_transaction).deliver!
             Saucy::Notifications.notify_observers("billed", :account => account)
           end
         end

data/spec/mailers/billing_mailer_spec.rb

@@ -30,6 +30,11 @@ describe "with an account and transaction" do
     it "sets the problem mail reply-to to the support address" do
       subject.reply_to.should == [Saucy::Configuration.support_email_address]
     end
+
+    it "includes the attempted billing date" do
+      billing_date = account.subscription.transactions.first.created_at
+      subject.to_s.should include(billing_date.to_s(:short_date))
+    end
   end
 
   describe BillingMailer, "expiring trial" do

data/spec/models/subscription_spec.rb

@@ -339,6 +339,81 @@ describe Account, "with a paid subscription" do
     end
   end
 
+  context "with multiple historical transactions" do
+    let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
+
+    let!(:earlier_transaction_date) { 2.months.ago }
+    let!(:later_transaction_date)   { 1.month.ago }
+
+    def build_transaction(attributes)
+      common_transaction_attributes = {
+        :status => Braintree::Transaction::Status::Settled,
+        :subscription_id => subject.subscription_token
+      }
+
+      FakeBraintree.transaction = common_transaction_attributes.merge(attributes)
+      FakeBraintree.generated_transaction
+    end
+
+    before do
+      subscription["next_billing_date"] = 2.months.from_now
+    end
+
+    context "and a past due account" do
+      let(:earlier_transaction) {
+        build_transaction(:created_at => earlier_transaction_date, :status => Braintree::Transaction::Status::Failed)
+      }
+
+      let(:later_transaction) {
+        build_transaction(:created_at => later_transaction_date, :status => Braintree::Transaction::Status::Failed)
+      }
+
+      before do
+        subscription["status"] = Braintree::Subscription::Status::PastDue
+        subscription["transactions"] = [later_transaction, earlier_transaction]
+      end
+
+      it "receives a problem email with the correct transaction" do
+        Timecop.travel(subject.next_billing_date + 1.day) do
+          ActionMailer::Base.deliveries.clear
+          Account.update_subscriptions!
+
+          ActionMailer::Base.deliveries.any? do |email|
+            email.subject =~ /problem/i &&
+            email.to_s.include?(later_transaction_date.strftime("%x"))
+          end.should be
+        end
+      end
+    end
+
+    context "and an actively billed account" do
+      let(:earlier_transaction) {
+        build_transaction(:created_at => earlier_transaction_date, :status => Braintree::Transaction::Status::Settled)
+      }
+
+      let(:later_transaction) {
+        build_transaction(:created_at => later_transaction_date, :status => Braintree::Transaction::Status::Settled)
+      }
+
+      before do
+        subscription["status"] = Braintree::Subscription::Status::Active
+        subscription["transactions"] = [later_transaction, earlier_transaction]
+      end
+
+      it "receives a receipt email with the correct transaction for active accounts" do
+        Timecop.travel(subject.next_billing_date + 1.day) do
+          ActionMailer::Base.deliveries.clear
+          Account.update_subscriptions!
+
+          ActionMailer::Base.deliveries.any? do |email|
+            email.subject =~ /receipt/i &&
+            email.to_s.include?(later_transaction_date.strftime("%x"))
+          end.should be
+        end
+      end
+    end
+  end
+
   context "and an active subscription due 2 months from now" do
     let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 55
   prerelease: 
-  segments: 
-  - 0
-  - 11
-  - 2
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -20,118 +15,84 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 Z
+date: 2011-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 11
-        - 2
         version: 0.11.2
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: formtastic
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
         version: "1.2"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: railties
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: braintree
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
         version: 2.6.2
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sham_rack
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
         version: 1.3.3
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: aruba
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 2
-        - 6
         version: 0.2.6
   type: :development
+  prerelease: false
   version_requirements: *id007
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
@@ -326,7 +287,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1978592027769739368
       segments: 
       - 0
       version: "0"
@@ -335,9 +296,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []