saucy 0.8.1 → 0.8.2

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+0.8.2
+
+Added a uniqueness validation and database constraint for member_id/project_id on permissions. This prevents somebody from being added to the same project twice, which would display it multiple times in the project index and dropdown. When upgrading, make sure this index is in place:
+
+    remove_index :permissions, :name => [:membership_and_project]
+    add_index :permissions, [:membership_id, :project_id], :name => [:membership_and_project], :unique => true
+
+You'll need to make sure that no existing duplicates exist before applying the unique index.
+
+0.8.1
+
+Fixed a missing translation key.
+
 0.8.0
 
 Added a notification for trials that just ended. When upgrading, you'll need to

data/app/models/permission.rb

@@ -5,6 +5,8 @@ class Permission < ActiveRecord::Base
 
   before_validation :assign_user_id_from_membership
 
+  validates_uniqueness_of :membership_id, :scope => :project_id
+
   def user=(ignored)
     raise NotImplementedError, "Use Permission#membership= instead"
   end

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

@@ -55,7 +55,7 @@ class CreateSaucyTables < ActiveRecord::Migration
     end
 
     add_index :permissions, [:user_id, :project_id]
-    add_index :permissions, [:membership_id, :project_id], :name => [:membership_and_project]
+    add_index :permissions, [:membership_id, :project_id], :name => [:membership_and_project], :unique => true
 
     create_table :projects do |table|
       table.string   :name

data/spec/models/permission_spec.rb

@@ -5,10 +5,21 @@ describe Permission do
   it { should belong_to(:membership) }
   it { should belong_to(:user) }
 
+  it "doesn't allow the same member to be added to a project twice" do
+    original = Factory(:permission)
+    duplicate = Factory.build(:permission, :membership => original.membership, :project => original.project)
+    duplicate.should_not be_valid
+  end
+
+  it "allows different members to be added to a project" do
+    original = Factory(:permission)
+    duplicate = Factory.build(:permission, :project => original.project)
+    duplicate.should be_valid
+  end
+
   it "caches the user from the account membership" do
     membership = Factory(:membership)
-    permission = Factory(:permission,
-                                 :membership => membership)
+    permission = Factory(:permission, :membership => membership)
     permission.user_id.should == membership.user_id
   end
 

data/spec/models/project_spec.rb

@@ -171,29 +171,29 @@ describe Project, "assigning users on update" do
   subject { Factory(:project) }
 
   let(:account) { subject.account }
-  let!(:member) { Factory(:user) }
-  let!(:non_member) { Factory(:user) }
+  let!(:user_to_remove) { Factory(:user) }
+  let!(:user_to_add) { Factory(:user) }
   let!(:admin) { Factory(:user) }
 
   before do
-    member_membership =
-      Factory(:membership, :account => account, :user => member)
-    non_member_membership =
-      Factory(:membership, :account => account, :user => non_member)
+    membership_to_remove =
+      Factory(:membership, :account => account, :user => user_to_remove)
+    membership_to_add =
+      Factory(:membership, :account => account, :user => user_to_add)
     admin_membership =
       Factory(:membership, :account => account, :user => admin, :admin => true)
-    Factory(:permission, :membership => member_membership,
+    Factory(:permission, :membership => membership_to_remove,
                          :project    => subject)
 
-    subject.reload.update_attributes!(:user_ids => [non_member.id, ""])
+    subject.reload.update_attributes!(:user_ids => [user_to_add.id, ""])
   end
 
   it "adds an added user" do
-    member.should_not be_member_of(subject)
+    user_to_add.should be_member_of(subject)
   end
 
   it "removes a removed user" do
-    non_member.should be_member_of(subject)
+    user_to_remove.should_not be_member_of(subject)
   end
 
   it "keeps an admin" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -04:00
+date: 2011-06-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency