saucy 0.2.25 → 0.2.26

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

@@ -7,13 +7,17 @@ Feature: Manage Projects
     Given the following account exists:
       | name | keyword |
       | Test | test    |
-    And I have signed in with "joe@example.com/test"
+    And the following user exists:
+      | name     | email           |
+      | Joe User | joe@example.com |
     And "joe@example.com" is an admin of the "Test" account
+    And I sign in as "joe@example.com"
 
   Scenario: Create new project
     When I go to the projects page for the "Test" account
     And I follow "New Project"
-    And I fill in "Name" with "Project 1"
+    Then the "Joe User" checkbox should be checked
+    When I fill in "Name" with "Project 1"
     And I fill in "Keyword" with "project1"
     And I should see "http://www.example.com/accounts/test/projects/keyword"
     And I press "Create"

data/lib/saucy/project.rb

@@ -15,14 +15,26 @@ module Saucy
                           :with    => %r{^[a-z0-9]+$},
                           :message => "must be only lower case letters."
 
-      after_create :assign_default_memberships
       after_save :update_memberships
 
-      # We have to define this here instead of mixing it in,
-      # because ActiveRecord does the same
+      # We have to define these here instead of mixing them in,
+      # because ActiveRecord does the same.
+
       def user_ids=(new_user_ids)
         @new_user_ids = new_user_ids.reject { |user_id| user_id.blank? }
       end
+
+      def users
+        if new_record?
+          permissions.map { |permission| permission.membership.user }
+        else
+          permissions.includes(:user).map { |permission| permission.user }
+        end
+      end
+
+      def user_ids
+        users.map(&:id)
+      end
     end
 
     module ClassMethods
@@ -33,6 +45,10 @@ module Saucy
       def by_name
         order("projects.name")
       end
+
+      def build_with_default_permissions
+        new.assign_default_permissions
+      end
     end
 
     module InstanceMethods
@@ -46,14 +62,15 @@ module Saucy
           exists?(:memberships => { :user_id => user.id })
       end
 
-      private
-
-      def assign_default_memberships
+      def assign_default_permissions
         account.memberships.where(:admin => true).each do |membership|
-          self.permissions.create(:membership => membership)
+          self.permissions.build(:membership => membership)
         end
+        self
       end
 
+      private
+
       def update_memberships
         if @new_user_ids
           removed_user_ids = self.user_ids - @new_user_ids

data/lib/saucy/projects_controller.rb

@@ -10,7 +10,7 @@ module Saucy
 
     module InstanceMethods
       def new
-        @project = current_account.projects.build
+        @project = current_account.projects.build_with_default_permissions
       end
 
       def create

data/spec/models/project_spec.rb

@@ -4,7 +4,6 @@ describe Project do
   it { should belong_to(:account) }
   it { should validate_presence_of(:account_id) }
   it { should have_many(:permissions) }
-  it { should have_many(:users).through(:permissions) }
   it { should validate_presence_of(:keyword) }
   it { should validate_presence_of(:name) }
 
@@ -50,13 +49,26 @@ describe Project, "keyword uniqueness" do
   end
 end
 
+share_examples_for "default project permissions" do
+  it "is viewable by admins by default" do
+    admins.each do |admin|
+      subject.users.should include(admin)
+    end
+  end
+
+  it "isn't viewable by non-members" do
+    subject.users.should_not include(non_admin)
+    subject.users.should_not include(non_member)
+  end
+end
+
 describe Project, "for an account with admin and non-admin users" do
   let!(:account)       { Factory(:account, :name => "Account") }
   let!(:other_account) { Factory(:account, :name => "Other") }
   let!(:non_admin)     { Factory(:user) }
   let!(:admins)        { [Factory(:user), Factory(:user)] }
   let!(:non_member)    { Factory(:user) }
-  subject              { Factory(:project, :account => account) }
+  subject              { Factory.build(:project, :account => account) }
 
   before do
     Factory(:membership, :account => account, :user => non_admin, :admin => false)
@@ -66,21 +78,21 @@ describe Project, "for an account with admin and non-admin users" do
     admins.each do |admin|
       Factory(:membership, :user => admin, :account => account, :admin => true)
     end
+
+    subject.assign_default_permissions 
   end
 
-  it "has users" do
-    subject.users.should_not be_empty
+  context "before saving" do
+    it_behaves_like "default project permissions"
   end
 
-  it "is viewable by admins by default" do
-    admins.each do |admin|
-      should have_member(admin)
+  context "after saving" do
+    before do
+      subject.save!
+      subject.reload
     end
-  end
 
-  it "isn't viewable by non-members" do
-    should_not have_member(non_admin)
-    should_not have_member(non_member)
+    it_behaves_like "default project permissions"
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 2
-  - 25
-  version: 0.2.25
+  - 26
+  version: 0.2.26
 platform: ruby
 authors: 
 - thoughtbot, inc.