saucy 0.1.3 → 0.1.4

data/Gemfile

@@ -2,7 +2,21 @@ source "http://rubygems.org"
 gem "cucumber"
 gem "aruba"
 gem "rake"
-gem "rspec", :require => false
+gem "rspec-rails", :require => false
 gem "rails", ">= 3.0.3"
 gem "thin"
+gem "clearance", "0.9.0.rc9", :require => false
+gem "shoulda", :require => false
+gem "bourne", :require => false
+gem "sqlite3-ruby", :require => false
+gem "factory_girl", :require => false
+
+# used by the rails app in cucumber
+gem "cucumber-rails", :require => false
+gem "capybara", :require => false
+gem "factory_girl_rails", :require => false
+gem "formtastic", :require => false
+gem "database_cleaner", :require => false
+gem "dynamic_form", :require => false
+gem "launchy", :require => false
 

data/Gemfile.lock

@@ -33,29 +33,68 @@ GEM
       background_process
       cucumber (~> 0.9.4)
     background_process (1.2)
+    bourne (1.0)
+      mocha (= 0.9.8)
     builder (2.1.2)
+    capybara (0.4.0)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.2)
+    celerity (0.8.5)
+    childprocess (0.1.4)
+      ffi (~> 0.6.3)
+    clearance (0.9.0.rc9)
+      rails (~> 3.0.0)
+    configuration (1.2.0)
     cucumber (0.9.4)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
       gherkin (~> 2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.12)
     daemons (1.1.0)
+    database_cleaner (0.6.0)
     diff-lcs (1.1.2)
+    dynamic_form (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
+    factory_girl (1.3.2)
+    factory_girl_rails (1.0)
+      factory_girl (~> 1.3)
+      rails (>= 3.0.0.beta4)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    formtastic (1.2.2)
+      actionpack (>= 2.3.7)
+      activesupport (>= 2.3.7)
+      i18n (>= 0.4.0)
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     i18n (0.5.0)
     json (1.4.6)
+    json_pure (1.4.6)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
     mail (2.2.11)
       activesupport (>= 2.3.6)
       i18n (~> 0.5.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mocha (0.9.8)
+      rake
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -84,6 +123,19 @@ GEM
     rspec-expectations (2.2.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.2.0)
+    rspec-rails (2.2.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.2.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.1.1)
+      childprocess (= 0.1.4)
+      ffi (~> 0.6.3)
+      json_pure
+      rubyzip
+    shoulda (2.11.3)
+    sqlite3-ruby (1.3.2)
     term-ansicolor (1.0.5)
     thin (1.2.7)
       daemons (>= 1.0.9)
@@ -93,14 +145,28 @@ GEM
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
+    xpath (0.1.2)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba
+  bourne
+  capybara
+  clearance (= 0.9.0.rc9)
   cucumber
+  cucumber-rails
+  database_cleaner
+  dynamic_form
+  factory_girl
+  factory_girl_rails
+  formtastic
+  launchy
   rails (>= 3.0.3)
   rake
-  rspec
+  rspec-rails
+  shoulda
+  sqlite3-ruby
   thin

data/Rakefile

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rake'
+require 'rake/gempackagetask'
+require 'cucumber/rake/task'
+require 'rspec/core/rake_task'
+
+desc 'Default: run all tests'
+task :default => [:spec, :cucumber]
+
+Cucumber::Rake::Task.new(:cucumber) do |t|
+  t.fork = true
+  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
+end
+
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+  t.rspec_opts = "--format progress"
+end
+
+eval("$specification = begin; #{IO.read('saucy.gemspec')}; end")
+Rake::GemPackageTask.new($specification) do |package|
+  package.need_zip = true
+  package.need_tar = true
+end
+

data/app/controllers/memberships_controller.rb

@@ -3,7 +3,39 @@ class MembershipsController < ApplicationController
   layout Saucy::Layouts.to_proc
 
   def index
-    @users = current_account.users_by_name
+    @memberships = current_account.memberships_by_name
     render
   end
+
+  def edit
+    find_membership
+    @projects = current_account.projects_by_name
+    render
+  end
+
+  def update
+    find_membership.update_attributes!(params[:membership])
+    flash[:success] = "Permissions updated."
+    redirect_to account_memberships_url(current_account)
+  end
+
+  def destroy
+    find_membership.destroy
+    flash[:success] = "User removed."
+    redirect_to account_memberships_url(current_account)
+  end
+
+  private
+
+  def find_membership
+    @membership ||= Membership.find(params[:id], :include => :account)
+  end
+
+  def current_account
+    if params[:id]
+      find_membership.account
+    else
+      super
+    end
+  end
 end

data/app/models/invitation.rb

@@ -22,7 +22,7 @@ class Invitation < ActiveRecord::Base
     @user = existing_user || new_user
     if valid?
       @user.save!
-      @user.account_memberships.create!(:account => account, :admin => admin)
+      @user.memberships.create!(:account => account, :admin => admin)
     end
   end
 

data/app/models/membership.rb

@@ -0,0 +1,22 @@
+class Membership < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :account
+  has_many :permissions
+  has_many :projects, :through => :permissions
+
+  validates_presence_of :user_id
+  validates_presence_of :account_id
+  validates_uniqueness_of :user_id, :scope => :account_id
+
+  def name
+    user.name
+  end
+
+  def email
+    user.email
+  end
+
+  def self.by_name
+    joins(:user).order('users.name')
+  end
+end

data/app/models/permission.rb

@@ -0,0 +1,17 @@
+class Permission < ActiveRecord::Base
+  belongs_to :membership
+  belongs_to :project
+  belongs_to :user
+
+  before_validation :assign_user_id_from_membership
+
+  def user=(ignored)
+    raise NotImplementedError, "Use Permission#membership= instead"
+  end
+
+  private
+
+  def assign_user_id_from_membership
+    self.user_id = membership.user_id
+  end
+end

data/app/models/signup.rb

@@ -66,8 +66,8 @@ class Signup
     @existing_user ||= User.find_by_email(email)
   end
 
-  def account_membership
-    @account_membership ||= AccountMembership.new(:user    => user,
+  def membership
+    @membership ||= Membership.new(:user    => user,
                                                   :account => account,
                                                   :admin   => true)
   end
@@ -128,7 +128,7 @@ class Signup
     Account.transaction do
       account.save!
       user.save!
-      account_membership.save!
+      membership.save!
     end
   end
 end

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

@@ -0,0 +1,18 @@
+<h2>Permissions for <span><%= @membership.name %></span> on <%= current_account.name %></h2>
+
+<%= render :partial => 'accounts/tab_bar' %>
+
+<%= semantic_form_for @membership do |form| -%>
+  <%= form.inputs do -%>
+    <%= form.input :admin %>
+    <%= form.input :projects, :as => :check_boxes, :collection => @projects %>
+  <% end -%>
+  <%= form.buttons do -%>
+    <%= form.commit_button "Update" %>
+    <li><%= link_to "Remove from account",
+                    @membership,
+                    :method  => :delete,
+                    :confirm => "Are you sure?" %></li>
+  <% end -%>
+<% end -%>
+

data/app/views/memberships/index.html.erb

@@ -3,10 +3,10 @@
 <%= render :partial => 'accounts/tab_bar' %>
 
 <ul class="users">
-  <% @users.each do |user| -%>
-    <%= content_tag_for :li, user do -%>
-      <%= link_to edit_account_user_permissions_path(current_account, user) do %>
-        <%= user.name %> (<%= user.email %>)
+  <% @memberships.each do |membership| -%>
+    <%= content_tag_for :li, membership.user do -%>
+      <%= link_to [:edit, membership] do %>
+        <%= membership.name %> (<%= membership.email %>)
       <% end -%>
     <% end -%>
   <% end -%>

data/config/routes.rb

@@ -3,11 +3,10 @@ Rails.application.routes.draw do
     resources :projects, :only => [:new, :create, :index, :show]
     resources :memberships, :only => [:index]
     resources :invitations, :only => [:new, :create]
-    resources :users, :only => [] do
-      resource :permissions, :only => [:edit, :update]
-    end
   end
 
+  resources :memberships, :only => [:edit, :update, :destroy]
+
   resources :plans, :only => [:index] do
     resources :accounts, :only => [:new, :create]
   end

data/features/run_features.feature

@@ -1,4 +1,4 @@
-@puts @announce @disable-bundler
+@disable-bundler @puts @announce
 Feature: generate a saucy application and run rake
 
   Background:
@@ -16,9 +16,10 @@ Feature: generate a saucy application and run rake
     gem "rspec-rails"
     gem "bourne"
     gem "shoulda"
+    gem "launchy"
     """
     When I add the "saucy" gem from this project as a dependency
-    And I successfully run "bundle install"
+    And I successfully run "bundle install --local"
     And I bootstrap the application for clearance
 
   Scenario: generate a saucy application and run rake
@@ -70,4 +71,4 @@ Feature: generate a saucy application and run rake
     """
     0 failures
     """
-    Then the output should not contain "0 examples"
+    Then at least one example should have run

data/features/step_definitions/rails_steps.rb

@@ -68,3 +68,6 @@ When /^I copy the specs for this project$/ do
   end
 end
 
+Then /^at least one example should have run$/ do
+  Then %{the output should match /[1-9]0? examples/}
+end

data/lib/generators/saucy/features/templates/factories.rb

@@ -22,7 +22,7 @@ Factory.define :account do |f|
   f.url  { Factory.next(:name) }
 end
 
-Factory.define :account_membership do |f|
+Factory.define :membership do |f|
   f.association :user
   f.association :account
 end
@@ -40,9 +40,9 @@ Factory.define :project do |f|
   f.association :account
 end
 
-Factory.define :project_membership do |f|
-  f.association :user
-  f.project     {|a| a.association(:project, :account => a.user.account)}
+Factory.define :permission do |f|
+  f.association :membership
+  f.project     {|a| a.association(:project, :account => a.membership.account)}
 end
 
 Factory.define :invitation do |f|

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

@@ -1,15 +1,18 @@
 Given /^I (?:am signed in|sign in) as an admin of the "([^"]+)" project$/ do |project_name|
   project = Project.find_by_name!(project_name)
   user    = Factory(:email_confirmed_user)
-  Factory(:account_membership, :user => user, :account => project.account, :admin => true)
-  Factory(:project_membership, :user => user, :project => project)
+  membership = Factory(:membership, :user    => user,
+                                                    :account => project.account,
+                                                    :admin   => true)
+  Factory(:permission, :membership => membership,
+                               :project            => project)
   When %{I sign in as "#{user.email}"}
 end
 
 Given /^I am signed in as an admin of the "([^"]*)" account$/ do |account_name|
   account = Account.find_by_name!(account_name)
   user    = Factory(:email_confirmed_user)
-  Factory(:account_membership, :user    => user,
+  Factory(:membership, :user    => user,
                                :account => account,
                                :admin   => true)
   When %{I sign in as "#{user.email}"}

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

@@ -1,20 +1,22 @@
 Given /^"([^"]*)" is a member of the "([^"]*)" project$/ do |email, project_name|
   user = User.find_by_email!(email)
   project = Project.find_by_name!(project_name)
-  Factory(:account_membership, :user => user, :account => project.account)
-  Factory(:project_membership, :user => user, :project => project)
+  membership = Factory(:membership, :user    => user,
+                                                    :account => project.account)
+  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)
-  Factory(:account_membership, :user => user, :account => account)
+  Factory(:membership, :user => user, :account => account)
 end
 
 Given /^"([^"]*)" is an admin of the "([^"]*)" account/ do |email, account_name|
   user = User.find_by_email!(email)
   account = Account.find_by_name!(account_name)
-  Factory(:account_membership, :user => user, :account => account, :admin => true)
+  Factory(:membership, :user => user, :account => account, :admin => true)
 end
 
 Then /^the user "([^"]*)" should be an admin of "([^"]*)"$/ do |email, account_name|

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

@@ -1,6 +1,6 @@
 class CreateSaucyTables < ActiveRecord::Migration
   def self.up
-    create_table :account_memberships do |table|
+    create_table :memberships do |table|
       table.integer  :account_id
       table.integer  :user_id
       table.boolean  :admin
@@ -8,7 +8,7 @@ class CreateSaucyTables < ActiveRecord::Migration
       table.datetime :updated_at
     end
 
-    add_index :account_memberships, [:account_id, :user_id], :unique => true
+    add_index :memberships, [:account_id, :user_id], :unique => true
 
     create_table :accounts do |table|
       table.belongs_to :plan
@@ -29,14 +29,16 @@ class CreateSaucyTables < ActiveRecord::Migration
 
     add_index :invitations, [:account_id]
 
-    create_table :project_memberships do |table|
+    create_table :permissions do |table|
+      table.integer  :membership_id
       table.integer  :user_id
       table.integer  :project_id
       table.datetime :created_at
       table.datetime :updated_at
     end
 
-    add_index :project_memberships, [:user_id, :project_id]
+    add_index :permissions, [:user_id, :project_id]
+    add_index :permissions, [:membership_id, :project_id], :name => [:membership_and_project]
 
     create_table :projects do |table|
       table.string   :name
@@ -63,10 +65,10 @@ class CreateSaucyTables < ActiveRecord::Migration
     remove_column :users, :name
     drop_table :plans
     drop_table :projects
-    drop_table :project_memberships
+    drop_table :permissions
     drop_table :invitations
     drop_table :accounts
-    drop_table :account_memberships
+    drop_table :memberships
   end
 end