saucy 0.2.28.1 → 0.2.29

data/app/mailers/billing_mailer.rb

@@ -17,4 +17,13 @@ class BillingMailer < ActionMailer::Base
                              :default => "Problem with subscription billing"),
          :from     => Saucy::Configuration.mailer_sender)
   end
+
+  def expiring_trial(account)
+    @account = account
+    mail(:to       => account.customer.email,
+         :subject  => I18n.t(:subject,
+                             :scope   => [:saucy, :mailers, :billing_mailer, :expiring_tiral],
+                             :default => "Your trial is expiring soon"),
+         :from     => Saucy::Configuration.mailer_sender)
+  end
 end

data/app/mailers/invitation_mailer.rb

@@ -0,0 +1,11 @@
+class InvitationMailer < ActionMailer::Base
+  def invitation(invitation)
+    @invitation = invitation
+    subject = I18n.t(:subject,
+                     :scope   => [:saucy, :mailers, :invitation_mailer, :invititation],
+                     :default => "Invitation")
+    mail :to      => invitation.email,
+         :subject => subject,
+         :from    => Saucy::Configuration.mailer_sender
+  end
+end

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

@@ -0,0 +1,19 @@
+Thanks for giving us a try!
+
+Your 30 day trial for <%= @account.name %> is expiring soon. We hope that
+you've enjoyed <%= t("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:
+
+<%= edit_account_plan_url(@account) %>
+
+If you need more time to evaluate <%= t("app_name") %> or you have any questions,
+please don't hesitate to contact us.
+
+<%= t("support_contact_info") %>
+
+============================================================
+
+Thanks for your business,
+The <%= t("app_name") %> Team
+<%= t("app_url") %>

data/config/locales/en.yml

@@ -2,6 +2,7 @@ en:
   app_name: App Name
   app_url: 'http://example.com'
   support_email: support@example.com
+  supprt_contact_info: support@example.com
   saucy:
     billing_address: Billing Address
     errors:

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

@@ -55,3 +55,13 @@ Feature: Trial plans
     Then I should see "Test"
     And I should not see "expired"
 
+  Scenario: Receive a reminder about an expiring trial plan
+    Given the following account exists:
+      | plan       | name | billing email     |
+      | name: Temp | Test | admin@example.com |
+    And the "Test" account was created 23 days ago
+    And I am signed in as an admin of the "Test" account
+    When the daily Saucy jobs are processed
+    And I follow the link sent to "admin@example.com"
+    Then I should be on the upgrade plan page for the "Test" account
+

data/lib/generators/saucy/features/templates/step_definitions/account_steps.rb

@@ -3,3 +3,9 @@ Given /^an? "([^"]+)" account exists with a name of "([^"]*)" created (\d+) days
   Factory(:account, :created_at => days.to_i.days.ago, :plan => plan, :name => account_name)
 end
 
+Given /^the "([^"]*)" account was created (\d+) days ago$/ do |account_name, days|
+  Account.find_by_name!(account_name).tap do |account|
+    account.created_at = days.to_i.days.ago
+    account.save!
+  end
+end

data/lib/generators/saucy/features/templates/step_definitions/cron_steps.rb

@@ -0,0 +1,4 @@
+When /^the daily Saucy jobs are processed$/ do
+  Saucy::Cron.run_daily
+end
+

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

@@ -20,6 +20,7 @@ class CreateSaucyTables < ActiveRecord::Migration
       table.string   :subscription_token
       table.string   :subscription_status
       table.datetime :next_billing_date
+      table.boolean  :notified_of_expiration, :default => false, :null => false
     end
     add_index :accounts, :plan_id
     add_index :accounts, :keyword

data/lib/saucy.rb

@@ -7,3 +7,5 @@ require 'saucy/account_authorization'
 require 'saucy/configuration'
 require 'saucy/engine'
 require 'saucy/projects_controller'
+require 'saucy/cron'
+

data/lib/saucy/account.rb

@@ -59,5 +59,18 @@ module Saucy
         created_at < 30.days.ago
       end
     end
+
+    module ClassMethods
+      def deliver_expiring_trial_notifications
+        trial_expiring.each { |account| BillingMailer.expiring_trial(account).deliver }
+      end
+
+      def trial_expiring
+        joins(:plan).
+          where(:plans => { :trial => true }).
+          where(:notified_of_expiration => false).
+          where(["accounts.created_at <= ?", 23.days.ago])
+      end
+    end
   end
 end

data/lib/saucy/configuration.rb

@@ -2,12 +2,12 @@ require 'saucy/layouts'
 
 module Saucy
   class Configuration
-    attr_reader :layouts
-    cattr_accessor :mailer_sender
+    cattr_reader :layouts
+    cattr_reader :mailer_sender
 
     def initialize
       @@mailer_sender = 'donotreply@example.com'
-      @layouts = Layouts.new
+      @@layouts       = Layouts.new
     end
   end
 end

data/lib/saucy/cron.rb

@@ -0,0 +1,8 @@
+module Saucy
+  module Cron
+    def self.run_daily
+      ::Account.deliver_expiring_trial_notifications
+    end
+  end
+end
+

data/lib/saucy/layouts.rb

@@ -12,7 +12,7 @@ module Saucy
       lambda do |controller|
         controller_name = controller.controller_name
         action_name = controller.action_name
-        Rails.application.config.saucy.layouts.send(controller_name).send(action_name)
+        Saucy::Configuration.layouts.send(controller_name).send(action_name)
       end
     end
 

data/lib/saucy/subscription.rb

@@ -213,7 +213,7 @@ module Saucy
 
     module ClassMethods
       def update_subscriptions!
-        recently_billed = where("next_billing_date <= ?", Time.now)
+        recently_billed = where("next_billing_date <= '#{Time.now}'")
         recently_billed.each do |account|
           account.subscription_status = account.subscription.status
           account.next_billing_date = account.subscription.next_billing_date

data/spec/models/account_spec.rb

@@ -80,4 +80,29 @@ describe Account do
     forever = Factory(:plan, :trial => false)
     Factory(:account, :created_at => 30.days.ago, :plan => forever).should_not be_expired
   end
+
+  it "sends notifications for expiring accounts" do
+    trial   = Factory(:plan, :trial => true)
+    forever = Factory(:plan, :trial => false)
+
+    expiring         = [Factory(:account, :plan => trial, :created_at => 23.days.ago),
+                        Factory(:account, :plan => trial, :created_at => 24.days.ago)]
+    forever          = Factory(:account, :plan => forever, :created_at => 23.days.ago)
+    new_trial        = Factory(:account, :plan => trial, :created_at => 22.days.ago)
+    already_notified = Factory(:account, :plan                   => trial,
+                                         :created_at             => 24.days.ago,
+                                         :notified_of_expiration => true)
+
+    mail = stub('mail', :deliver => true)
+    BillingMailer.stubs(:expiring_trial => mail)
+
+    Account.deliver_expiring_trial_notifications
+
+    expiring.each do |account|
+      BillingMailer.should have_received(:expiring_trial).with(account)
+    end
+
+    mail.should have_received(:deliver).twice
+  end
 end
+

data/spec/models/subscription_spec.rb

@@ -309,26 +309,6 @@ describe Account, "with a paid subscription" do
     end
   end
 
-  it "doesn't receive a receipt email when it's already been billed" do
-    subscription = FakeBraintree.subscriptions[subject.subscription_token]
-    subscription["status"] = Braintree::Subscription::Status::Active
-    subscription["next_billing_date"] = 2.months.from_now
-    FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
-                                  :subscription_id => subject.subscription_token }
-    subscription["transactions"] = [FakeBraintree.generated_transaction]
-
-    Timecop.travel(subject.next_billing_date - 1.day) do
-      ActionMailer::Base.deliveries.clear
-
-      Account.update_subscriptions!
-
-      ActionMailer::Base.deliveries.select do |email|
-        email.to == [subject.billing_email] &&
-        email.subject =~ /receipt/i
-      end.should be_empty
-    end
-  end
-
   it "receives a receipt email at it's billing email with a notice that it failed when billing didn't work" do
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue

metadata

@@ -6,9 +6,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 28
-  - 1
-  version: 0.2.28.1
+  - 29
+  version: 0.2.29
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,8 +32,8 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  version_requirements: *id001
   name: formtastic
+  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -49,8 +48,8 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  version_requirements: *id002
   name: railties
+  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -65,8 +64,8 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  version_requirements: *id003
   name: braintree
+  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -81,8 +80,8 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  version_requirements: *id004
   name: sham_rack
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -97,8 +96,8 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  version_requirements: *id005
   name: sinatra
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -113,8 +112,8 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  version_requirements: *id006
   name: aruba
+  version_requirements: *id006
   prerelease: false
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
@@ -138,6 +137,7 @@ files:
 - app/controllers/plans_controller.rb
 - app/controllers/profiles_controller.rb
 - app/mailers/billing_mailer.rb
+- app/mailers/invitation_mailer.rb
 - app/models/invitation.rb
 - app/models/limit.rb
 - app/models/membership.rb
@@ -150,6 +150,7 @@ files:
 - app/views/accounts/edit.html.erb
 - app/views/accounts/index.html.erb
 - app/views/accounts/new.html.erb
+- app/views/billing_mailer/expiring_trial.text.erb
 - app/views/billing_mailer/problem.html.erb
 - app/views/billing_mailer/problem.text.erb
 - app/views/billing_mailer/receipt.html.erb
@@ -179,6 +180,7 @@ files:
 - lib/generators/saucy/features/templates/factories.rb
 - lib/generators/saucy/features/templates/step_definitions/account_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/braintree_steps.rb
+- lib/generators/saucy/features/templates/step_definitions/cron_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/email_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/factory_girl_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/html_steps.rb
@@ -191,7 +193,6 @@ files:
 - lib/generators/saucy/install/templates/controllers/projects_controller.rb
 - lib/generators/saucy/install/templates/create_saucy_tables.rb
 - lib/generators/saucy/install/templates/models/account.rb
-- lib/generators/saucy/install/templates/models/invitation_mailer.rb
 - lib/generators/saucy/install/templates/models/plan.rb
 - lib/generators/saucy/install/templates/models/project.rb
 - lib/generators/saucy/specs/specs_generator.rb
@@ -200,6 +201,7 @@ files:
 - lib/saucy/account.rb
 - lib/saucy/account_authorization.rb
 - lib/saucy/configuration.rb
+- lib/saucy/cron.rb
 - lib/saucy/engine.rb
 - lib/saucy/fake_braintree.rb
 - lib/saucy/layouts.rb
@@ -287,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS

data/lib/generators/saucy/install/templates/models/invitation_mailer.rb

@@ -1,9 +0,0 @@
-class InvitationMailer < ActionMailer::Base
-  default :from => 'donotreply@example.com'
-
-  def invitation(invitation)
-    @invitation = invitation
-    mail :to      => invitation.email,
-         :subject => "Invitation"
-  end
-end