saucy 0.13.1 → 0.13.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.13.2
+
+* Follow-up to 0.13.1: Actually work irrespective of system TZ
+
 0.13.1
 
 * Respect merchant account timezone in daily billing task

data/lib/saucy/subscription.rb

@@ -92,10 +92,10 @@ module Saucy
       end
 
       def update_subscription_cache!
+        zone = ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone]
         flush_cache :subscription
         update_attribute(:subscription_status, subscription.status)
-        update_attribute(:next_billing_date, Time.parse(subscription.next_billing_date).in_time_zone(
-          Saucy::Configuration.merchant_account_time_zone))
+        update_attribute(:next_billing_date, zone.parse(subscription.next_billing_date))
       end
 
       def changing_plan?(attributes)
@@ -204,9 +204,9 @@ module Saucy
       def create_subscription
         result = Braintree::Subscription.create(subscription_attributes)
         if result.success?
+          zone = ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone]
           self.subscription_token = result.subscription.id
-          self.next_billing_date = Time.parse(result.subscription.next_billing_date).in_time_zone(
-            Saucy::Configuration.merchant_account_time_zone)
+          self.next_billing_date = zone.parse(result.subscription.next_billing_date)
           self.subscription_status = result.subscription.status
         else
           false
@@ -233,9 +233,9 @@ module Saucy
         recently_billed = where("next_billing_date <= ?", Time.now)
         recently_billed.each do |account|
           begin
+            zone = ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone]
             account.subscription_status = account.subscription.status
-            account.next_billing_date = Time.parse(account.subscription.next_billing_date).in_time_zone(
-              Saucy::Configuration.merchant_account_time_zone)
+            account.next_billing_date = zone.parse(account.subscription.next_billing_date)
             account.save!
             if account.past_due?
               BillingMailer.problem(account).deliver!

data/spec/models/subscription_spec.rb

@@ -420,6 +420,9 @@ describe Account, "with a paid subscription" do
     end
 
     before do
+      @old_env_tz = ENV['TZ']
+      ENV['TZ'] = "Europe/Paris"
+
       Saucy::Configuration.merchant_account_time_zone = "Eastern Time (US & Canada)"
       subject.next_billing_date = "2011-08-15"
       subject.save!
@@ -434,6 +437,10 @@ describe Account, "with a paid subscription" do
       subject.reload.next_billing_date.should == Time.parse("2011-09-15 00:00 -0400")
     end
 
+    after do
+      ENV['TZ'] = @old_env_tz
+    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!
@@ -450,6 +457,7 @@ describe Account, "with a paid subscription" do
   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) }
+    let(:zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
 
     before do
       subscription["status"] = Braintree::Subscription::Status::Active
@@ -463,8 +471,7 @@ 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.should == Time.parse(next_billing_date_string).in_time_zone(
-          Saucy::Configuration.merchant_account_time_zone)
+        subject.next_billing_date.should == zone.parse(next_billing_date_string)
       end
     end
 
@@ -533,6 +540,8 @@ describe Account, "with a paid subscription that is past due" do
     subject.reload
   end
 
+  let(:zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
+
   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]
@@ -555,8 +564,7 @@ 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.should == Time.parse(next_billing_date_string).in_time_zone(
-      Saucy::Configuration.merchant_account_time_zone)
+    subject.next_billing_date.should == zone.parse(next_billing_date_string)
   end
 
   it "retries the subscription charge and updates the subscription when the payment processing fails" do
@@ -582,8 +590,7 @@ 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.should == Time.parse(next_billing_date_string).in_time_zone(
-      Saucy::Configuration.merchant_account_time_zone)
+    subject.next_billing_date.should == zone.parse(next_billing_date_string)
   end
 
   it "retries the subscription charge and updates the subscription when the settlement fails" do
@@ -609,8 +616,7 @@ 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.should == Time.parse(next_billing_date_string).in_time_zone(
-      Saucy::Configuration.merchant_account_time_zone)
+    subject.next_billing_date.should == zone.parse(next_billing_date_string)
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: saucy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -300,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3518640004043339834
+      hash: -1397322050892494045
       segments: 
       - 0
       version: "0"