saucy 0.2.35 → 0.2.36

data/app/views/projects/_form.html.erb

@@ -1,7 +1,12 @@
 <%= form.inputs do %>
   <%= form.input :name, :hint => project_url(Project.new(:account => current_account, :keyword => 'keyword')).html_safe %>
   <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
-  <%= form.input :users, :as => :check_boxes, :collection => users %>
+  <%= form.input :users, :label        => "Admins",
+                         :as           => :check_boxes,
+                         :collection   => admins,
+                         :wrapper_html => { :id => "project_admins_input" },
+                         :input_html   => { :disabled => true } %>
+  <%= form.input :users, :as => :check_boxes, :collection => non_admins %>
 <% end %>
 
 <%= render :partial => "shared/saucy_javascript" %>

data/app/views/projects/edit.html.erb

@@ -12,7 +12,9 @@
 <%= render :partial => 'accounts/tab_bar' %>
 
 <%= semantic_form_for @project do |form| %>
-  <%= render 'form', :form => form, :users => current_account.users %>
+  <%= render 'form', :form       => form,
+                     :non_admins => current_account.non_admins,
+                     :admins     => current_account.admins %>
 
   <%= form.buttons do %>
     <%= form.commit_button %>

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

@@ -5,9 +5,11 @@
 <%= render :partial => 'accounts/tab_bar' %>
 
 <%= semantic_form_for(@project, :url => account_projects_url(current_account)) do |form| %>
-  <%= render 'form', :form => form, :users => current_account.users %>
+  <%= render 'form', :form       => form,
+                     :non_admins => current_account.non_admins,
+                     :admins     => current_account.admins %>
   <%= form.buttons do -%>
     <%= form.commit_button %>
     <%= link_to 'Cancel', account_projects_path(current_account) %>
   <% end -%>
-<% end -%>
+<% end -%>

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

@@ -13,14 +13,17 @@ Feature: edit permissions for a project
       | Bill | bill@example.com |
       | Jane | jane@example.com |
       | Jeff | jeff@example.com |
+      | Hank | hank@example.com |
     And I am signed in as an admin of the "Stocknames" project
     And "bill@example.com" is a member of the "Stocknames" project
     And "jane@example.com" is a member of the "thoughtbot" account
+    And "hank@example.com" is an admin of the "Stocknames" project
     When I go to the settings page for the "thoughtbot" account
     And I follow "Projects" within ".tabs"
     And I follow "Stocknames" within "ul.projects"
-    Then the "Bill" checkbox should be checked
-    And the "Jane" checkbox should not be checked
+    Then "Bill" should be listed as a member
+    And "Hank" should be listed as an admin
+    And "Jane" should be listed as a non-member
     And I should not see "Jeff"
     When I check "Jane"
     And I uncheck "Bill"

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

@@ -5,6 +5,15 @@ Given /^"([^"]*)" is a member of the "([^"]*)" project$/ do |email, project_name
   Factory(:permission, :membership => membership, :project => project)
 end
 
+Given /^"([^"]*)" is an admin of the "([^"]*)" project$/ do |email, project_name|
+  user = User.find_by_email!(email)
+  project = Project.find_by_name!(project_name)
+  membership = Factory(:membership, :user    => user,
+                                    :account => project.account,
+                                    :admin   => true)
+  Factory(:permission, :membership => membership, :project => project)
+end
+
 Given /^"([^"]*)" is a member of the "([^"]*)" account/ do |email, account_name|
   user = User.find_by_email!(email)
   account = Account.find_by_name!(account_name)
@@ -60,3 +69,27 @@ Then /^"([^"]*)" should not be a member of the "([^"]*)" project/ do |email, pro
   User.find_by_email!(email).should_not  be_member_of(Project.find_by_name!(project_name))
 end
 
+Then /^"([^"]+)" should be listed as an admin$/ do |name|
+  within("#project_admins_input") do
+    check_box = find_field(name)
+    check_box['checked'].should be_true
+    check_box['disabled'].should be_true
+  end
+end
+
+Then /^"([^"]+)" should be listed as a member/ do |name|
+  within("#project_users_input") do
+    check_box = find_field(name)
+    check_box['checked'].should be_true
+    check_box['disabled'].should be_false
+  end
+end
+
+Then /^"([^"]+)" should be listed as a non-member/ do |name|
+  within("#project_users_input") do
+    check_box = find_field(name)
+    check_box['checked'].should be_false
+    check_box['disabled'].should be_false
+  end
+end
+

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

@@ -3,7 +3,7 @@ class CreateSaucyTables < ActiveRecord::Migration
     create_table :memberships do |table|
       table.integer  :account_id
       table.integer  :user_id
-      table.boolean  :admin
+      table.boolean  :admin, :null => false, :default => false
       table.datetime :created_at
       table.datetime :updated_at
     end
@@ -34,7 +34,7 @@ class CreateSaucyTables < ActiveRecord::Migration
     create_table :invitations do |table|
       table.string   :email
       table.integer  :account_id
-      table.boolean  :admin
+      table.boolean  :admin, :null => false, :default => false
       table.string   :code
       table.boolean  :used, :default => false, :null => false
       table.datetime :created_at

data/lib/saucy/account.rb

@@ -11,6 +11,9 @@ module Saucy
       has_many :admins, :through    => :memberships,
                         :source     => :user,
                         :conditions => { 'memberships.admin' => true }
+      has_many :non_admins, :through    => :memberships,
+                            :source     => :user,
+                            :conditions => { 'memberships.admin' => false }
 
       belongs_to :plan
 

data/spec/models/account_spec.rb

@@ -45,6 +45,20 @@ describe Account do
     result.to_a.should =~ admins
   end
 
+  it "finds non admin users" do
+    non_admins = [Factory(:user), Factory(:user)]
+    admin = Factory(:user)
+    non_member = Factory(:user)
+    non_admins.each do |non_admin|
+      Factory(:membership, :user => non_admin, :account => subject, :admin => false)
+    end
+    Factory(:membership, :user => admin, :account => subject, :admin => true)
+
+    result = subject.non_admins
+
+    result.to_a.should =~ non_admins
+  end
+
   it "finds emails for admin users" do
     admins = [Factory(:user), Factory(:user)]
     non_admin = Factory(:user)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 95
   prerelease: 
   segments: 
   - 0
   - 2
-  - 35
-  version: 0.2.35
+  - 36
+  version: 0.2.36
 platform: ruby
 authors: 
 - thoughtbot, inc.