saucy 0.4.9 → 0.4.10

data/app/controllers/invitations_controller.rb

@@ -50,6 +50,10 @@ class InvitationsController < ApplicationController
       flash[:error] = t("invitations.show.used",
                         :default => "That invitation has already been used.")
       redirect_to root_url
+    elsif signed_in? && current_user.email == @invitation.email
+      if @invitation.accept({:existing_user => current_user})
+        redirect_to root_url
+      end
     else
       yield
     end

data/app/models/invitation.rb

@@ -9,10 +9,10 @@ class Invitation < ActiveRecord::Base
   after_create :deliver_invitation
 
   attr_accessor :new_user_name, :new_user_password,
-    :new_user_password_confirmation, :existing_user_password
-  attr_writer :new_user_email, :existing_user_email
-  attr_reader :user
+    :new_user_password_confirmation, :authenticating_user_password, :existing_user
+  attr_writer :new_user_email, :authenticating_user_email
   attr_protected :account_id, :used
+  attr_reader :user
 
   validate :validate_accepting_user, :on => :update
 
@@ -23,7 +23,7 @@ class Invitation < ActiveRecord::Base
   def accept(attributes)
     self.attributes = attributes
     self.used = true
-    @user = existing_user || new_user
+    @user = existing_user || authenticating_user || new_user
     if valid?
       transaction do
         save!
@@ -39,8 +39,8 @@ class Invitation < ActiveRecord::Base
     @new_user_email ||= email
   end
 
-  def existing_user_email
-    @existing_user_email ||= email
+  def authenticating_user_email
+    @authenticating_user_email ||= email
   end
 
   def to_param
@@ -61,14 +61,18 @@ class Invitation < ActiveRecord::Base
     InvitationMailer.invitation(self).deliver
   end
 
-  def existing_user
-    if existing_user?
-      User.find_by_email(existing_user_email)
+  def existing_user?
+    existing_user.present?
+  end
+
+  def authenticating_user
+    if authenticating_user?
+      User.find_by_email(authenticating_user_email)
     end
   end
 
-  def existing_user?
-    existing_user_password.present?
+  def authenticating_user?
+    authenticating_user_password.present?
   end
 
   def new_user
@@ -81,8 +85,10 @@ class Invitation < ActiveRecord::Base
   end
 
   def validate_accepting_user
-    if existing_user?
-      validate_existing_user
+    if authenticating_user?
+      validate_authenticating_user
+    elsif existing_user?
+      true
     else
       validate_new_user
     end
@@ -95,11 +101,11 @@ class Invitation < ActiveRecord::Base
     end
   end
 
-  def validate_existing_user
-    if existing_user.nil?
-      errors.add(:existing_user_email, "isn't signed up")
-    elsif !existing_user.authenticated?(existing_user_password)
-      errors.add(:existing_user_password, "is incorrect")
+  def validate_authenticating_user
+    if authenticating_user.nil?
+      errors.add(:authenticating_user_email, "isn't signed up")
+    elsif !authenticating_user.authenticated?(authenticating_user_password)
+      errors.add(:authenticating_user_password, "is incorrect")
     end
   end
 

data/app/views/invitations/show.html.erb

@@ -13,8 +13,8 @@
 
   <h5 class="legend">I am an existing user</h5>
   <%= form.inputs :class => 'existing_user' do -%>
-    <%= form.input :existing_user_email, :label => 'Email' %>
-    <%= form.input :existing_user_password, :label => 'Password' %>
+    <%= form.input :authenticating_user_email, :label => 'Email' %>
+    <%= form.input :authenticating_user_password, :label => 'Password' %>
   <% end -%>
 
   <%= form.buttons do %>

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

@@ -32,7 +32,7 @@ Feature: Managing users
     When I go to the settings page
     Then the "Name" field should contain "Billy"
 
-  Scenario: Invite existing users
+  Scenario: Invite existing user who is not signed in
     Given the following user exists:
       | email               | password | password confirmation |
       | invitee@example.com | secret   | secret                |
@@ -48,6 +48,20 @@ Feature: Managing users
     Then I should be signed in
     And "invitee@example.com" should be a member of the "Test" account
 
+  Scenario: Invite existing user who is signed in
+    Given the following user exists:
+      | email               | password | password confirmation |
+      | invitee@example.com | secret   | secret                |
+    When I follow "Invite user"
+    And I fill in "Email" with "invitee@example.com"
+    And I press "Invite User"
+    Then I should see "invited"
+    When I sign out
+    When I sign in as "invitee@example.com/secret"
+    And I follow the link sent to "invitee@example.com"
+    Then I should be signed in
+    And "invitee@example.com" should be a member of the "Test" account
+
   Scenario: Fail to accept an invitation
     Given the following invitation exists:
       | email               |

data/spec/models/invitation_spec.rb

@@ -11,7 +11,7 @@ describe Invitation do
   it { should_not allow_mass_assignment_of(:used) }
 
   %w(new_user_name new_user_email new_user_password
-     new_user_password_confirmation existing_user_password).each do |attribute|
+     new_user_password_confirmation authenticating_user_password).each do |attribute|
     it "allows assignment of #{attribute}" do
       should respond_to(attribute)
       should respond_to(:"#{attribute}=")
@@ -45,7 +45,7 @@ describe Invitation, "saved" do
   end
 
   it "defauls existing user email to invited email" do
-    subject.existing_user_email.should == subject.email
+    subject.authenticating_user_email.should == subject.email
   end
 
   it "generates a code" do
@@ -129,7 +129,7 @@ describe Invitation, "invalid accept for a new user" do
   end
 end
 
-describe Invitation, "valid accept for an existing user" do
+describe Invitation, "valid accept for an existing user authenticating" do
   let(:password) { 'secret' }
   let(:user)     { Factory(:user,
                            :password              => password,
@@ -138,7 +138,7 @@ describe Invitation, "valid accept for an existing user" do
   let(:account)  { subject.account }
 
   let!(:result) do
-    subject.accept(:existing_user_password => password)
+    subject.accept(:authenticating_user_password => password)
   end
 
   it "returns true" do
@@ -158,10 +158,10 @@ describe Invitation, "accepting with an invalid password" do
   let(:user)    { Factory(:user) }
   subject       { Factory(:invitation, :email => user.email) }
   let(:account) { subject.account }
-  let!(:result) { subject.accept(:existing_user_password => 'wrong') }
+  let!(:result) { subject.accept(:authenticating_user_password => 'wrong') }
 
   it "adds error messages" do
-    subject.errors[:existing_user_password].should be_present
+    subject.errors[:authenticating_user_password].should be_present
   end
 
   it "doesn't add the user to the account" do
@@ -173,6 +173,28 @@ describe Invitation, "accepting with an invalid password" do
   end
 end
 
+describe Invitation, "valid accept for an existing user specifically set" do
+  let(:user)     { Factory(:user) }
+  subject        { Factory(:invitation, :email => user.email) }
+  let(:account)  { subject.account }
+
+  let!(:result) do
+    subject.accept({:existing_user => user})
+  end
+
+  it "returns true" do
+    result.should be_true
+  end
+
+  it "adds the user to the account" do
+    account.users.should include(user)
+  end
+
+  it "marks the invitation as used" do
+    subject.reload.should be_used
+  end
+end
+
 describe Invitation, "saved" do
   let(:mail)    { stub('invitation', :deliver => true) }
   subject       { Factory(:invitation) }
@@ -199,7 +221,7 @@ describe Invitation, "saved" do
   end
 
   it "defauls existing user email to invited email" do
-    subject.existing_user_email.should == subject.email
+    subject.authenticating_user_email.should == subject.email
   end
 
   it "generates a code" do
@@ -278,10 +300,10 @@ end
 describe Invitation, "accepting with an unknown email" do
   subject       { Factory(:invitation, :email => 'unknown') }
   let(:account) { subject.account }
-  let!(:result) { subject.accept(:existing_user_password => 'secret') }
+  let!(:result) { subject.accept(:authenticating_user_password => 'secret') }
 
   it "adds error messages" do
-    subject.errors[:existing_user_email].should be_present
+    subject.errors[:authenticating_user_email].should be_present
   end
 
   it "returns false" do
@@ -298,7 +320,7 @@ describe Invitation, "accepting an admin invite" do
   let(:account)  { subject.account }
 
   let!(:result) do
-    subject.accept(:existing_user_password => password)
+    subject.accept(:authenticating_user_password => password)
   end
 
   it "adds the user as an admin" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 27
+  prerelease: false
   segments: 
   - 0
   - 4
-  - 9
-  version: 0.4.9
+  - 10
+  version: 0.4.10
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,11 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: formtastic
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +34,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
+  type: :runtime
   version_requirements: *id001
-  name: formtastic
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: railties
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +50,11 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
+  type: :runtime
   version_requirements: *id002
-  name: railties
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: braintree
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,11 +66,11 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
+  type: :runtime
   version_requirements: *id003
-  name: braintree
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: sham_rack
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,11 +82,11 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
+  type: :runtime
   version_requirements: *id004
-  name: sham_rack
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: sinatra
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,11 +98,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
+  type: :runtime
   version_requirements: *id005
-  name: sinatra
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: aruba
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,9 +114,8 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
+  type: :development
   version_requirements: *id006
-  name: aruba
-  prerelease: false
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS