saucy 0.1.5 → 0.1.6

data/app/controllers/invitations_controller.rb

@@ -4,6 +4,7 @@ class InvitationsController < ApplicationController
   layout Saucy::Layouts.to_proc
 
   def new
+    assign_projects
     @invitation = Invitation.new
     render
   end
@@ -15,6 +16,7 @@ class InvitationsController < ApplicationController
       flash[:success] = "User invited."
       redirect_to account_memberships_url(current_account)
     else
+      assign_projects
       render :action => 'new'
     end
   end
@@ -33,4 +35,10 @@ class InvitationsController < ApplicationController
       render :action => 'show'
     end
   end
+
+  private
+
+  def assign_projects
+    @projects = current_account.projects_by_name
+  end
 end

data/app/models/invitation.rb

@@ -2,6 +2,7 @@ class Invitation < ActiveRecord::Base
   belongs_to :account
   validates_presence_of :account_id
   validates_presence_of :email
+  has_and_belongs_to_many :projects
 
   after_create :deliver_invitation
 
@@ -22,7 +23,9 @@ class Invitation < ActiveRecord::Base
     @user = existing_user || new_user
     if valid?
       @user.save!
-      @user.memberships.create!(:account => account, :admin => admin)
+      @user.memberships.create!(:account  => account,
+                                :admin    => admin,
+                                :projects => projects)
     end
   end
 

data/app/views/invitations/new.html.erb

@@ -2,6 +2,7 @@
   <%= form.inputs do -%>
     <%= form.input :email %>
     <%= form.input :admin, :label => "Grant administrator privileges" %>
+    <%= form.input :projects, :as => :check_boxes, :collection => @projects %>
   <% end -%>
 
   <%= form.buttons do -%>

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

@@ -7,10 +7,15 @@ Feature: Managing users
     Given an account exists with a name of "Test"
     And I am signed in as an admin of the "Test" account
     And I am on the memberships page for the "Test" account
+    And the following projects exist:
+      | account    | name          |
+      | name: Test | See me        |
+      | name: Test | Can't find me |
 
   Scenario: Invite new users
     When I follow "Invite user"
     And I fill in "Email" with "invitee@example.com"
+    And I check "See me"
     And I press "Invite User"
     Then I should see "invited"
     When I sign out
@@ -21,7 +26,9 @@ Feature: Managing users
       | Confirm password | secret |
     And I press "Accept Invitation"
     Then I should be signed in
+    And "invitee@example.com" should be a member of the "See me" project
     And "invitee@example.com" should be a member of the "Test" account
+    But "invitee@example.com" should not be a member of the "Can't find me" project
     When I go to the settings page
     Then the "Name" field should contain "Billy"
 

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

@@ -54,3 +54,11 @@ Then /^"([^"]*)" should be an admin member of the "([^"]*)" account$/ do |email,
   User.find_by_email!(email).should be_admin_of(Account.find_by_name!(account_name))
 end
 
+Then /^"([^"]*)" should be a member of the "([^"]*)" project/ do |email, project_name|
+  User.find_by_email!(email).should be_member_of(Project.find_by_name!(project_name))
+end
+
+Then /^"([^"]*)" should not be a member of the "([^"]*)" project/ do |email, project_name|
+  User.find_by_email!(email).should_not  be_member_of(Project.find_by_name!(project_name))
+end
+

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

@@ -59,10 +59,18 @@ class CreateSaucyTables < ActiveRecord::Migration
     end
 
     add_index :plans, :name
+
+    create_table :invitations_projects, :id => false do |table|
+      table.integer :invitation_id, :null => false
+      table.integer :project_id, :null => false
+    end
+
+    add_index :invitations_projects, [:invitation_id, :project_id], :unique => true
   end
 
   def self.down
     remove_column :users, :name
+    drop_table :invitations_projects
     drop_table :plans
     drop_table :projects
     drop_table :permissions

data/spec/controllers/invitations_controller_spec.rb

@@ -24,8 +24,11 @@ end
 
 describe InvitationsController, "new", :as => :account_admin do
   let(:invitation) { Invitation.new }
+  let(:projects) { ['one', 'two'] }
 
   before do
+    Account.stubs(:find_by_url! => account)
+    account.stubs(:projects_by_name => projects)
     Invitation.stubs(:new => invitation)
     get :new, :account_id => account.to_param
   end
@@ -39,6 +42,10 @@ describe InvitationsController, "new", :as => :account_admin do
     Invitation.should have_received(:new)
     should assign_to(:invitation).with(invitation)
   end
+
+  it "assigns projects" do
+    should assign_to(:projects).with(projects)
+  end
 end
 
 describe InvitationsController, "valid create", :as => :account_admin do
@@ -69,10 +76,13 @@ end
 
 describe InvitationsController, "invalid create", :as => :account_admin do
   let(:invitation) { Factory.stub(:invitation) }
+  let(:projects) { ['one', 'two'] }
 
   before do
     Invitation.stubs(:new => invitation)
     invitation.stubs(:save => false)
+    Account.stubs(:find_by_url! => account)
+    account.stubs(:projects_by_name => projects)
     post :create, :account_id => account.to_param, :invitation => {}
   end
 
@@ -84,6 +94,10 @@ describe InvitationsController, "invalid create", :as => :account_admin do
   it "doesn't set a flash message" do
     should_not set_the_flash
   end
+
+  it "assigns projects" do
+    should assign_to(:projects).with(projects)
+  end
 end
 
 describe InvitationsController, "show" do

data/spec/environment.rb

@@ -7,6 +7,8 @@ require 'clearance'
 require 'factory_girl'
 require 'bourne'
 
+FileUtils.rm_f(File.join(PROJECT_ROOT, 'tmp', 'test.sqlite3'))
+
 class ApplicationController < ActionController::Base
   include Clearance::Authentication
   include Saucy::AccountAuthorization
@@ -85,7 +87,6 @@ end
 Clearance.configure do |config|
 end
 
-FileUtils.rm_f(File.join(PROJECT_ROOT, 'tmp', 'test.sqlite3'))
 ClearanceCreateUsers.suppress_messages { ClearanceCreateUsers.migrate(:up) }
 CreateSaucyTables.suppress_messages { CreateSaucyTables.migrate(:up) }
 

data/spec/models/invitation_spec.rb

@@ -4,6 +4,8 @@ describe Invitation do
   it { should validate_presence_of(:account_id) }
   it { should validate_presence_of(:email) }
   it { should belong_to(:account) }
+  it { should have_and_belong_to_many(:projects) }
+
   it { should_not allow_mass_assignment_of(:account_id) }
 
   %w(new_user_name new_user_email new_user_password
@@ -40,9 +42,11 @@ describe Invitation, "saved" do
 end
 
 describe Invitation, "valid accept for a new user" do
+  let(:account)  { Factory(:account) }
+  let(:projects) { [Factory(:project, :account => account)] }
   let(:password) { 'secret' }
   let(:name)     { 'Rocket' }
-  subject { Factory(:invitation) }
+  subject { Factory(:invitation, :account => account, :projects => projects) }
 
   let!(:result) do
     subject.accept(:new_user_password              => password,
@@ -51,7 +55,6 @@ describe Invitation, "valid accept for a new user" do
   end
 
   let(:user) { subject.user }
-  let(:account) { subject.account }
 
   it "returns true" do
     result.should be_true
@@ -67,6 +70,12 @@ describe Invitation, "valid accept for a new user" do
   it "adds the user to the account" do
     account.users.should include(user)
   end
+
+  it "adds the user to each of the invitation's projects" do
+    projects.each do |project|
+      user.should be_member_of(project)
+    end
+  end
 end
 
 describe Invitation, "invalid accept for a new user" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - thoughtbot, inc.