saucy 0.2.21 → 0.2.24

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

@@ -1,20 +1,30 @@
 <p class="name"><%= plan.name %></p>
-<p class="price"><% if plan.billed? %>$<%= plan.price %>/month<% else %>Free<% end %></p>
-<ul class="features">
-  <% plan.limits.numbered.each do |limit| %>
-    <%= content_tag_for :li, limit, :class => limit.name do %>
-      <%= pluralize(limit.value, limit.name.singularize) %>
-    <% end %>
-  <% end %>
-  <% plan.limits.boolean.each do |limit| %>
-    <% if limit.allowed? -%>
-      <%= content_tag_for :li, limit, :class => limit.name do %>
-        <%= limit.name %>
-      <% end %>
-    <% end -%>
+<p class="price">
+  <% if plan.billed? %>
+    $<%= plan.price %>/month
+  <% else %>
+    Free
   <% end %>
+  <% if plan.trial? %>
+    Trial
+  <% end -%>
+</p>
+<ul class="features">
   <% if plan.trial? -%>
     <li class="trial"><%= t(".trial_will_expire",
                             :default => "Your trial will expire after 30 days.") %></li>
+  <% else -%>
+    <% plan.limits.numbered.each do |limit| %>
+      <%= content_tag_for :li, limit, :class => limit.name do %>
+        <%= pluralize(limit.value, limit.name.singularize) %>
+      <% end %>
+    <% end %>
+    <% plan.limits.boolean.each do |limit| %>
+      <% if limit.allowed? -%>
+        <%= content_tag_for :li, limit, :class => limit.name do %>
+          <%= limit.name %>
+        <% end %>
+      <% end -%>
+    <% end %>
   <% end -%>
 </ul>

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

@@ -8,6 +8,9 @@
       <%= content_tag_for :li, plan, :class => "#{plan.name.parameterize} #{'disabled' if !@account.can_change_plan_to?(plan)}" do %>
         <%= form.label :plan_id, render(plan), :value => plan.id %>
         <%= form.radio_button :plan_id, plan.id, :disabled => !@account.can_change_plan_to?(plan), "data-free" => plan.free? %>
+        <% if !@account.can_change_plan_to?(plan) -%>
+          <p class="disabled"><%= t(".plan-disabled", :default => "Too big for %{name}.", :name => plan.name) %></p>
+        <% end -%>
       <% end %>
     <% end -%>
   <% end %>

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

@@ -116,6 +116,7 @@ Feature: Manage Plan
     And I follow "Upgrade"
     Then I should see "Upgrade Your Plan"
     And the "Free" plan should be disabled
+    And I should see "Too big for Free."
     And I should see "1 user" within ".basic"
     And I should see "0 users" within ".free"
     And I should see "1 project" within ".free"

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

@@ -3,14 +3,21 @@ Feature: Trial plans
   Background:
     Given the following plan exists:
       | name    | price | trial |
-      | Trial   | 0     | true  |
+      | Temp    | 0     | true  |
       | Eternal | 0     | false |
+    And the following limits exist:
+      | plan          | name  | value | value_type |
+      | name: Temp    | users | 2     | number     |
+      | name: Eternal | users | 2     | number     |
 
   Scenario: Sign up for a trial plan
     When I go to the list of plans page
-    And I follow "Trial"
+    And I follow "Temp"
+    Then I should see "Free"
+    And I should see "Trial"
     And I should see "Your trial will expire after 30 days"
-    And I fill in "Email" with "email@person.com"
+    But I should not see "users"
+    When 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"
@@ -20,24 +27,26 @@ Feature: Trial plans
     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
+    Given a "Temp" 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
+    Given a "Temp" 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
+    And the "Temp" 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"
+    Then I should see "users"
+    But I should not see "Trial"
+    And I should not see "expire"
 
   Scenario: Use a non-trial plan forever
     Given an "Eternal" account exists with a name of "Test" created 30 days ago

data/lib/saucy/subscription.rb

@@ -17,6 +17,9 @@ module Saucy
 
       attr_accessor *CUSTOMER_ATTRIBUTES.keys
 
+      CUSTOMER_ATTRIBUTES.keys.each do |attribute|
+        validates_presence_of attribute, :if => :switching_to_billed?
+      end
       before_create :create_customer
       before_create :create_subscription, :if => :billed?
       after_destroy :destroy_customer
@@ -104,16 +107,18 @@ module Saucy
 
       def update_customer(attributes)
         set_customer_attributes(attributes)
-        result = Braintree::Customer.update(customer_token, customer_attributes)
-        handle_customer_result(result)
-        result.success?
+        if valid?
+          result = Braintree::Customer.update(customer_token, customer_attributes)
+          handle_customer_result(result)
+          result.success?
+        end
       end
 
       def save_subscription
-        if subscription 
+        if subscription
           Braintree::Subscription.update(subscription_token, :plan_id => plan_id)
         elsif plan.billed?
-          create_subscription
+          valid? && create_subscription
         end
       end
 
@@ -200,6 +205,10 @@ module Saucy
           false
         end
       end
+
+      def switching_to_billed?
+        plan_id && plan.billed? && subscription_token.blank?
+      end
     end
 
     module ClassMethods

data/spec/models/subscription_spec.rb

@@ -9,6 +9,7 @@ describe Account do
                             :cardholder_name => "Ralph Robot", 
                             :billing_email => "ralph@example.com", 
                             :card_number => "4111111111111112", 
+                            :verification_code => "100",
                             :expiration_month => 5, 
                             :expiration_year => 2012,
                             :plan => Factory(:paid_plan))
@@ -51,6 +52,44 @@ describe Account do
    end
 end
 
+describe Account, "given free and paid plans" do
+  let(:free) { Factory(:plan, :price => 0) }
+  let(:paid) { Factory(:plan, :price => 1) }
+
+  it "doesn't switch from free to paid without credit card info" do
+    account = Factory(:account, :plan => free)
+    account = Account.find(account.id)
+
+    result = account.save_customer_and_subscription!(:plan_id => paid.id)
+
+    result.should be_false
+    account.reload.plan.should == free
+    Saucy::Subscription::CUSTOMER_ATTRIBUTES.keys.each do |attribute|
+      account.errors[attribute].should_not be_blank
+    end
+    FakeBraintree.customers[account.customer_token].should_not be_nil
+    FakeBraintree.customers[account.customer_token]["credit_cards"].should be_blank
+  end
+
+  it "requires a billing email when upgrading to a paid plan" do
+    account = Factory(:account, :plan => free, :card_number => '123')
+    account.reload
+    account.plan = paid
+
+    account.should validate_presence_of(:billing_email)
+  end
+
+  it "requires a billing email for paid plans" do
+    account = Factory.build(:account, :plan => paid, :card_number => '123')
+    account.should validate_presence_of(:billing_email)
+  end
+
+  it "doesn't require a billing email for free plans" do
+    account = Factory.build(:account, :plan => free)
+    account.should_not validate_presence_of(:billing_email)
+  end
+end
+
 describe Account, "with a paid plan" do
   subject do
     Factory(:account, 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 2
-  - 21
-  version: 0.2.21
+  - 24
+  version: 0.2.24
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,14 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: formtastic
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +33,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: railties
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,12 +49,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: braintree
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: sham_rack
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -82,12 +81,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -98,12 +97,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  requirement: *id005
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: aruba
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -114,7 +113,8 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  requirement: *id006
+  type: :development
+  version_requirements: *id006
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []