saucy 0.3.1 → 0.3.2

data/app/controllers/invitations_controller.rb

@@ -1,5 +1,6 @@
 class InvitationsController < ApplicationController
   before_filter :authorize_admin, :except => [:show, :update]
+  before_filter :ensure_account_within_users_limit, :only => [:new, :create]
   skip_before_filter :authenticate, :only => [:show, :update]
   layout Saucy::Layouts.to_proc
 
@@ -53,4 +54,8 @@ class InvitationsController < ApplicationController
       yield
     end
   end
+
+  def ensure_account_within_users_limit
+    ensure_account_within_limit("users")
+  end
 end

data/app/models/limit.rb

@@ -15,7 +15,31 @@ class Limit < ActiveRecord::Base
     where(:name => name).first
   end
 
+  def self.within?(limit_name, account)
+    if account.plan.limit(limit_name)
+      account.plan.limit(limit_name).within?(account)
+    else
+      true
+    end
+  end
+
+  def self.can_add_one?(limit_name, account)
+    if account.plan.limit(limit_name)
+      account.plan.limit(limit_name).can_add_one?(account)
+    else
+      true
+    end
+  end
+
   def allowed?
     value != 0
   end
+
+  def within?(account)
+    account.send(:"#{name}_count") <= value
+  end
+
+  def can_add_one?(account)
+    (account.send(:"#{name}_count") + 1) <= value
+  end
 end

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

@@ -47,3 +47,15 @@ Feature: Manage Projects
     And I should see "Project 2" within "ul.projects"
     But I should not see "Project 3" within "ul.projects"
     And I should not see "Project 4" within "ul.projects"
+
+  Scenario: Create new project when at the account limit
+    Given the following limit exists for the "Test" account:
+      | name     | value |
+      | projects | 1     |
+    And the following project exists:
+      | account       | name      |
+      | name: Test    | Project 1 |
+    When I go to the projects page for the "Test" account
+    And I follow "New Project"
+    Then I should be on the projects page for the "Test" account
+    And I should see "at your limit"

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

@@ -105,3 +105,11 @@ Feature: Managing users
     Then I should see "User removed"
     When I go to the memberships page for the "Test" account
     Then I should not see "Frank"
+
+  Scenario: Invite new user when at the account limit
+    Given the following limit exists for the "Test" account:
+      | name  | value |
+      | users | 1     |
+    When I follow "Invite user"
+    Then I should be on the memberships page for the "Test" account
+    And I should see "at your limit"

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

@@ -9,3 +9,11 @@ Given /^the "([^"]*)" account was created (\d+) days ago$/ do |account_name, day
     account.save!
   end
 end
+
+Given /^the following limit exists for the "([^"]*)" account:$/ do |account_name, table|
+  Account.find_by_name!(account_name).tap do |account|
+    table.hashes.each do |limit|
+      account.plan.limits.create!(limit)
+    end
+  end
+end

data/lib/saucy/account_authorization.rb

@@ -56,6 +56,12 @@ module Saucy
         flash[:alert] = t("saucy.errors.#{failure}.#{role}")
         redirect_to path
       end
+
+      def ensure_account_within_limit(limit_name)
+        if !Limit.can_add_one?(limit_name, current_account)
+          redirect_to :back, :alert => t("saucy.errors.limited", :default => "You are at your limit of %{name} for your current plan.", :name => limit_name)
+        end
+      end
     end
   end
 end

data/lib/saucy/projects_controller.rb

@@ -6,6 +6,7 @@ module Saucy
       before_filter :authorize_member,      :only   => :show
       before_filter :authorize_admin,       :except => [:show]
       before_filter :ensure_active_account, :only   => [:show, :destroy, :index]
+      before_filter :ensure_account_within_projects_limit, :only => [:new, :create]
       layout Saucy::Layouts.to_proc
     end
 
@@ -56,6 +57,10 @@ module Saucy
       def current_project
         @project ||= ::Project.find_by_keyword!(params[:id])
       end
+
+      def ensure_account_within_projects_limit
+        ensure_account_within_limit("projects")
+      end
     end
   end
 end

data/spec/models/limit_spec.rb

@@ -33,3 +33,33 @@ describe Limit, "various kinds" do
     ssl.allowed?.should_not be
   end
 end
+
+describe Limit, "with account and limits" do
+  subject { Factory(:limit, :name => "users", :value => 1) }
+
+  before do
+    @account = Factory(:account, :plan => subject.plan)
+  end
+
+  it "indicates whether the account is below the limit" do
+    subject.within?(@account)
+  end
+
+  it "can query whether the given account is below the specified limit" do
+    Limit.within?("users", @account)
+  end
+
+  it "indicates whether the specified account can add one" do
+    Limit.can_add_one?("users", @account).should be
+   
+    Factory(:membership, :account => @account)
+    Factory(:project, :account => @account)
+
+    Limit.can_add_one?("users", @account).should_not be
+  end
+
+  it "returns true if there is no limit" do
+    Limit.can_add_one?("nomatch", @account).should be
+    Limit.within?("nomatch", @account).should be
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - thoughtbot, inc.