saucy 0.11.3 → 0.11.5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.11.5
+
+Trying to fix gemspec.
+
+0.11.4
+
+Bugfix: Billing problem mailer has no need for a transaction.
+Fix broken test suite.
+
 0.11.3
 
 Bugfix: Billing emails previously used an arbitrarily chosen transaction.

data/app/mailers/billing_mailer.rb

@@ -10,9 +10,8 @@ class BillingMailer < ActionMailer::Base
          :from     => Saucy::Configuration.support_email_address)
   end
 
-  def problem(account, transaction)
+  def problem(account)
     @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 on <%= @transaction.created_at.to_s(:short_date) %> for your <%= @account.name -%> account on <%= t("app_name") %>.</p>
+<p>Unfortunately there was a problem processing your latest payment 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 on <%= @transaction.created_at.to_s(:short_date) %> for your <%= @account.name -%> account on <%= t("app_name") %>.
+Unfortunately there was a problem processing your latest payment 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

@@ -232,7 +232,7 @@ module Saucy
           account.next_billing_date = account.subscription.next_billing_date
           account.save!
           if account.past_due?
-            BillingMailer.problem(account, account.most_recent_transaction).deliver!
+            BillingMailer.problem(account).deliver!
           else
             BillingMailer.receipt(account, account.most_recent_transaction).deliver!
             Saucy::Notifications.notify_observers("billed", :account => account)

data/spec/mailers/billing_mailer_spec.rb

@@ -21,7 +21,7 @@ describe "with an account and transaction" do
   end
 
   describe BillingMailer, "problem" do
-    subject { BillingMailer.problem(account, account.subscription.transactions.first) }
+    subject { BillingMailer.problem(account) }
 
     it "sends the problem mail from the support address" do
       subject.from.should == [Saucy::Configuration.support_email_address]
@@ -30,11 +30,6 @@ 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,7 +339,7 @@ describe Account, "with a paid subscription" do
     end
   end
 
-  context "with multiple historical transactions" do
+  context "with multiple historical transactions and an active account" do
     let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
 
     let!(:earlier_transaction_date) { 2.months.ago }
@@ -357,48 +357,11 @@ describe Account, "with a paid subscription" do
 
     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
+      subscription["status"] = Braintree::Subscription::Status::Active
+      subscription["transactions"] = [
+        build_transaction(:created_at => later_transaction_date),
+        build_transaction(:created_at => earlier_transaction_date)
+      ]
 
       it "receives a receipt email with the correct transaction for active accounts" do
         Timecop.travel(subject.next_billing_date + 1.day) do
@@ -407,7 +370,7 @@ describe Account, "with a paid subscription" do
 
           ActionMailer::Base.deliveries.any? do |email|
             email.subject =~ /receipt/i &&
-            email.to_s.include?(later_transaction_date.strftime("%x"))
+              email.to_s.include?(later_transaction_date.strftime("%x"))
           end.should be
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: saucy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.11.3
+  version: 0.11.5
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -26,10 +27,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         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: 
@@ -37,10 +38,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         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: 
@@ -48,10 +49,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         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: 
@@ -59,10 +60,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         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: 
@@ -70,10 +71,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         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: 
@@ -81,10 +82,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         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: 
@@ -92,7 +93,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         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
@@ -287,9 +287,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1978592027769739368
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false