saucy 0.5.3 → 0.5.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.5.4
+
+Changes from an archive project link to a checkbox on the project form.
+
 0.5.3
 
 Removes uniqueness constraint on account names

data/app/views/projects/_form.html.erb

@@ -1,6 +1,9 @@
 <%= form.inputs do %>
   <%= form.input :name, :hint => project_url(Project.new(:account => current_account, :keyword => 'keyword')).html_safe %>
   <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
+  <% if form.object.persisted? -%>
+    <%= form.input :archived, :hint => t('project.archived.hint', :default => "Archived project don't count against your project total. You cannot create or edit stories or discussions.") %>
+  <% end -%>
   <%= form.input :users, :label        => "Admins",
                          :as           => :check_boxes,
                          :collection   => admins,

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

@@ -3,15 +3,6 @@
 <% end -%>
 
 <div class="actions">
-  <% if !@project.archived? -%>
-    <%= link_to account_project_archive_path(@project.account, @project), :method  => 'post', :confirm => 'Are you sure you want to archive this project?', :class => 'action' do %>
-      <span class="archive_item">Archive this project</span>
-    <% end -%>
-  <% else -%>
-    <%= link_to account_project_archive_path(@project.account, @project), :method  => 'delete', :class => 'action' do %>
-      <span class="unarchive_item">Unarchive this project</span>
-    <% end -%>
-  <% end -%>
   <%= link_to project_path(@project), :method  => 'delete', :confirm => 'Are you sure you want to delete this project and all associated content?', :class => 'action' do %>
     <span class="delete_item">Remove this project</span>
   <% end -%>

data/config/routes.rb

@@ -6,9 +6,7 @@ Rails.application.routes.draw do
   through :accounts do
     resource  :billing
     resource  :plan
-    resources :projects do
-      resource :archive, :only => [:create, :destroy]
-    end
+    resources :projects
     resources :memberships, :only => [:index, :edit, :update, :destroy]
     resources :invitations, :only => [:show, :update, :new, :create]
   end

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

@@ -40,7 +40,8 @@ Feature: Manage Projects
       | name: Test | Project 1 |
     When I go to the projects page for the "Test" account
     And I follow "Project 1" within "ul.projects"
-    And I follow "Archive this project"
+    And I check "Archived"
+    And I press "Update"
     And I should see "Project 1" within "ul.projects.archived"
 
   Scenario: Unarchive a project
@@ -49,7 +50,8 @@ Feature: Manage Projects
       | name: Test | Project 1 | true     |
     When I go to the projects page for the "Test" account
     And I follow "Project 1" within "ul.projects.archived"
-    And I follow "Unarchive this project"
+    And I uncheck "Archived"
+    And I press "Update"
     And I should see "Project 1" within "ul.projects.active"
 
   Scenario: Unarchive a project when at the account limit
@@ -62,7 +64,8 @@ Feature: Manage Projects
       | name: Test    | Project 2 | true     |
     When I go to the projects page for the "Test" account
     And I follow "Project 2"
-    And I follow "Unarchive this project"
+    And I uncheck "Archived"
+    And I press "Update"
     Then I should see "at your limit"
     When I go to the projects page for the "Test" account
     And I should see "Project 1" within "ul.projects.active" 

data/lib/saucy/project.rb

@@ -16,6 +16,8 @@ module Saucy
                           :message => "must be only lower case letters or underscores."
 
 
+      validate :ensure_account_within_limit, :on => :update
+
       after_create :setup_memberships
       after_update :update_memberships
 
@@ -106,6 +108,12 @@ module Saucy
           select(:user_id).
           map(&:user_id)
       end
+
+      def ensure_account_within_limit
+        if archived_changed? && !archived? && !Limit.can_add_one?("projects", account)
+          errors.add(:archived, I18n.t("saucy.errors.limited", :default => "You are at your limit of %{name} for your current plan.", :name => 'projects'))
+        end
+      end
     end
   end
 end

data/spec/models/project_spec.rb

@@ -51,6 +51,20 @@ describe Project do
     end
   end
 
+  context "archived project for an account at its project limit" do
+    before do
+      @archived = Factory(:project, :archived => true)
+      @account = @archived.account
+      Limit.stubs(:can_add_one?).with("projects", @account).returns(false)
+    end
+
+    it "cannot be unarchived" do
+      @archived.archived = false
+      @archived.save.should_not be
+      @archived.errors[:archived].first.should match(/at your limit/)
+    end
+  end
+
   it "should give its keyword for to_param" do
     project = Factory(:project)
     project.to_param.should == project.keyword

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -04:00
+date: 2011-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,6 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - app/controllers/accounts_controller.rb
-- app/controllers/archives_controller.rb
 - app/controllers/billings_controller.rb
 - app/controllers/invitations_controller.rb
 - app/controllers/memberships_controller.rb
@@ -240,7 +239,6 @@ files:
 - lib/generators/saucy/features/templates/README
 - spec/controllers/accounts_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
-- spec/controllers/archives_controller_spec.rb
 - spec/controllers/invitations_controller_spec.rb
 - spec/controllers/memberships_controller_spec.rb
 - spec/controllers/plans_controller_spec.rb

data/app/controllers/archives_controller.rb

@@ -1,27 +0,0 @@
-class ArchivesController < ApplicationController
-  before_filter :authenticate
-  before_filter :authorize_admin
-  before_filter :ensure_account_within_projects_limit
-
-  def create
-    @project = current_project
-    @project.archived = true
-    @project.save
-    flash[:success] = "Project has been archived"
-    redirect_to account_projects_url(current_project.account)
-  end
-
-  def destroy
-    @project = current_project
-    @project.archived = false
-    @project.save
-    flash[:success] = "Project unarchived"
-    redirect_to account_projects_url(current_project.account)
-  end
-
-  private
-
-  def ensure_account_within_projects_limit
-    ensure_account_within_limit("projects")
-  end
-end

data/spec/controllers/archives_controller_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe ArchivesController, "routes" do
-  it { should route(:delete, "/accounts/abc/projects/def/archive").
-                to(:action => :destroy, :account_id => 'abc', :project_id => 'def') }
-  it { should route(:post, "/accounts/abc/projects/def/archive").
-                to(:action => :create, :account_id => 'abc', :project_id => 'def') }
-end
-
-describe ArchivesController, "destroy", :as => :project_admin do
-  before do
-    delete :destroy, :project_id => project.to_param, :account_id => account.to_param
-  end
-
-  it { should set_the_flash.to(/unarchived/) }
-
-  it "should redirect to account_projects_url" do
-    should redirect_to(account_projects_url(account))
-  end
-end
-
-describe ArchivesController, "archive", :as => :project_admin do
-  before do
-    post :create, :project_id => project.to_param, :account_id => account.to_param
-  end
-
-  it { should set_the_flash.to(/archived/) }
-
-  it "should redirect to account_projects_url" do
-    should redirect_to(account_projects_url(account))
-  end
-end
-
-describe ArchivesController, "as a non-admin", :as => :project_member do
-  it { should deny_access.on(:delete, :destroy, :project_id => project.to_param,
-                                                :account_id => account.to_param).
-                          flash(/admin/) }
-
-  it { should deny_access.on(:post, :create, :account_id => account.to_param, :project_id => project.to_param).
-                          flash(/admin/) }
-end