saucy 0.2.32 → 0.2.33

data/lib/generators/saucy/install/templates/create_saucy_tables.rb

@@ -23,11 +23,13 @@ class CreateSaucyTables < ActiveRecord::Migration
       table.boolean  :notified_of_expiration, :default => false, :null => false
       table.boolean  :asked_to_activate, :default => false, :null => false
       table.boolean  :activated, :default => false, :null => false
+      table.datetime :trial_expires_at
     end
     add_index :accounts, :plan_id
     add_index :accounts, :keyword
     add_index :accounts, :next_billing_date
     add_index :accounts, :created_at
+    add_index :accounts, :trial_expires_at
 
     create_table :invitations do |table|
       table.string   :email

data/lib/saucy/account.rb

@@ -24,6 +24,8 @@ module Saucy
       validates_format_of :keyword,
                           :with    => %r{^[a-z0-9]+$},
                           :message => "must be only lower case letters."
+
+      before_create :set_trial_expiration
     end
 
     module InstanceMethods
@@ -56,12 +58,16 @@ module Saucy
       end
 
       def past_trial?
-        created_at < 30.days.ago
+        trial_expires_at && trial_expires_at < Time.now
       end
 
       def admin_emails
         admins.map(&:email)
       end
+
+      def set_trial_expiration
+        self.trial_expires_at = 30.days.from_now(created_at || Time.now)
+      end
     end
 
     module ClassMethods

data/spec/models/account_spec.rb

@@ -93,6 +93,14 @@ describe Account do
     Factory(:account, :created_at => 30.days.ago, :plan => forever).should_not be_expired
   end
 
+  it "isn't expired without an expiration date after 30 days" do
+    trial = Factory(:plan, :trial => true)
+    account = Factory(:account, :created_at => 30.days.ago, :plan => trial)
+    account.trial_expires_at = nil
+    account.save!
+    account.should_not be_expired
+  end
+
   it "sends notifications for expiring accounts" do
     trial   = Factory(:plan, :trial => true)
     forever = Factory(:plan, :trial => false)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: 
   segments: 
   - 0
   - 2
-  - 32
-  version: 0.2.32
+  - 33
+  version: 0.2.33
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency