saucy 0.12.0 → 0.12.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.12.1
+
+* Add configuration options for trial length and the corresponding notification emails.
+
 0.12.0
 
 * Add a dependency on Airbrake for exception notification.

data/README.md

@@ -128,6 +128,12 @@ You can override all the views by generating them into your app and customizing
 
     rails g saucy:views
 
+You can also customize the default trial length of 30 days, and the timing of expiration notification emails:
+
+* Saucy::Configuration.trial_length - An integer. The length of the trial in days.
+* Saucy::Configuration.unactivated_notice_on - An integer. The day of the trial in which the unactivated notice should be sent.
+* Saucy::Configuration.expiring_notice_on - An integer. The number of days remaining that the expiration warning notice should be sent on.
+
 ## Gotchas
 
 Make sure you don't do this in ApplicationController:

data/config/locales/en.yml

@@ -14,11 +14,11 @@ en:
   billing_mailer:
     expiring_trial:
       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:"
+      expiration_notice: "Your 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!
-      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:"
+      notice: "Your 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: |-

data/lib/saucy/account.rb

@@ -76,7 +76,7 @@ module Saucy
         number_free_days = if coupon
                              30 * coupon.free_months
                            else
-                             30
+                             Saucy::Configuration.trial_length
                            end
         self.trial_expires_at = number_free_days.days.from_now(created_at || Time.zone.now)
       end
@@ -141,11 +141,11 @@ module Saucy
       def trial_expiring
         trial.
           where(:notified_of_expiration => false).
-          where(["accounts.trial_expires_at <= ?", 7.days.from_now])
+          where(["accounts.trial_expires_at <= ?", Saucy::Configuration.expiring_notice_on.days.from_now])
       end
 
       def new_unactivated
-        where(["accounts.created_at <= ?", 7.days.ago]).
+        where(["accounts.created_at <= ?", Saucy::Configuration.unactivated_notice_on.days.ago]).
           where(:asked_to_activate => false, :activated => false)
       end
 

data/lib/saucy/configuration.rb

@@ -8,6 +8,9 @@ module Saucy
     cattr_accessor :merchant_account_id
     cattr_accessor :admin_username
     cattr_accessor :admin_password
+    cattr_accessor :trial_length
+    cattr_accessor :expiring_notice_on
+    cattr_accessor :unactivated_notice_on
 
     def initialize
       @@manager_email_address = 'manager@example.com'
@@ -15,6 +18,9 @@ module Saucy
       @@layouts               = Layouts.new
       @@admin_username        = 'admin'
       @@admin_password        = 'admin'
+      @@trial_length          = 30
+      @@expiring_notice_on    = 7
+      @@unactivated_notice_on = 7
     end
 
   end

data/spec/models/account_spec.rb

@@ -266,6 +266,60 @@ describe Account do
       @mail.should have_received(:deliver).twice()
     end
   end
+
+  it "uses the unactivated_notice_on setting for new_unactivated" do
+    begin
+      unactivated = [Factory(:account, :created_at => 7.days.ago),
+        Factory(:account, :created_at => 8.days.ago)]
+      fresh = Factory(:account, :created_at => 6.days.ago)
+      Account.new_unactivated.order(:created_at).should == unactivated.reverse
+      Saucy::Configuration.unactivated_notice_on = 6
+      Account.new_unactivated.order(:created_at).should == (unactivated.reverse + [fresh]).flatten
+    ensure
+      Saucy::Configuration.unactivated_notice_on = 7
+    end
+  end
+
+  it "uses the expiring_notice_on for notifying expiring accounts" do
+    begin
+      trial   = Factory(:plan, :trial => true)
+      forever = Factory(:plan, :trial => false)
+
+      expiring   = Factory(:account, :plan => trial, :created_at => 1.day.ago)
+      expiring.trial_expires_at = 7.days.from_now
+      expiring.save!
+
+      Account.trial_expiring.should == [expiring]
+
+      Saucy::Configuration.expiring_notice_on = 8
+      expiring.trial_expires_at = 8.days.from_now
+      expiring.save!
+
+      Account.trial_expiring.should == [expiring]
+    ensure
+      Saucy::Configuration.expiring_notice_on = 7
+    end
+  end
+
+  context "with a trial length of 14 days" do
+    before(:each) do
+      Saucy::Configuration.trial_length = 14
+    end
+
+    after(:each) do
+      Saucy::Configuration.trial_length = 30
+    end
+
+    it "is expired with a trial plan after 14 days" do
+      trial = Factory(:plan, :trial => true)
+      Factory(:account, :created_at => 14.days.ago, :plan => trial).should be_expired
+    end
+
+    it "isn't expired with a trial plan before 14 days" do
+      trial = Factory(:plan, :trial => true)
+      Factory(:account, :created_at => 13.days.ago, :plan => trial).should_not be_expired
+    end
+  end
   
   it "searches records for keyword and name" do
     name = Factory :account, :name => 'match'

data/spec/saucy/configuration_spec.rb

@@ -13,6 +13,18 @@ describe Saucy::Configuration do
     subject.support_email_address.should_not be_nil
   end
 
+  it "has a trial_length of 30 days" do
+    subject.trial_length.should == 30
+  end
+
+  it "has an expiring_notice_on of 7 days" do
+    subject.expiring_notice_on.should == 7
+  end
+
+  it "has an unactivated_notice_on of 7 days" do
+    subject.expiring_notice_on.should == 7
+  end
+
   it "has a nil merchant_account_id" do
     subject.merchant_account_id.should be_nil
   end
@@ -36,4 +48,34 @@ describe Saucy::Configuration do
       subject.support_email_address = old_address
     end
   end
+
+  it "can assign a trial length" do
+    old_length = subject.trial_length
+    begin
+      subject.trial_length = 14
+      subject.trial_length.should == 14
+    ensure
+      subject.trial_length = old_length
+    end
+  end
+
+  it "can assign an expiring_notice_on length" do
+    old_length = subject.expiring_notice_on
+    begin
+      subject.expiring_notice_on = 14
+      subject.expiring_notice_on.should == 14
+    ensure
+      subject.expiring_notice_on = old_length
+    end
+  end
+
+  it "can assign a unactivated_notice_on length" do
+    old_length = subject.unactivated_notice_on
+    begin
+      subject.unactivated_notice_on = 14
+      subject.unactivated_notice_on.should == 14
+    ensure
+      subject.unactivated_notice_on = old_length
+    end
+  end
 end

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: saucy
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.12.1
   prerelease: 
-  version: 0.12.0
 platform: ruby
-authors: 
+authors:
 - thoughtbot, inc.
 - Joe Ferris
 - Mike Burns
@@ -14,106 +14,103 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: clearance
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70295759633320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.11.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70295759633320
+- !ruby/object:Gem::Dependency
+  name: formtastic
+  requirement: &70295759632840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70295759632840
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &70295759632380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: braintree
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70295759632380
+- !ruby/object:Gem::Dependency
+  name: braintree
+  requirement: &70295759631920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70295759631920
+- !ruby/object:Gem::Dependency
+  name: sham_rack
+  requirement: &70295759631460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70295759631460
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70295759631000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: airbrake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70295759631000
+- !ruby/object:Gem::Dependency
+  name: airbrake
+  requirement: &70295759630540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70295759630540
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70295759630080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.2.6
   type: :development
-  version_requirements: *id008
-description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
+  prerelease: false
+  version_requirements: *70295759630080
+description: Clearance-based Rails engine for Software as a Service (Saas) that provides
+  account and project management
 email: support@thoughtbot.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -287,32 +284,29 @@ files:
 - spec/views/accounts/_account.html.erb_spec.rb
 homepage: http://github.com/thoughtbot/saucy
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS
-test_files: 
+test_files:
 - features/run_features.feature
 - features/step_definitions/clearance_steps.rb
 - features/step_definitions/rails_steps.rb