saucy 0.1.9 → 0.1.11

data/Gemfile

@@ -5,7 +5,7 @@ gem "rake"
 gem "rspec-rails", :require => false
 gem "rails", ">= 3.0.3"
 gem "thin"
-gem "clearance", "0.9.0.rc9", :require => false
+gem "clearance", :ref => '71d7c7f7a29ea757cf84fcc497cbc8ecf6cac211', :git => "git://github.com/thoughtbot/clearance.git", :require => false
 gem "shoulda", :require => false
 gem "bourne", :require => false
 gem "sqlite3-ruby", :require => false

data/Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/thoughtbot/clearance.git
+  revision: 71d7c7f7a29ea757cf84fcc497cbc8ecf6cac211
+  ref: 71d7c7f7a29ea757cf84fcc497cbc8ecf6cac211
+  specs:
+    clearance (0.9.1)
+      rails (~> 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -48,8 +56,6 @@ GEM
     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)
@@ -155,7 +161,7 @@ DEPENDENCIES
   aruba
   bourne
   capybara
-  clearance (= 0.9.0.rc9)
+  clearance!
   cucumber
   cucumber-rails
   database_cleaner

data/app/controllers/accounts_controller.rb

@@ -12,15 +12,9 @@ class AccountsController < ApplicationController
     @signup = Signup.new(params[:signup])
     @signup.user = current_user
     if @signup.save
-      if @signup.email_confirmed?
-        flash[:success] = "Account was created."
-        sign_in @signup.user
-        redirect_to root_url
-      else
-        flash[:success] = "Account was created. Instructions for confirming your " +
-                          "account have been sent to the email address you provided."
-        redirect_to sign_in_url
-      end
+      flash[:success] = "Account was created."
+      sign_in @signup.user
+      redirect_to root_url
     else
       render :action => 'new'
     end

data/app/models/invitation.rb

@@ -59,9 +59,7 @@ class Invitation < ActiveRecord::Base
       :password              => new_user_password,
       :password_confirmation => new_user_password_confirmation,
       :name                  => new_user_name
-    ).tap do |user|
-      user.email_confirmed = true
-    end
+    )
   end
 
   def validate_accepting_user

data/app/views/accounts/_account.html.erb

@@ -1,6 +1,6 @@
 <%= content_tag_for :div, account do -%>
   <div class="account-header">
-    <h2>Account: <strong><%= account.name %></strong></h2>
+    <h3><%= account.name %></h3>
     <% if current_user.admin_of?(account) -%>
       <%= link_to 'Settings', edit_account_path(account), :class => 'project-settings' %>
     <% end -%>

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

@@ -6,11 +6,10 @@
   <% @memberships.each do |membership| -%>
     <%= content_tag_for :li, membership.user do -%>
       <%= link_to [:edit, membership] do %>
-        <%= membership.name %> (<%= membership.email %>)
+        <%= membership.name %> <span>(<%= membership.email %>)</span>
       <% end -%>
     <% end -%>
   <% end -%>
 </ul>
 
 <%= link_to 'Invite user', new_account_invitation_path(current_account), :class => "button"%>
-

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

@@ -1,4 +1,5 @@
 <%= form.inputs do %>
   <%= form.input :name %>
+  <%= form.input :url %>
   <%= form.input :users, :as => :check_boxes, :collection => users %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <h2>Edit project: <%= @project.name %></h2>
 <div class="actions">
-  <%= link_to project_path(@project), :method  => 'delete', :confirm => 'Are you sure you want to delete this project and all associated content?' do %>
+  <%= link_to project_path(@project), :method  => 'delete', :confirm => 'Are you sure you want to delete this project and all associated content?', :class => 'action' do %>
     <span class="delete_item">Remove this project</span>
   <% end -%>
 </div>

data/features/run_features.feature

@@ -6,7 +6,7 @@ Feature: generate a saucy application and run rake
     And I cd to "testapp"
     And I append to "Gemfile" with:
     """
-    gem "clearance", "0.9.0.rc9"
+    gem "clearance", :git => "git://github.com/thoughtbot/clearance.git"
     gem "cucumber-rails"
     gem "capybara"
     gem "factory_girl_rails"

data/features/step_definitions/rails_steps.rb

@@ -47,7 +47,7 @@ When /^I add a custom layout to the accounts index$/ do
   create_file('features/custom_accounts_index_layout.feature', <<-SCENARIO)
   Feature: The accounts index should have a custom layout
     Scenario: Custom layout
-      Given I am signed up and confirmed as "email@person.com/password"
+      Given I am signed up as "email@person.com/password"
       And the following projects exist:
         | name       | account   |
         | ClothesPin | name: One |

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

@@ -13,10 +13,6 @@ Factory.define :user do |user|
   user.password_confirmation { "password" }
 end
 
-Factory.define :email_confirmed_user, :parent => :user do |user|
-  user.email_confirmed { true }
-end
-
 Factory.define :account do |f|
   f.name { Factory.next(:name) }
   f.url  { Factory.next(:name) }
@@ -38,6 +34,8 @@ end
 
 Factory.define :project do |f|
   f.association :account
+  f.name        { Factory.next(:name) }
+  f.url         { Factory.next(:name) }
 end
 
 Factory.define :permission do |f|

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

@@ -32,7 +32,7 @@ Feature: edit permissions for a user
   Scenario: promote a user to an admin
     Given an account exists with a name of "Test"
     And I am signed in as an admin of the "Test" account
-    And an email confirmed user exists with a name of "Frank"
+    And an user exists with a name of "Frank"
     And the following memberships exist:
       | account    | user        | admin |
       | name: Test | name: Frank | false |

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

@@ -12,6 +12,7 @@ Feature: Manage Projects
     When I go to the projects page for the "Test" account
     And I follow "New Project"
     And I fill in "Name" with "Project 1"
+    And I fill in "Url" with "project1"
     And I press "Create"
     And I go to the projects page for the "Test" account
     Then I should see "Project 1" within "ul.projects"

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

@@ -33,7 +33,7 @@ Feature: Managing users
     Then the "Name" field should contain "Billy"
 
   Scenario: Invite existing users
-    Given the following email confirmed user exists:
+    Given the following user exists:
       | email               | password | password confirmation |
       | invitee@example.com | secret   | secret                |
     When I follow "Invite user"
@@ -57,7 +57,7 @@ Feature: Managing users
     Then the form should have inline error messages
 
   Scenario: Invite admin users
-    Given the following email confirmed user exists:
+    Given the following user exists:
       | email               | password | password confirmation |
       | invitee@example.com | secret   | secret                |
     When I follow "Invite user"
@@ -78,7 +78,7 @@ Feature: Managing users
     Then the form should have inline error messages
 
   Scenario: view account members
-    Given the following email confirmed users exist:
+    Given the following users exist:
       | name  |
       | Bill  |
       | John  |
@@ -93,7 +93,7 @@ Feature: Managing users
     And I should not see "John"
 
   Scenario: remove a user from an account
-    Given an email confirmed user exists with a name of "Frank"
+    Given an user exists with a name of "Frank"
     And the following memberships exist:
       | account    | user        |
       | name: Test | name: Frank |

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

@@ -4,7 +4,7 @@ Feature: user adds a new account
     Given a plan exists with a name of "Free"
 
   Scenario: existing user adds an account
-    Given I am signed up and confirmed as "user@example.com/test"
+    Given I am signed up as "user@example.com/test"
     When I go to the sign up page for the "Free" plan
     And I fill in "Email" with "user@example.com"
     And I fill in "Password" with "test"
@@ -27,9 +27,7 @@ Feature: user adds a new account
     And I fill in "Account URL" with "robots"
     And I press "Sign up"
     Then I should see "created"
-    And I should see "Instructions for confirming"
-    When I follow the confirmation link sent to "email@person.com"
-    And I go to the settings page
+    When I go to the settings page
     And I follow "Robots, Inc"
     Then the "Url" field should contain "robots"
     When I go to the settings page

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

@@ -24,29 +24,4 @@ Feature: Sign up
     And I fill in "Company Name" with "Robots, Inc"
     And I fill in "Account URL" with "robotsinc"
     And I press "Sign up"
-    Then I should see "Instructions for confirming"
-    And a confirmation message should be sent to "email@person.com"
-    And the user "email@person.com" should be an admin of "Robots, Inc"
-
-  Scenario: User confirms his account
-    Given I signed up with "email@person.com/password"
-    When I follow the confirmation link sent to "email@person.com"
-    Then I should see "Confirmed email and signed in"
-    And I should be signed in
-
-  Scenario: Signed in user clicks confirmation link again
-    Given I signed up with "email@person.com/password"
-    When I follow the confirmation link sent to "email@person.com"
-    Then I should be signed in
-    When I follow the confirmation link sent to "email@person.com"
-    Then I should see "Confirmed email and signed in"
-    And I should be signed in
-
-  Scenario: Signed out user clicks confirmation link again
-    Given I signed up with "email@person.com/password"
-    When I follow the confirmation link sent to "email@person.com"
-    Then I should be signed in
-    When I sign out
-    And I follow the confirmation link sent to "email@person.com"
-    Then I should see "Already confirmed email. Please sign in."
-    And I should be signed out
+    Then I should see "created"

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

@@ -1,6 +1,6 @@
 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)
+  user    = Factory(:user)
   membership = Factory(:membership, :user    => user,
                                                     :account => project.account,
                                                     :admin   => true)
@@ -11,7 +11,7 @@ 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)
+  user    = Factory(:user)
   Factory(:membership, :user    => user,
                                :account => account,
                                :admin   => true)
@@ -25,6 +25,6 @@ When /^I sign in as "([^"\/]*)"$/ do |email|
 end
 
 Given /^I am signed in$/ do
-  user = Factory(:email_confirmed_user)
+  user = Factory(:user)
   When %{I sign in as "#{user.email}"}
 end

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

@@ -42,6 +42,7 @@ class CreateSaucyTables < ActiveRecord::Migration
 
     create_table :projects do |table|
       table.string   :name
+      table.string   :url
       table.integer  :account_id
       table.datetime :created_at
       table.datetime :updated_at

data/lib/saucy/account_authorization.rb

@@ -15,7 +15,7 @@ module Saucy
       end
 
       def current_project
-        ::Project.find(params[:project_id])
+        ::Project.find_by_url!(params[:project_id])
       end
 
       def authorize_admin

data/lib/saucy/project.rb

@@ -7,7 +7,13 @@ module Saucy
       has_many :permissions, :dependent => :destroy
       has_many :users, :through => :permissions
 
-      validates_presence_of :account_id
+      validates_presence_of :account_id, :url, :name
+
+      validates_uniqueness_of :url, :scope => :account_id
+
+      validates_format_of :url,
+                          :with    => %r{^[a-z0-9]+$},
+                          :message => "must be only lower case letters."
 
       after_create :assign_default_memberships
       after_save :update_memberships
@@ -30,6 +36,10 @@ module Saucy
     end
 
     module InstanceMethods
+      def to_param
+        url
+      end
+
       def has_member?(user)
         permissions.
           joins(:membership).

data/lib/saucy/projects_controller.rb

@@ -23,11 +23,11 @@ module Saucy
       end
 
       def edit
-        @project = ::Project.find(params[:id])
+        @project = ::Project.find_by_url!(params[:id])
       end
 
       def update
-        @project = ::Project.find(params[:id])
+        @project = ::Project.find_by_url!(params[:id])
         if @project.update_attributes params[:project]
           flash[:success] = 'Project was updated.'
           redirect_to account_projects_url(current_account)
@@ -37,7 +37,7 @@ module Saucy
       end
 
       def destroy
-        @project = ::Project.find(params[:id])
+        @project = ::Project.find_by_url!(params[:id])
         @project.destroy
         flash[:success] = "Project has been deleted"
         redirect_to account_projects_url(@project.account)
@@ -46,16 +46,6 @@ module Saucy
       def index
         @projects = current_account.projects
       end
-
-      private
-
-      def current_account
-        if params[:id]
-          ::Project.find(params[:id]).account
-        else
-          super
-        end
-      end
     end
   end
 end

data/spec/controllers/accounts_controller_spec.rb

@@ -31,8 +31,8 @@ describe AccountsController, "new" do
 end
 
 describe AccountsController, "successful create for a confirmed user" do
-  let(:user) { Factory.stub(:email_confirmed_user) }
-  let(:signup) { stub('signup', :user => user, :email_confirmed? => true, :user= => nil) }
+  let(:user) { Factory.stub(:user) }
+  let(:signup) { stub('signup', :user => user, :user= => nil) }
   let(:signup_attributes) { "attributes" }
   let(:plan) { Factory(:plan) }
 
@@ -61,33 +61,8 @@ describe AccountsController, "successful create for a confirmed user" do
   it { should be_signed_in.as(user) }
 end
 
-describe AccountsController, "successful create for an unconfirmed user" do
-  let(:user) { Factory.stub(:user) }
-  let(:signup) { stub('signup', :user => user, :email_confirmed? => false, :user= => nil) }
-  let(:signup_attributes) { "attributes" }
-  let(:plan) { Factory(:plan) }
-
-  before do
-    Signup.stubs(:new => signup)
-    signup.stubs(:save => true)
-    post :create, :signup => signup_attributes, :plan_id => plan.to_param
-  end
-
-  it "creates an signup" do
-    Signup.should have_received(:new).with(signup_attributes)
-    signup.should have_received(:save)
-  end
-
-  it "redirects to the sign in url" do
-    should redirect_to(sign_in_url)
-  end
-
-  it { should set_the_flash.to(/created/i) }
-  it { should set_the_flash.to(/confirm/i) }
-end
-
 describe AccountsController, "failed create" do
-  let(:signup) { stub('signup', :email_confirmed? => false, :user= => nil) }
+  let(:signup) { stub('signup', :user= => nil) }
   let(:signup_attributes) { "attributes" }
   let(:plan) { Factory(:plan) }
 

data/spec/models/invitation_spec.rb

@@ -63,7 +63,6 @@ describe Invitation, "valid accept for a new user" do
   it "creates a saved, confirmed user" do
     user.should_not be_nil
     user.should be_persisted
-    user.should be_email_confirmed
     user.name.should == name
   end
 
@@ -99,7 +98,7 @@ end
 
 describe Invitation, "valid accept for an existing user" do
   let(:password) { 'secret' }
-  let(:user)     { Factory(:email_confirmed_user,
+  let(:user)     { Factory(:user,
                            :password              => password,
                            :password_confirmation => password) }
   subject        { Factory(:invitation, :email => user.email) }
@@ -119,7 +118,7 @@ describe Invitation, "valid accept for an existing user" do
 end
 
 describe Invitation, "accepting with an invalid password" do
-  let(:user)    { Factory(:email_confirmed_user) }
+  let(:user)    { Factory(:user) }
   subject       { Factory(:invitation, :email => user.email) }
   let(:account) { subject.account }
   let!(:result) { subject.accept(:existing_user_password => 'wrong') }
@@ -153,7 +152,7 @@ end
 
 describe Invitation, "accepting an admin invite" do
   let(:password) { 'secret' }
-  let(:user)     { Factory(:email_confirmed_user,
+  let(:user)     { Factory(:user,
                            :password              => password,
                            :password_confirmation => password) }
   subject        { Factory(:invitation, :email => user.email, :admin => true) }

data/spec/models/project_spec.rb

@@ -5,6 +5,8 @@ describe Project do
   it { should validate_presence_of(:account_id) }
   it { should have_many(:permissions) }
   it { should have_many(:users).through(:permissions) }
+  it { should validate_presence_of(:url) }
+  it { should validate_presence_of(:name) }
 
   it "finds projects visible to a user" do
     account = Factory(:account)
@@ -28,6 +30,24 @@ describe Project do
 
     Project.by_name.map(&:name).should == %w(abc def ghi)
   end
+
+  it "should give its url for to_param" do
+    project = Factory(:project)
+    project.to_param.should == project.url
+  end
+end
+
+describe Project, "url uniqueness" do
+  let(:project) { Factory(:project) }
+  subject do
+    Factory.build(:project, :account => project.account)
+  end
+
+  it "validates uniqueness of it's url" do
+    subject.url = project.url
+    subject.save
+    subject.errors[:url].should include("has already been taken")
+  end
 end
 
 describe Project, "for an account with admin and non-admin users" do

data/spec/support/authorization_helpers.rb

@@ -36,7 +36,7 @@ module AuthorizationHelpers
   module UserExampleGroup
     extend ActiveSupport::Concern
     included do
-      let(:user) { Factory(:email_confirmed_user) }
+      let(:user) { Factory(:user) }
       before { sign_in_as(user) }
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -05:00
+date: 2010-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency