saucy 0.2.20 → 0.2.21

data/app/views/plans/_plan.html.erb

@@ -13,4 +13,8 @@
       <% end %>
     <% end -%>
   <% end %>
+  <% if plan.trial? -%>
+    <li class="trial"><%= t(".trial_will_expire",
+                            :default => "Your trial will expire after 30 days.") %></li>
+  <% end -%>
 </ul>

data/config/locales/en.yml

@@ -4,3 +4,11 @@ en:
   support_email: support@example.com
   saucy:
     billing_address: Billing Address
+    errors:
+      past_due:
+        admin: There was an issue processing the credit card you have on file. Please update your credit card information.
+        user: There was an issue processing the credit card on file for this account. Please have an administrator on the account update the credit card information.
+      expired:
+        admin: Your account's trial has expired. Please upgrade to another plan.
+        user: This account's trial has expired. Please have an administrator on the account upgrade to another plan.
+

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

@@ -51,6 +51,9 @@ DESC
     when /^the billing page for the "([^"]+)" account$/
       account = Account.find_by_name!($1)
       account_billing_path(account)
+    when /^the upgrade plan page for the "([^"]+)" account$/
+      account = Account.find_by_name!($1)
+      edit_account_plan_path(account)
         PATHS
 
         replace_in_file "features/support/paths.rb",

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

@@ -0,0 +1,48 @@
+Feature: Trial plans
+
+  Background:
+    Given the following plan exists:
+      | name    | price | trial |
+      | Trial   | 0     | true  |
+      | Eternal | 0     | false |
+
+  Scenario: Sign up for a trial plan
+    When I go to the list of plans page
+    And I follow "Trial"
+    And I should see "Your trial will expire after 30 days"
+    And I fill in "Email" with "email@person.com"
+    And I fill in "Password" with "password"
+    And I fill in "Confirm password" with "password"
+    And I fill in "Your name" with "Robot"
+    And I fill in "Company Name" with "Robots, Inc"
+    And I fill in "Keyword" with "robotsinc"
+    And I press "Sign up"
+    Then I should see "created"
+
+  Scenario: use an account during the trial
+    Given a "Trial" account exists with a name of "Test" created 29 days ago
+    And I am signed in as an admin of the "Test" account
+    When I go to the projects page for the "Test" account
+    Then I should see "Test"
+    And I should not see "expired"
+
+  Scenario: Try to use an expired trial plan
+    Given a "Trial" account exists with a name of "Test" created 30 days ago
+    And I am signed in as an admin of the "Test" account
+    When I go to the projects page for the "Test" account
+    Then I should be on the upgrade plan page for the "Test" account
+    And I should see "expired"
+    And the "Trial" plan should be disabled
+
+  Scenario: Sign up for a non-trial plan
+    When I go to the list of plans page
+    And I follow "Eternal"
+    Then I should not see "trial"
+
+  Scenario: Use a non-trial plan forever
+    Given an "Eternal" account exists with a name of "Test" created 30 days ago
+    And I am signed in as an admin of the "Test" account
+    When I go to the projects page for the "Test" account
+    Then I should see "Test"
+    And I should not see "expired"
+

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

@@ -0,0 +1,5 @@
+Given /^an? "([^"]+)" account exists with a name of "([^"]*)" created (\d+) days ago$/ do |plan_name, account_name, days|
+  plan = Plan.find_by_name!(plan_name)
+  Factory(:account, :created_at => days.to_i.days.ago, :plan => plan, :name => account_name)
+end
+

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

@@ -30,7 +30,7 @@ class CreateSaucyTables < ActiveRecord::Migration
       table.integer  :account_id
       table.boolean  :admin
       table.string   :code
-      table.boolean  :used
+      table.boolean  :used, :default => false, :null => false
       table.datetime :created_at
       table.datetime :updated_at
     end
@@ -64,6 +64,7 @@ class CreateSaucyTables < ActiveRecord::Migration
     create_table :plans do |t|
       t.string :name
       t.integer :price, :null => false, :default => 0
+      t.boolean :trial, :default => false, :null => false
 
       t.timestamps
     end

data/lib/saucy/account.rb

@@ -14,7 +14,7 @@ module Saucy
 
       belongs_to :plan
 
-      delegate :free?, :billed?, :to => :plan
+      delegate :free?, :billed?, :trial?, :to => :plan
 
       validates_uniqueness_of :name, :keyword
       validates_presence_of :name, :keyword, :plan_id
@@ -50,6 +50,14 @@ module Saucy
       def memberships_by_name
         memberships.by_name
       end
+
+      def expired?
+        trial? && past_trial?
+      end
+
+      def past_trial?
+        created_at < 30.days.ago
+      end
     end
   end
 end

data/lib/saucy/account_authorization.rb

@@ -39,15 +39,23 @@ module Saucy
       end
 
       def ensure_active_account
-        if current_account? && current_account.past_due?
-          if current_user.admin_of?(current_account)
-            flash[:alert] = t('.account_past_due.admin', :default => "There was an issue processing the credit card you have on file. Please update your credit card information.")
-          else
-            flash[:alert] = t('.account_past_due.user', :default => "There was an issue processing the credit card on file for this account. Please have an administrator on the account update the credit card information.")
+        if current_account?
+          if current_account.past_due?
+            redirect_unusable_account account_billing_path(current_account),
+                                      "past_due"
+          end
+          if current_account.expired?
+            redirect_unusable_account edit_account_plan_path(current_account),
+                                      "expired"
           end
-          redirect_to account_billing_path(current_account)
         end
       end
+
+      def redirect_unusable_account(path, failure)
+        role = current_user.admin_of?(current_account) ? 'admin' : 'user'
+        flash[:alert] = t("saucy.errors.#{failure}.#{role}")
+        redirect_to path
+      end
     end
   end
 end

data/lib/saucy/subscription.rb

@@ -55,9 +55,7 @@ module Saucy
       end
 
       def can_change_plan_to?(new_plan)
-        plan.limits.where(:value_type => :number).all? do |limit|
-          new_plan.limit(limit.name).value >= send(limit.name).count
-        end
+        within_limits_for?(new_plan) && !past_trial_for?(new_plan)
       end
 
       def past_due?
@@ -66,6 +64,16 @@ module Saucy
 
       private
 
+      def within_limits_for?(new_plan)
+        new_plan.limits.where(:value_type => :number).all? do |limit|
+          new_plan.limit(limit.name).value >= send(limit.name).count
+        end
+      end
+
+      def past_trial_for?(new_plan)
+        new_plan.trial? && past_trial?
+      end
+
       def retry_subscription_charge!
         authorized_transaction = Braintree::Subscription.retry_charge(subscription.id).transaction
         result = Braintree::Transaction.submit_for_settlement(authorized_transaction.id)

data/spec/models/account_spec.rb

@@ -65,4 +65,19 @@ describe Account do
 
     result.should == expected
   end
+
+  it "is expired with a trial plan after 30 days" do
+    trial = Factory(:plan, :trial => true)
+    Factory(:account, :created_at => 30.days.ago, :plan => trial).should be_expired
+  end
+
+  it "isn't expired with a trial plan before 30 days" do
+    trial = Factory(:plan, :trial => true)
+    Factory(:account, :created_at => 29.days.ago, :plan => trial).should_not be_expired
+  end
+
+  it "isn't expired with a non-trial plan after 30 days" do
+    forever = Factory(:plan, :trial => false)
+    Factory(:account, :created_at => 30.days.ago, :plan => forever).should_not be_expired
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20
-  version: 0.2.20
+  - 21
+  version: 0.2.21
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -05:00
+date: 2011-02-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -176,6 +176,7 @@ files:
 - lib/generators/saucy/base.rb
 - lib/generators/saucy/features/features_generator.rb
 - 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/email_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/factory_girl_steps.rb
@@ -226,6 +227,7 @@ files:
 - lib/generators/saucy/features/templates/features/new_account.feature
 - lib/generators/saucy/features/templates/features/sign_up.feature
 - lib/generators/saucy/features/templates/features/sign_up_paid.feature
+- lib/generators/saucy/features/templates/features/trial_plans.feature
 - lib/generators/saucy/features/templates/README
 - spec/controllers/accounts_controller_spec.rb
 - spec/controllers/application_controller_spec.rb