saucy 0.2.41 → 0.2.42

data/lib/saucy/project.rb

@@ -15,7 +15,9 @@ module Saucy
                           :with    => %r{^[a-z0-9]+$},
                           :message => "must be only lower case letters."
 
-      after_save :update_memberships
+
+      after_create :setup_memberships
+      after_update :update_memberships
 
       # We have to define these here instead of mixing them in,
       # because ActiveRecord does the same.
@@ -71,21 +73,24 @@ module Saucy
 
       private
 
-      def update_memberships
-        if @new_user_ids
-          @new_user_ids += admin_user_ids
-          removed_user_ids = self.user_ids - @new_user_ids
-          added_user_ids = @new_user_ids - self.user_ids
-
-          permissions.where(:user_id => removed_user_ids).destroy_all
-          added_user_ids.each do |added_user_id|
-            membership =
-              account.memberships.where(:user_id => added_user_id).first
-            permissions.create!(:membership => membership)
-          end
+      def setup_memberships
+        @new_user_ids ||= []
+        @new_user_ids += admin_user_ids
+        removed_user_ids = self.user_ids - @new_user_ids
+        added_user_ids = @new_user_ids - self.user_ids
+
+        permissions.where(:user_id => removed_user_ids).destroy_all
+        added_user_ids.each do |added_user_id|
+          membership =
+            account.memberships.where(:user_id => added_user_id).first
+          permissions.create!(:membership => membership)
         end
       end
 
+      def update_memberships
+        setup_memberships if @new_user_ids
+      end
+
       def admin_user_ids
         account.
           memberships.

data/spec/models/project_spec.rb

@@ -114,7 +114,7 @@ describe Project, "saved" do
   end
 end
 
-describe Project, "assigning a new user list" do
+describe Project, "assigning users on update" do
   subject { Factory(:project) }
 
   let(:account) { subject.account }
@@ -147,3 +147,24 @@ describe Project, "assigning a new user list" do
     admin.should be_member_of(subject)
   end
 end
+
+describe Project, "assigning users on create" do
+  subject       { Factory.build(:project) }
+  let(:account) { subject.account }
+  let!(:member) { Factory(:user) }
+  let!(:admin)  { Factory(:user) }
+
+  before do
+    Factory(:membership, :account => account, :user => member)
+    Factory(:membership, :account => account, :user => admin, :admin => true)
+    subject.save
+  end
+
+  it "adds admins to the project" do
+    admin.should be_member_of(subject)
+  end
+
+  it "ignores normal users" do
+    member.should_not be_member_of(subject)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 69
-  prerelease: false
+  hash: 67
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 41
-  version: 0.2.41
+  - 42
+  version: 0.2.42
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -22,7 +22,8 @@ date: 2011-03-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +33,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :runtime
-  name: formtastic
+  requirement: *id001
   prerelease: false
-  version_requirements: *id001
+  name: formtastic
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +49,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
-  name: railties
+  requirement: *id002
   prerelease: false
-  version_requirements: *id002
+  name: railties
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  type: :runtime
-  name: braintree
+  requirement: *id003
   prerelease: false
-  version_requirements: *id003
+  name: braintree
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,12 +81,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
-  name: sham_rack
+  requirement: *id004
   prerelease: false
-  version_requirements: *id004
+  name: sham_rack
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,12 +97,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
-  name: sinatra
+  requirement: *id005
   prerelease: false
-  version_requirements: *id005
+  name: sinatra
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,10 +113,9 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :development
-  name: aruba
+  requirement: *id006
   prerelease: false
-  version_requirements: *id006
+  name: aruba
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS