saucy 0.4.10 → 0.5.0

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+0.5.0
+
+Added the ability to archive projects. Archived projects are not included in
+an accounts `projects_count`.
+
+To upgrade to this version add the following column to the projects table:
+
+    add_column :projects, :archived, :default => false, :null => false
+
+This version adds a list of archived projects to the projects index of an
+account. An introduced headers to these two lists. Archived projects have
+a "View Project" link, which is how the user can view an archived project. 
+You will probably want to style this list, headers, and link.
+
+It also adds an Archive link on the project's edit page. You will probably
+want to style this link.
+
+It is up to your application to provide any additional logic about what
+limitations are present for archived projects (for example, not being able to
+create new comments on them).
+
+0.4.10
+
+A user following an invite link who is already signed in and whose email
+address matches the one in the invite automatically accepts the invite when
+following the link.

data/app/controllers/archives_controller.rb

@@ -0,0 +1,27 @@
+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/app/views/projects/edit.html.erb

@@ -3,6 +3,15 @@
 <% 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/app/views/projects/index.html.erb

@@ -4,12 +4,25 @@
 
 <%= render :partial => 'accounts/subnav' %>
 
-<ul class="projects">
-  <% @projects.each do |project| -%>
+<h3>Active Projects</h3>
+<ul class="projects active">
+  <% @active_projects.each do |project| -%>
     <%= content_tag_for :li, project do -%>
-      <%= link_to h(project.name), edit_project_path(project) %>
+      <%= link_to h(project.name), edit_project_path(project), :class => "edit" %>
     <% end -%>
   <% end -%>
 </ul>
 
 <%= link_to 'New Project', new_account_project_path(current_account), :class => "button" %>
+
+<% if @archived_projects.any? -%>
+  <h3>Archived Projects</h3>
+  <ul class="projects archived">
+    <% @archived_projects.each do |project| -%>
+      <%= content_tag_for :li, project do -%>
+        <%= link_to h(project.name), edit_project_path(project), :class => "edit" %>
+        <%= link_to "View Project", project_path(project), :class => "view" %>
+      <% end -%>
+    <% end -%>
+  </ul>
+<% end -%>

data/config/routes.rb

@@ -6,7 +6,9 @@ Rails.application.routes.draw do
   through :accounts do
     resource  :billing
     resource  :plan
-    resources :projects
+    resources :projects do
+      resource :archive, :only => [:create, :destroy]
+    end
     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

@@ -34,17 +34,53 @@ Feature: Manage Projects
     And I press "Update"
     Then I should see "Name Change"
 
+  Scenario: Archive a project
+    Given the following project exists:
+      | account    | name      |
+      | 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 should see "Project 1" within "ul.projects.archived"
+
+  Scenario: Unarchive a project
+    Given the following project exists:
+      | account    | name      | archived |
+      | 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 should see "Project 1" within "ul.projects.active"
+
+  Scenario: Unarchive a project when at the account limit
+    Given the following limit exists for the "Test" account:
+      | name     | value |
+      | projects | 1     |
+    And the following projects exist:
+      | account       | name      | archived |
+      | name: Test    | Project 1 | false    |
+      | 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"
+    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" 
+    And I should see "Project 2" within "ul.projects.archived"
+
   Scenario: View all projects
     Given the following projects exist:
-      | account       | name      |
-      | name: Test    | Project 1 |
-      | name: Test    | Project 2 |
-      | name: Other   | Project 3 |
-      | name: Another | Project 4 |
+      | account       | name      | archived |
+      | name: Test    | Project 1 | false    |
+      | name: Test    | Project 2 | false    |
+      | name: Test    | Project 3 | true     |
+      | name: Other   | Project 3 | false    |
+      | name: Another | Project 4 | false    |
     And "joe@example.com" is a member of the "Other" account
     When I go to the projects page for the "Test" account
-    Then I should see "Project 1" within "ul.projects"
-    And I should see "Project 2" within "ul.projects"
+    Then I should see "Project 1" within "ul.projects.active"
+    And I should see "Project 2" within "ul.projects.active"
+    And I should see "Project 3" within "ul.projects.archived"
     But I should not see "Project 3" within "ul.projects"
     And I should not see "Project 4" within "ul.projects"
 

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

@@ -59,6 +59,7 @@ class CreateSaucyTables < ActiveRecord::Migration
       table.string   :name
       table.string   :keyword
       table.integer  :account_id
+      table.boolean  :archived, :default => false, :null => false
       table.datetime :created_at
       table.datetime :updated_at
     end

data/lib/saucy/account.rb

@@ -77,7 +77,7 @@ module Saucy
       end
 
       def projects_count
-        projects.count
+        projects.active.count
       end
     end
 

data/lib/saucy/project.rb

@@ -44,6 +44,14 @@ module Saucy
         where(['projects.id IN(?)', user.project_ids])
       end
 
+      def archived
+        where(:archived => true)
+      end
+
+      def active
+        where(:archived => false)
+      end
+
       def by_name
         order("projects.name")
       end

data/lib/saucy/projects_controller.rb

@@ -50,7 +50,8 @@ module Saucy
       end
 
       def index
-        @projects = current_account.projects
+        @active_projects = current_account.projects.active
+        @archived_projects = current_account.projects.archived
       end
 
       private

data/spec/controllers/archives_controller_spec.rb

@@ -0,0 +1,41 @@
+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

data/spec/controllers/projects_controller_spec.rb

@@ -104,6 +104,7 @@ describe ProjectsController, "index", :as => :account_admin do
   let(:projects) { ['one', 'two'] }
 
   before do
+    projects.stubs(:archived => projects, :active => projects)
     Account.stubs(:find_by_keyword! => account)
     account.stubs(:projects => projects)
     get :index, :account_id => account.to_param
@@ -115,8 +116,9 @@ describe ProjectsController, "index", :as => :account_admin do
   end
 
   it "assigns projects" do
-    account.should have_received(:projects)
-    should assign_to(:projects).with(projects)
+    account.should have_received(:projects).times(2)
+    should assign_to(:active_projects).with(projects)
+    should assign_to(:archived_projects).with(projects)
   end
 end
 

data/spec/models/account_spec.rb

@@ -87,8 +87,9 @@ describe Account do
     subject.users_count.should == 1
   end
 
-  it "has a count of projects" do
-    Factory(:project, :account => subject)
+  it "has a count of active projects" do
+    Factory(:project, :account => subject, :archived => false)
+    Factory(:project, :account => subject, :archived => true)
     subject.projects_count.should == 1
   end
 

data/spec/models/project_spec.rb

@@ -36,6 +36,21 @@ describe Project do
     Project.by_name.map(&:name).should == %w(abc def ghi)
   end
 
+  context "archived and non-archived projects" do
+    before do
+      @archived = [Factory(:project, :archived => true), Factory(:project, :archived => true)]
+      @active = [Factory(:project, :archived => false)]
+    end
+
+    it "returns only archived projects with archived" do
+      Project.archived.all.should == @archived
+    end
+
+    it "returns only active projects with active" do
+      Project.active.all.should == @active
+    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: 27
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 10
-  version: 0.4.10
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -125,6 +125,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -132,6 +133,7 @@ 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
@@ -238,6 +240,7 @@ 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