saucy 0.7.3 → 0.8.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.8.0
+
+Added a notification for trials that just ended. When upgrading, you'll need to
+add to add a boolean notified_of_completed_trial column to the accounts table,
+which should be NOT NULL and default to false. These notifications go out with
+the daily Saucy jobs.
+
 0.7.3
 
 Added a uniqueness constraint for keyword on accounts/projects. When upgrading,

data/app/mailers/billing_mailer.rb

@@ -40,4 +40,14 @@ class BillingMailer < ActionMailer::Base
          :reply_to => Saucy::Configuration.support_email_address,
          :from     => Saucy::Configuration.manager_email_address)
   end
+
+  def completed_trial(account)
+    @account = account
+    mail(:to       => account.admin_emails,
+         :subject  => I18n.t(:subject,
+                            :scope   => [:billing_mailer, :completed_trial],
+                            :default => "Your trial has ended"),
+         :reply_to => Saucy::Configuration.support_email_address,
+         :from     => Saucy::Configuration.manager_email_address)
+  end
 end

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

@@ -0,0 +1,15 @@
+<%= t(".greeting") %>
+
+<%= t(".completed_trial_notice",
+      :account_name => @account.name,
+      :app_name => t("app_name")) %>
+
+<%= edit_account_plan_url(@account) %>
+
+<%= t(".contact", :app_name => t("app_name")) %>
+
+============================================================
+
+Thanks for your business,
+The <%= t("app_name") %> Team
+<%= t("app_url") %>

data/config/locales/en.yml

@@ -16,6 +16,10 @@ en:
       greeting: Thanks for giving us a try!
       expiration_notice: "Your 30 day trial for %{account_name} is expiring soon. I hope that you've enjoyed %{app_name} enough to sign up for a paid subscription.  If you'd like to continue using your account, please take a moment to choose a paid plan:"
       contact: "If you need more time to evaluate %{app_name} or you have any questions, please don't hesitate to contact me."
+    completed_trial:
+      greeting: Thanks for giving us a try!
+      expiration_notice: "Your 30 day trial for %{account_name} is over, and your account has become inactive. If you'd like to continue using your account, please take a moment to choose a paid plan:"
+      contact: "If you need more time to evaluate %{app_name} or you have any questions, please don't hesitate to contact me."
     new_unactivated:
       body: |-
         Hi,

data/lib/generators/saucy/features/features_generator.rb

@@ -56,7 +56,7 @@ DESC
       edit_account_plan_path(account)
     when /^the new project page for the newest account by "([^"]*)"$/
       user = User.find_by_email!($1)
-      account = user.accounts.order("created_at desc").first
+      account = user.accounts.order("id desc").first
       new_account_project_path(account)
     when /^the "([^"]*)" project page$/
       project = Project.find_by_name!($1)

data/lib/generators/saucy/features/templates/features/trial_plans.feature

@@ -70,3 +70,13 @@ Feature: Trial plans
     When I sign in as "admin@example.com/password"
     And I follow the link sent to "admin@example.com" with subject "A check in"
     Then I should be on the new project page for the newest account by "admin@example.com"
+
+  Scenario: Receive a reminder about an expired trial plan
+    Given a "Temp" account exists with a name of "Test" created 30 days ago
+    And a user exists with an email of "admin@example.com"
+    And "admin@example.com" is an admin of the "Test" account
+    When the daily Saucy jobs are processed
+    And I sign in as "admin@example.com"
+    And I follow the link sent to "admin@example.com" with subject "Your trial has ended"
+    Then I should be on the upgrade plan page for the "Test" account
+

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

@@ -20,7 +20,9 @@ class CreateSaucyTables < ActiveRecord::Migration
       table.string   :subscription_token
       table.string   :subscription_status
       table.datetime :next_billing_date
+      table.boolean  :notified_of_disabling, :default => false, :null => false
       table.boolean  :notified_of_expiration, :default => false, :null => false
+      table.boolean  :notified_of_completed_trial, :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

data/lib/saucy/account.rb

@@ -98,9 +98,16 @@ module Saucy
         end
       end
 
+      def deliver_completed_trial_notifications
+        trial_completed.each do |account|
+          BillingMailer.completed_trial(account).deliver
+          account.notified_of_completed_trial = true
+          account.save!
+        end
+      end
+
       def trial_expiring
-        includes(:plan).
-          where(:plans => { :trial => true }).
+        trial.
           where(:notified_of_expiration => false).
           where(["accounts.trial_expires_at <= ?", 7.days.from_now])
       end
@@ -109,6 +116,17 @@ module Saucy
         where(["accounts.created_at <= ?", 7.days.ago]).
           where(:asked_to_activate => false, :activated => false)
       end
+
+      def trial_completed
+        trial.
+          where(:notified_of_completed_trial => false).
+          where(["accounts.trial_expires_at <= ?", Time.now])
+      end
+
+      def trial
+        includes(:plan).
+          where(:plans => { :trial => true })
+      end
     end
   end
 end

data/lib/saucy/railties/tasks.rake

@@ -14,9 +14,15 @@ namespace :saucy do
     Account.deliver_expiring_trial_notifications
   end
 
+  desc "Deliver notifications to users with completed trial accounts"
+  task :deliver_completed_trial_notifications => :environment do
+    Account.deliver_completed_trial_notifications
+  end
+
   desc "Run all daily tasks"
   task :daily => [:update_subscriptions,
                   :ask_users_to_activate,
-                  :deliver_expiring_trial_notifications]
+                  :deliver_expiring_trial_notifications,
+                  :deliver_completed_trial_notifications]
 end
 

data/spec/models/account_spec.rb

@@ -162,6 +162,37 @@ describe Account do
     expiring.each { |account| account.reload.should be_notified_of_expiration }
   end
 
+  it "sends notifications for completed trials" do
+    trial   = Factory(:plan, :trial => true)
+    forever = Factory(:plan, :trial => false)
+
+    unexpired_trial          = Factory(:account, :plan => trial, :created_at => 29.days.ago)
+    unnotified_expired_trial = Factory(:account, :plan => trial, :created_at => 31.days.ago)
+    expiring_now             = Factory(:account, :plan => trial, :created_at => 1.day.ago)
+    notified_expired_trial   = Factory(:account, :plan                         => trial,
+                                                 :created_at                   => 31.days.ago,
+                                                 :notified_of_completed_trial  => true)
+    forever                  = Factory(:account, :plan => forever, :created_at => 31.days.ago)
+
+    expiring_now.trial_expires_at = 1.day.ago
+    expiring_now.save!
+
+    requires_notification = [unnotified_expired_trial, expiring_now]
+
+    mail = stub('mail', :deliver => true)
+    BillingMailer.stubs(:completed_trial => mail)
+
+    Account.deliver_completed_trial_notifications
+
+    requires_notification.each do |account|
+      BillingMailer.should have_received(:completed_trial).with(account)
+    end
+
+    mail.should have_received(:deliver).twice
+
+    requires_notification.each { |account| account.reload.should be_notified_of_completed_trial }
+  end
+
   it "sends notifications for unactivated accounts after 7 days" do
     unactivated = [Factory(:account, :created_at => 7.days.ago),
                    Factory(:account, :created_at => 8.days.ago)]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 3
-  version: 0.7.3
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -169,6 +169,7 @@ files:
 - app/views/accounts/edit.html.erb
 - app/views/accounts/index.html.erb
 - app/views/accounts/new.html.erb
+- app/views/billing_mailer/completed_trial.text.erb
 - app/views/billing_mailer/expiring_trial.text.erb
 - app/views/billing_mailer/new_unactivated.text.erb
 - app/views/billing_mailer/problem.html.erb