saucy 0.10.7 → 0.10.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.10.8
+
+Backport merchant account TZ fixes from 0.13.1
+
 0.10.7
 
 Fix for daylight savings time issue with coupons

data/README.md

@@ -53,7 +53,6 @@ followup emails being sent to users that have already set up their accounts.
 It will also send an "Activated" event to Kissmetrics through Saucy-kiss, if
 Saucy-kiss is installed.
 
-
 Development environment
 -----------------------
 
@@ -123,3 +122,9 @@ Make sure you don't do this in ApplicationController:
 
 Saucy's internal controllers don't skip any before filters.
 
+If your billing merchant account is not configured to run in the Eastern
+timezone, you can override the timezone in Saucy configuration as
+merchant_account_time_zone.  You'll want this set accurately so that the daily
+cronjob which syncs the Braintree subscription billing cycle dates runs for the
+correct accounts.  If this is set incorrectly, you will occasionally see
+duplicate receipt emails being delivered.

data/lib/saucy/configuration.rb

@@ -8,6 +8,7 @@ module Saucy
     cattr_accessor :merchant_account_id
     cattr_accessor :admin_username
     cattr_accessor :admin_password
+    cattr_accessor :merchant_account_time_zone
 
     def initialize
       @@manager_email_address = 'manager@example.com'
@@ -15,6 +16,7 @@ module Saucy
       @@layouts               = Layouts.new
       @@admin_username        = 'admin'
       @@admin_password        = 'admin'
+      @@merchant_account_time_zone = 'Eastern Time (US & Canada)'
     end
 
   end

data/lib/saucy/engine.rb

@@ -31,7 +31,10 @@ module Saucy
       ActionView::Base.send :include, CouponsHelper
     end
 
-    {:short_date => "%x"}.each do |k, v|
+    {
+      :short_date => "%x",
+      :braintree_date => "%Y-%m-%d"
+    }.each do |k, v|
       Time::DATE_FORMATS[k] = v
     end
 

data/lib/saucy/fake_braintree.rb

@@ -102,7 +102,7 @@ ShamRack.at("www.braintreegateway.com", 443).sinatra do
     subscription["transactions"] = []
     subscription["add_ons"] = []
     subscription["discounts"] = []
-    subscription["next_billing_date"] = 1.month.from_now
+    subscription["next_billing_date"] = 1.month.from_now.to_s(:braintree_date)
     subscription["status"] = Braintree::Subscription::Status::Active
     FakeBraintree.subscriptions[subscription["id"]] = subscription
     [201, { "Content-Encoding" => "gzip" }, ActiveSupport::Gzip.compress(subscription.to_xml(:root => 'subscription'))]

data/lib/saucy/subscription.rb

@@ -88,7 +88,8 @@ module Saucy
       def update_subscription_cache!
         flush_cache :subscription
         update_attribute(:subscription_status, subscription.status)
-        update_attribute(:next_billing_date, subscription.next_billing_date)
+        update_attribute(:next_billing_date, Time.parse(subscription.next_billing_date).in_time_zone(
+          Saucy::Configuration.merchant_account_time_zone))
       end
 
       def changing_plan?(attributes)
@@ -198,7 +199,8 @@ module Saucy
         result = Braintree::Subscription.create(subscription_attributes)
         if result.success?
           self.subscription_token = result.subscription.id
-          self.next_billing_date = result.subscription.next_billing_date
+          self.next_billing_date = Time.parse(result.subscription.next_billing_date).in_time_zone(
+            Saucy::Configuration.merchant_account_time_zone)
           self.subscription_status = result.subscription.status
         else
           false
@@ -226,6 +228,8 @@ module Saucy
         recently_billed.each do |account|
           account.subscription_status = account.subscription.status
           account.next_billing_date = account.subscription.next_billing_date
+          account.next_billing_date = Time.parse(account.subscription.next_billing_date).in_time_zone(
+            Saucy::Configuration.merchant_account_time_zone)
           account.save!
           if account.past_due?
             BillingMailer.problem(account, account.subscription.transactions.last).deliver!

data/spec/environment.rb

@@ -49,8 +49,8 @@ end
 
 Testapp::Application.initialize!
 
-require "lib/generators/saucy/features/templates/factories"
-require "lib/generators/saucy/install/templates/create_saucy_tables"
+require "./lib/generators/saucy/features/templates/factories"
+require "./lib/generators/saucy/install/templates/create_saucy_tables"
 
 class ClearanceCreateUsers < ActiveRecord::Migration
   def self.up

data/spec/models/subscription_spec.rb

@@ -122,8 +122,9 @@ describe Account, "with a paid plan" do
     subject.subscription.should_not be_nil
   end
 
-  it "has a next_billing_date" do
-    subject.next_billing_date.should_not be_nil
+  it "has a next_billing_date in the merchant account timezone" do
+    Time.stubs(:now => Time.parse("2011-09-16 02:00 -0000"))
+    subject.next_billing_date.should == Time.parse("Sun, 16 Oct 2011 00:00:00 EDT -04:00")
   end
 
   it "has an active subscription status" do
@@ -295,14 +296,16 @@ describe Account, "with a paid subscription" do
   end
 
   it "gets marked as past due and updates its next_billing_date when subscriptions are updated and it has been rejected by the gateway" do
+    next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = 2.months.from_now
+    subscription["next_billing_date"] = next_billing_date_string
 
     Timecop.travel(subject.next_billing_date + 1.day) do
       Account.update_subscriptions!
       subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-      subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
+      subject.next_billing_date.should == Time.parse(next_billing_date_string).in_time_zone(
+        Saucy::Configuration.merchant_account_time_zone)
       subject.past_due?.should be
     end
   end
@@ -312,7 +315,7 @@ describe Account, "with a paid subscription" do
 
     before do
       subscription["status"] = Braintree::Subscription::Status::PastDue
-      subscription["next_billing_date"] = 2.months.from_now
+      subscription["next_billing_date"] = 2.months.from_now.to_s(:braintree_date)
       FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
                                     :subscription_id => subject.subscription_token }
       subscription["transactions"] = [FakeBraintree.generated_transaction]
@@ -339,12 +342,49 @@ describe Account, "with a paid subscription" do
     end
   end
 
+  context "with a merchant account timezone different from the system timezone" do
+    def build_subscription(account)
+      subscription = FakeBraintree.subscriptions[account.subscription_token]
+      subscription["status"] = Braintree::Subscription::Status::Active
+      subscription["transactions"] = [FakeBraintree.generated_transaction]
+      subscription
+    end
+
+    before do
+      Saucy::Configuration.merchant_account_time_zone = "Eastern Time (US & Canada)"
+      subject.next_billing_date = "2011-08-15"
+      subject.save!
+
+      subscription = build_subscription(subject)
+      subscription["next_billing_date"] = "2011-09-15"
+
+      Time.stubs(:now => Time.parse("2011-08-16 02:00 -0000"))
+      Account.update_subscriptions!
+      ActionMailer::Base.deliveries.clear
+
+      subject.reload.next_billing_date.should == Time.parse("2011-09-15 00:00 -0400")
+    end
+
+    it "does not update accounts if their billing date hasn't elapsed from the merchant account's perspective" do
+      Time.stubs(:now => Time.parse("2011-09-15 02:00 -0000"))
+      Account.update_subscriptions!
+      ActionMailer::Base.deliveries.should be_empty
+    end
+
+    it "does update accounts if their billing date has elapsed from the merchant account's perspective" do
+      Time.stubs(:now => Time.parse("2011-09-16 02:00 -0000"))
+      Account.update_subscriptions!
+      ActionMailer::Base.deliveries.should_not be_empty
+    end
+  end
+
   context "and an active subscription due 2 months from now" do
     let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
+    let(:next_billing_date_string) { 2.months.from_now.to_s(:braintree_date) }
 
     before do
       subscription["status"] = Braintree::Subscription::Status::Active
-      subscription["next_billing_date"] = 2.months.from_now
+      subscription["next_billing_date"] = next_billing_date_string
       FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
                                     :subscription_id => subject.subscription_token }
       subscription["transactions"] = [FakeBraintree.generated_transaction]
@@ -354,7 +394,8 @@ describe Account, "with a paid subscription" do
       Timecop.travel(subject.next_billing_date + 1.day) do
         Account.update_subscriptions!
         subject.reload.subscription_status.should == Braintree::Subscription::Status::Active
-        subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
+        subject.next_billing_date.should == Time.parse(next_billing_date_string).in_time_zone(
+          Saucy::Configuration.merchant_account_time_zone)
       end
     end
 
@@ -415,7 +456,7 @@ describe Account, "with a paid subscription that is past due" do
   before do
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = 2.months.from_now
+    subscription["next_billing_date"] = 2.months.from_now.to_s(:braintree_date)
 
     Timecop.travel(subject.next_billing_date + 1.day) do
       Account.update_subscriptions!
@@ -424,9 +465,10 @@ describe Account, "with a paid subscription that is past due" do
   end
 
   it "retries the subscription charge and updates the subscription when the billing information is correctly updated" do
+    next_billing_date_string = 1.day.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::Active
-    subscription["next_billing_date"] = 2.months.from_now
+    subscription["next_billing_date"] = next_billing_date_string
     FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
                                   :subscription_id => subject.subscription_token }
     transaction = FakeBraintree.generated_transaction
@@ -444,13 +486,15 @@ describe Account, "with a paid subscription that is past due" do
                                             :expiration_year => 2012).should be
 
     subject.reload.subscription_status.should == Braintree::Subscription::Status::Active
-    subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
+    subject.next_billing_date.should == Time.parse(next_billing_date_string).in_time_zone(
+      Saucy::Configuration.merchant_account_time_zone)
   end
 
   it "retries the subscription charge and updates the subscription when the payment processing fails" do
+    next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = 1.day.from_now
+    subscription["next_billing_date"] = next_billing_date_string
     FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
                                   :subscription_id => subject.subscription_token }
     transaction = FakeBraintree.generated_transaction
@@ -469,13 +513,15 @@ describe Account, "with a paid subscription that is past due" do
 
     subject.errors[:card_number].should include("was denied by the payment processor with the message: no good")
     subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-    subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
+    subject.next_billing_date.should == Time.parse(next_billing_date_string).in_time_zone(
+      Saucy::Configuration.merchant_account_time_zone)
   end
 
   it "retries the subscription charge and updates the subscription when the settlement fails" do
+    next_billing_date_string = 1.day.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = 1.day.from_now
+    subscription["next_billing_date"] = next_billing_date_string
     FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
                                   :subscription_id => subject.subscription_token }
     transaction = FakeBraintree.generated_transaction
@@ -494,7 +540,8 @@ describe Account, "with a paid subscription that is past due" do
 
     subject.errors[:card_number].should include("no good")
     subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-    subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
+    subject.next_billing_date.should == Time.parse(next_billing_date_string).in_time_zone(
+      Saucy::Configuration.merchant_account_time_zone)
   end
 end
 

data/spec/saucy/configuration_spec.rb

@@ -36,4 +36,18 @@ describe Saucy::Configuration do
       subject.support_email_address = old_address
     end
   end
+
+  it "can assign a merchant_account_time_zone" do
+    old_merchant_account_time_zone = subject.merchant_account_time_zone
+    begin
+      subject.merchant_account_time_zone = "International Date Line West"
+      subject.merchant_account_time_zone.should == "International Date Line West"
+    ensure
+      subject.merchant_account_time_zone = old_merchant_account_time_zone
+    end
+  end
+
+  it "defaults merchant_account_time_zone to 'Eastern Time (US & Canada)'" do
+    subject.merchant_account_time_zone.should == "Eastern Time (US & Canada)"
+  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 57
   prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 7
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -20,119 +15,84 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 -04:00
-default_executable: 
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
-  prerelease: false
-  type: :runtime
   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
-  type: :runtime
   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
-  type: :runtime
   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
-  type: :runtime
   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
-  type: :runtime
   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
-  type: :runtime
   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
-  type: :development
   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
@@ -314,7 +274,6 @@ files:
 - spec/support/clearance_matchers.rb
 - spec/support/notifications.rb
 - spec/views/accounts/_account.html.erb_spec.rb
-has_rdoc: true
 homepage: http://github.com/thoughtbot/saucy
 licenses: []
 
@@ -328,7 +287,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 209378144174508178
       segments: 
       - 0
       version: "0"
@@ -337,14 +296,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS