saucy 0.1.3 → 0.1.4

data/spec/models/user_spec.rb

@@ -5,20 +5,20 @@ describe User, "valid" do
 
   it { should validate_presence_of(:name) }
 
-  it { should have_many(:account_memberships) }
-  it { should have_many(:accounts).through(:account_memberships) }
-  it { should have_many(:projects) }
-  it { should have_many(:project_memberships) }
+  it { should have_many(:memberships) }
+  it { should have_many(:accounts).through(:memberships) }
+  it { should have_many(:permissions) }
+  it { should have_many(:projects).through(:permissions) }
 
   it "is an admin of an account with an admin membership" do
     account = Factory(:account)
-    Factory(:account_membership, :user => subject, :admin => true, :account => account)
+    Factory(:membership, :user => subject, :admin => true, :account => account)
     subject.should be_admin_of(account)
   end
 
   it "isn't an admin of an account with a non admin membership" do
     account = Factory(:account)
-    Factory(:account_membership, :user => subject, :admin => false, :account => account)
+    Factory(:membership, :user => subject, :admin => false, :account => account)
     subject.should_not be_admin_of(account)
   end
 
@@ -29,29 +29,33 @@ describe User, "valid" do
 
   it "is a member with a membership for the given account" do
     account = Factory(:account)
-    Factory(:account_membership, :user => subject, :account => account)
+    Factory(:membership, :user => subject, :account => account)
     subject.should be_member_of(account)
   end
 
   it "isn't a member without a membership for the given account" do
     account = Factory(:account)
     other_account = Factory(:account)
-    Factory(:account_membership, :user => subject, :account => other_account)
+    Factory(:membership, :user => subject, :account => other_account)
     subject.should_not be_member_of(account)
   end
 
   it "is a member with a membership for the given project" do
     project = Factory(:project)
-    Factory(:account_membership, :user => subject, :account => project.account)
-    Factory(:project_membership, :user => subject, :project => project)
+    membership = Factory(:membership, :user    => subject,
+                                                      :account => project.account)
+    Factory(:permission, :membership => membership,
+                                 :project            => project)
     subject.should be_member_of(project)
   end
 
   it "isn't a member without a membership for the given project" do
     project = Factory(:project)
     other_project = Factory(:project)
-    Factory(:account_membership, :user => subject, :account => other_project.account)
-    Factory(:project_membership, :user => subject, :project => other_project)
+    membership = Factory(:membership, :user    => subject,
+                                                      :account => other_project.account)
+    Factory(:permission, :membership => membership,
+                                 :project            => other_project)
     subject.should_not be_member_of(project)
   end
 
@@ -62,35 +66,5 @@ describe User, "valid" do
 
     User.by_name.map(&:name).should == %w(abc def ghi)
   end
-
-  context "updating the permissions for an account" do
-    let!(:account) { Factory(:account) }
-    let!(:other_account) { Factory(:account) }
-    let!(:member_project) { Factory(:project, :account => account) }
-    let!(:nonmember_project) { Factory(:project, :account => account) }
-    let!(:other_account_project) { Factory(:project, :account => other_account) }
-
-    before do
-      Factory(:account_membership, :account => account, :user => subject)
-      Factory(:account_membership, :account => other_account, :user => subject)
-      Factory(:project_membership, :project => member_project, :user => subject)
-      Factory(:project_membership, :project => other_account_project, :user => subject)
-      subject.reload
-
-      subject.update_permissions_for(account, [nonmember_project.id])
-    end
-
-    it "adds an added project for that account" do
-      subject.should be_member_of(nonmember_project)
-    end
-
-    it "removes a removed project for that account" do
-      subject.should_not be_member_of(member_project)
-    end
-
-    it "ignores a project for another account" do
-      subject.should be_member_of(other_account_project)
-    end
-  end
 end
 

data/spec/scaffold/config/routes.rb

@@ -0,0 +1,5 @@
+Rails.application.routes.draw do
+  match "sign_in"  => "application#index", :as => "sign_in"
+  root :to => "application#index"
+end
+

data/spec/spec_helper.rb

@@ -1,7 +1,14 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
+
+if File.exist?("config/environment.rb")
+  require "config/environment"
+else
+  require File.expand_path("../environment", __FILE__)
+end
+
 require 'rspec/rails'
+require 'shoulda'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/support/authentication_helpers.rb

@@ -21,24 +21,34 @@ module AuthenticationHelpers
 
   def sign_in_as_admin_of_account(account)
     user = Factory(:user)
-    Factory(:account_membership, :user => user, :account => account, :admin => true)
+    Factory(:membership, :user => user, :account => account, :admin => true)
     sign_in_as user
   end
 
   def sign_in_as_non_admin_of_account(account)
     user = Factory(:user)
-    Factory(:account_membership, :user => user, :account => account, :admin => false)
+    Factory(:membership, :user => user, :account => account, :admin => false)
     sign_in_as user
   end
 
   def sign_in_as_non_admin_of_project(project)
-    user = sign_in_as_non_admin_of_account(project.account)
-    Factory(:project_membership, :user => user, :project => project)
+    user = Factory(:user)
+    membership = Factory(:membership, :user    => user,
+                                                      :account => account,
+                                                      :admin   => false)
+    Factory(:permission, :membership => membership,
+                                 :project            => project)
+    sign_in_as user
   end
 
   def sign_in_as_admin_of_project(project)
-    user = sign_in_as_admin_of_account(project.account)
-    Factory(:project_membership, :user => user, :project => project)
+    user = Factory(:user)
+    membership = Factory(:membership, :user    => user,
+                                                      :account => account,
+                                                      :admin   => true)
+    Factory(:permission, :membership => membership,
+                                 :project            => project)
+    sign_in_as user
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,13 +17,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -05:00
+date: 2010-12-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: formtastic
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +34,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: railties
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: railties
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +50,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: aruba
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,9 +66,8 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :development
-  version_requirements: *id003
-description: BLAH BLAH BLAH
+  requirement: *id003
+description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
 
@@ -76,92 +76,93 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
 - Gemfile.lock
+- Rakefile
 - README
-- Gemfile
 - config/routes.rb
-- app/views/invitations/new.html.erb
-- app/views/invitations/show.html.erb
-- app/views/accounts/new.html.erb
+- app/controllers/accounts_controller.rb
+- app/controllers/invitations_controller.rb
+- app/controllers/memberships_controller.rb
+- app/controllers/plans_controller.rb
+- app/controllers/profiles_controller.rb
+- app/models/invitation.rb
+- app/models/membership.rb
+- app/models/permission.rb
+- app/models/signup.rb
+- app/views/accounts/_account.html.erb
+- app/views/accounts/_blank_slate.html.erb
 - app/views/accounts/_projects.html.erb
-- app/views/accounts/edit.html.erb
 - app/views/accounts/_tab_bar.html.erb
-- app/views/accounts/_blank_slate.html.erb
-- app/views/accounts/_account.html.erb
+- app/views/accounts/edit.html.erb
 - app/views/accounts/index.html.erb
+- app/views/accounts/new.html.erb
 - app/views/invitation_mailer/invitation.text.erb
-- app/views/plans/index.html.erb
+- app/views/invitations/new.html.erb
+- app/views/invitations/show.html.erb
+- app/views/memberships/edit.html.erb
 - app/views/memberships/index.html.erb
-- app/views/profiles/edit.html.erb
+- app/views/plans/index.html.erb
 - app/views/profiles/_inputs.html.erb
-- app/views/projects/new.html.erb
+- app/views/profiles/edit.html.erb
+- app/views/projects/_form.html.erb
 - app/views/projects/edit.html.erb
 - app/views/projects/index.html.erb
-- app/views/projects/_form.html.erb
-- app/views/permissions/edit.html.erb
-- app/controllers/profiles_controller.rb
-- app/controllers/accounts_controller.rb
-- app/controllers/memberships_controller.rb
-- app/controllers/plans_controller.rb
-- app/controllers/invitations_controller.rb
-- app/controllers/permissions_controller.rb
-- app/models/project_membership.rb
-- app/models/invitation.rb
-- app/models/signup.rb
-- app/models/account_membership.rb
-- lib/generators/saucy/views/views_generator.rb
+- app/views/projects/new.html.erb
 - lib/generators/saucy/base.rb
-- lib/generators/saucy/install/install_generator.rb
-- lib/generators/saucy/install/templates/create_saucy_tables.rb
-- lib/generators/saucy/install/templates/controllers/projects_controller.rb
-- lib/generators/saucy/install/templates/models/project.rb
-- lib/generators/saucy/install/templates/models/plan.rb
-- lib/generators/saucy/install/templates/models/account.rb
-- lib/generators/saucy/install/templates/models/invitation_mailer.rb
 - lib/generators/saucy/features/features_generator.rb
 - lib/generators/saucy/features/templates/factories.rb
+- lib/generators/saucy/features/templates/step_definitions/email_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/factory_girl_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/html_steps.rb
-- lib/generators/saucy/features/templates/step_definitions/session_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/project_steps.rb
-- lib/generators/saucy/features/templates/step_definitions/email_steps.rb
+- lib/generators/saucy/features/templates/step_definitions/session_steps.rb
 - lib/generators/saucy/features/templates/step_definitions/user_steps.rb
-- lib/saucy.rb
-- lib/saucy/layouts.rb
+- lib/generators/saucy/install/install_generator.rb
+- lib/generators/saucy/install/templates/controllers/projects_controller.rb
+- lib/generators/saucy/install/templates/create_saucy_tables.rb
+- lib/generators/saucy/install/templates/models/account.rb
+- lib/generators/saucy/install/templates/models/invitation_mailer.rb
+- lib/generators/saucy/install/templates/models/plan.rb
+- lib/generators/saucy/install/templates/models/project.rb
+- lib/generators/saucy/views/views_generator.rb
+- lib/saucy/account.rb
 - lib/saucy/account_authorization.rb
 - lib/saucy/configuration.rb
 - lib/saucy/engine.rb
-- lib/saucy/project.rb
+- lib/saucy/layouts.rb
 - lib/saucy/plan.rb
-- lib/saucy/account.rb
-- lib/saucy/user.rb
+- lib/saucy/project.rb
 - lib/saucy/projects_controller.rb
+- lib/saucy/user.rb
+- lib/saucy.rb
 - features/run_features.feature
-- features/support/file.rb
-- features/support/env.rb
-- features/step_definitions/rails_steps.rb
 - features/step_definitions/clearance_steps.rb
-- spec/views/accounts/_account.html.erb_spec.rb
+- features/step_definitions/rails_steps.rb
+- features/support/env.rb
+- features/support/file.rb
+- spec/controllers/accounts_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/invitations_controller_spec.rb
-- spec/controllers/accounts_controller_spec.rb
 - spec/controllers/memberships_controller_spec.rb
-- spec/controllers/permissions_controller_spec.rb
 - spec/controllers/profiles_controller_spec.rb
 - spec/controllers/projects_controller_spec.rb
+- spec/environment.rb
 - spec/layouts_spec.rb
-- spec/saucy_spec.rb
-- spec/support/clearance_matchers.rb
-- spec/support/authorization_helpers.rb
-- spec/support/authentication_helpers.rb
-- spec/models/user_spec.rb
-- spec/models/signup_spec.rb
-- spec/models/project_spec.rb
-- spec/models/project_membership_spec.rb
-- spec/models/invitation_spec.rb
 - spec/models/account_spec.rb
-- spec/models/account_membership_spec.rb
+- spec/models/invitation_spec.rb
+- spec/models/membership_spec.rb
+- spec/models/permission_spec.rb
+- spec/models/project_spec.rb
+- spec/models/signup_spec.rb
+- spec/models/user_spec.rb
+- spec/saucy_spec.rb
+- spec/scaffold/config/routes.rb
 - spec/spec_helper.rb
+- spec/support/authentication_helpers.rb
+- spec/support/authorization_helpers.rb
+- spec/support/clearance_matchers.rb
+- spec/views/accounts/_account.html.erb_spec.rb
 has_rdoc: true
 homepage: http://github.com/thoughtbot/saucy
 licenses: []
@@ -195,10 +196,10 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: blah blah blah
+summary: Clearance-based Rails engine for SaaS
 test_files: 
 - features/run_features.feature
-- features/support/file.rb
-- features/support/env.rb
-- features/step_definitions/rails_steps.rb
 - features/step_definitions/clearance_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/support/env.rb
+- features/support/file.rb

data/app/controllers/permissions_controller.rb

@@ -1,17 +0,0 @@
-class PermissionsController < ApplicationController
-  before_filter :authorize_admin
-  layout Saucy::Layouts.to_proc
-
-  def edit
-    @user     = User.find(params[:user_id])
-    @projects = current_account.projects_by_name
-    render
-  end
-
-  def update
-    user = User.find(params[:user_id])
-    user.update_permissions_for(current_account, params[:permissions][:project_ids])
-    flash[:success] = "Permissions updated."
-    redirect_to account_memberships_url(current_account)
-  end
-end

data/app/models/account_membership.rb

@@ -1,8 +0,0 @@
-class AccountMembership < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :account
-
-  validates_presence_of :user_id
-  validates_presence_of :account_id
-  validates_uniqueness_of :user_id, :scope => :account_id
-end

data/app/models/project_membership.rb

@@ -1,14 +0,0 @@
-class ProjectMembership < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :project
-
-  validate :ensure_account_member
-
-  private
-
-  def ensure_account_member
-    unless user.member_of?(project.account)
-      errors.add(:base, "This user is not a member of #{project.name}'s account")
-    end
-  end
-end