saucy 0.2.0 → 0.2.1

data/app/models/limit.rb

@@ -2,4 +2,20 @@ class Limit < ActiveRecord::Base
   belongs_to :plan
 
   validates_presence_of :name, :value
+
+  def self.numbered
+    where(:value_type => :number)
+  end
+
+  def self.boolean
+    where(:value_type => :boolean)
+  end
+
+  def self.named(name)
+    where(:name => name).first
+  end
+
+  def allowed?
+    value != 0
+  end
 end

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

@@ -1,2 +1,16 @@
-<p class="name"><%= plan.name %></p>
+<p class="name"><%= link_to_unless current_account?, plan.name, new_plan_account_path(plan) %></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 -%>
+  <% end %>
+</ul>

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

@@ -5,7 +5,7 @@
 <%= semantic_form_for @account, :url => account_plan_path(@account) do |form| %>
   <%= form.inputs :class => "radio optional" do %>
     <% @plans.each do |plan| -%>
-      <%= content_tag :li, :class => "#{'disabled' if !@account.can_change_plan_to?(plan)}" do %>
+      <%= 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) %>
       <% end %>

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

@@ -1,3 +1,7 @@
-<% @plans.each do |plan| %>
-  <%= link_to plan.name, new_plan_account_path(plan) %>
-<% end %>
+<ol>
+  <% @plans.each do |plan| %>
+    <%= content_tag_for :li, plan, :class => plan.name.parameterize do %>
+      <%= render(plan) %>
+    <% end %>
+  <% end %>
+</ol>

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

@@ -1,7 +1,7 @@
-Feature: Manage Projects
+Feature: Manage Billing
   As a admin user
-  I want to be able to manage projects
-  In order to have a project for each of my software applications
+  I want to be able to manage my billing information
+  So that my account can stay up to date and in good standing
 
   Scenario: Update the billing information on an account with a paid plan
     Given a paid plan exists with a name of "Paid"
@@ -30,90 +30,3 @@ Feature: Manage Projects
     And I press "Update"
     Then I should see "updated successfully"
     Then I should see "card ending in 1111"
-
-  Scenario: Change the plan to another paid plan on an account with a paid plan
-    Given a paid plan exists with a name of "Basic"
-    And a paid plan exists with a name of "Premium"
-    And the following account exists:
-      | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com/test"
-    And "joe@example.com" is an admin of the "Test" account
-    When I go to the settings page for the "Test" account
-    Then I should see "Your Plan"
-    And I should not see "Billing Information"
-    And I should see "Basic"
-    And I follow "Upgrade"
-    Then I should see "Upgrade Your Plan"
-    When I choose the "Premium" plan
-    And I press "Upgrade"
-    Then I should see "Plan changed successfully"
-    Then I should see "Premium"
-
-  Scenario: Change the plan from free to paid
-    Given a plan exists with a name of "Free"
-    And a paid plan exists with a name of "Basic"
-    And the following account exists:
-      | name | keyword | plan       |
-      | Test | test    | name: Free |
-    And I have signed in with "joe@example.com/test"
-    And "joe@example.com" is an admin of the "Test" account
-    When I go to the settings page for the "Test" account
-    Then I should not see "Billing" within ".tabs"
-    Then I should see "Your Plan"
-    And I follow "Upgrade"
-    Then I should see "Upgrade Your Plan"
-    When I choose the "Basic" plan
-    Then I should see "Billing Information"
-    And I fill in "Cardholder name" with "Ralph Robot"
-    And I fill in "Billing email" with "accounting@example.com"
-    And I fill in "Card number" with "4111111111111111"
-    And I fill in "Verification code" with "123"
-    And I select "March" from "Expiration month"
-    And I select "2020" from "Expiration year"
-    When I press "Upgrade"
-    Then I should see "Plan changed successfully"
-    And I should see "Basic"
-    And I follow "Billing"
-    Then I should see "card ending in 1111"
-
-  Scenario: Change the plan to a free on an account with a paid plan
-    Given a paid plan exists with a name of "Basic"
-    And a plan exists with a name of "Free"
-    And the following account exists:
-      | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And I have signed in with "joe@example.com/test"
-    And "joe@example.com" is an admin of the "Test" account
-    When I go to the settings page for the "Test" account
-    Then I should see "Your Plan"
-    And I should not see "Billing Information"
-    And I should see "Basic"
-    And I follow "Upgrade"
-    Then I should see "Upgrade Your Plan"
-    When I choose the "Free" plan
-    And I press "Upgrade"
-    Then I should see "Plan changed successfully"
-    Then I should see "Free"
-
-  Scenario: Attempting to downgrade when beyond the limits
-    Given a paid plan exists with a name of "Basic"
-    And a plan exists with a name of "Free"
-    And the following account exists:
-      | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
-      | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
-    And the following limits exist:
-      | plan        | name     | value |
-      | name: Basic | users    | 1     |
-      | name: Free  | users    | 0     |
-      | name: Basic | projects | 5     |
-      | name: Free  | projects | 1     |
-    And I have signed in with "joe@example.com/test"
-    And "joe@example.com" is an admin of the "Test" account
-    When I go to the settings page for the "Test" account
-    Then I should see "Your Plan"
-    And I should not see "Billing Information"
-    And I should see "Basic"
-    And I follow "Upgrade"
-    Then I should see "Upgrade Your Plan"
-    And the "Free" plan should be disabled

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

@@ -0,0 +1,99 @@
+Feature: Manage Plan
+  As a admin user
+  I want to be able to upgrade and downgrade my account
+  So that I can pay what I want and get the features I want
+
+  Scenario: Change the plan to another paid plan on an account with a paid plan
+    Given a paid plan exists with a name of "Basic"
+    And a paid plan exists with a name of "Premium"
+    And the following account exists:
+      | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
+      | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
+    And I have signed in with "joe@example.com/test"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the settings page for the "Test" account
+    Then I should see "Your Plan"
+    And I should not see "Billing Information"
+    And I should see "Basic"
+    And I follow "Upgrade"
+    Then I should see "Upgrade Your Plan"
+    When I choose the "Premium" plan
+    And I press "Upgrade"
+    Then I should see "Plan changed successfully"
+    Then I should see "Premium"
+
+  Scenario: Change the plan from free to paid
+    Given a plan exists with a name of "Free"
+    And a paid plan exists with a name of "Basic"
+    And the following account exists:
+      | name | keyword | plan       |
+      | Test | test    | name: Free |
+    And I have signed in with "joe@example.com/test"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the settings page for the "Test" account
+    Then I should not see "Billing" within ".tabs"
+    Then I should see "Your Plan"
+    And I follow "Upgrade"
+    Then I should see "Upgrade Your Plan"
+    When I choose the "Basic" plan
+    Then I should see "Billing Information"
+    And I fill in "Cardholder name" with "Ralph Robot"
+    And I fill in "Billing email" with "accounting@example.com"
+    And I fill in "Card number" with "4111111111111111"
+    And I fill in "Verification code" with "123"
+    And I select "March" from "Expiration month"
+    And I select "2020" from "Expiration year"
+    When I press "Upgrade"
+    Then I should see "Plan changed successfully"
+    And I should see "Basic"
+    And I follow "Billing"
+    Then I should see "card ending in 1111"
+
+  Scenario: Change the plan to a free on an account with a paid plan
+    Given a paid plan exists with a name of "Basic"
+    And a plan exists with a name of "Free"
+    And the following account exists:
+      | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
+      | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
+    And I have signed in with "joe@example.com/test"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the settings page for the "Test" account
+    Then I should see "Your Plan"
+    And I should not see "Billing Information"
+    And I should see "Basic"
+    And I follow "Upgrade"
+    Then I should see "Upgrade Your Plan"
+    When I choose the "Free" plan
+    And I press "Upgrade"
+    Then I should see "Plan changed successfully"
+    Then I should see "Free"
+
+  Scenario: Attempting to downgrade when beyond the limits
+    Given a paid plan exists with a name of "Basic"
+    And a plan exists with a name of "Free"
+    And the following account exists:
+      | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
+      | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
+    And the following limits exist:
+      | plan        | name     | value | value_type |
+      | name: Basic | users    | 1     | number     |
+      | name: Free  | users    | 0     | number     |
+      | name: Basic | projects | 5     | number     |
+      | name: Free  | projects | 1     | number     |
+      | name: Basic | ssl      | 1     | boolean    |
+      | name: Free  | ssl      | 0     | boolean    |
+    And I have signed in with "joe@example.com/test"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the settings page for the "Test" account
+    Then I should see "Your Plan"
+    And I should not see "Billing Information"
+    And I should see "Basic"
+    And I follow "Upgrade"
+    Then I should see "Upgrade Your Plan"
+    And the "Free" plan should be disabled
+    And I should see "1 user" within ".basic"
+    And I should see "0 users" within ".free"
+    And I should see "1 project" within ".free"
+    And I should see "5 projects" within ".basic"
+    And I should see "ssl" within ".basic"
+    And I should not see "ssl" within ".free"

data/lib/saucy/account_authorization.rb

@@ -3,7 +3,7 @@ module Saucy
     extend ActiveSupport::Concern
 
     included do
-      helper_method :current_account, :current_project
+      helper_method :current_account, :current_project, :current_account?, :current_project?
       include InstanceMethods
     end
 
@@ -18,6 +18,14 @@ module Saucy
         ::Project.find_by_keyword!(params[:project_id])
       end
 
+      def current_project?
+        params[:project_id].present?
+      end
+
+      def current_account?
+        params[:account_id].present?
+      end
+
       def authorize_admin
         unless current_user.admin_of?(current_account)
           deny_access("You must be an admin to access that page.")

data/lib/saucy/plan.rb

@@ -19,15 +19,15 @@ module Saucy
       end
 
       def can_add_more?(limit, amount)
-        limits.where(:name => limit, :value_type => :number).first.value > amount
+        limits.numbered.named(limit).value > amount
       end
 
       def allows?(limit)
-        limits.where(:name => limit, :value_type => :boolean).first.value != 0
+        limits.boolean.named(limit).allowed?
       end
 
       def limit(limit_name)
-        limits.where(:name => limit_name).first
+        limits.named(limit_name)
       end
     end
   end

data/spec/models/limit_spec.rb

@@ -7,3 +7,29 @@ describe Limit do
   it { should validate_presence_of(:name) }
   it { should validate_presence_of(:value) }
 end
+
+describe Limit, "various kinds" do
+  let!(:users) { Factory(:limit, :name => "users", :value => 1) }
+  let!(:ssl) { Factory(:limit, :name => "ssl", :value => 0, :value_type => :boolean) }
+  let!(:lighthouse) { Factory(:limit, :name => "lighthouse", :value => 1, :value_type => :boolean) }
+
+  it "gives the numbered limits" do
+    Limit.numbered.should == [users]
+  end
+
+  it "gives the boolean limits" do
+    Limit.boolean.should == [ssl, lighthouse]
+  end
+
+  it "gives the limits by name" do
+    Limit.named(:users).should == users
+  end
+
+  it "reports true for booleans with 1" do
+    lighthouse.allowed?.should be
+  end
+
+  it "reports false for booleans with 0" do
+    ssl.allowed?.should_not be
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -05:00
+date: 2011-01-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,6 +211,7 @@ files:
 - lib/generators/saucy/features/templates/features/edit_user_permissions.feature
 - lib/generators/saucy/features/templates/features/manage_account.feature
 - lib/generators/saucy/features/templates/features/manage_billing.feature
+- lib/generators/saucy/features/templates/features/manage_plan.feature
 - lib/generators/saucy/features/templates/features/manage_projects.feature
 - lib/generators/saucy/features/templates/features/manage_users.feature
 - lib/generators/saucy/features/templates/features/new_account.feature