saucy 0.2.39 → 0.2.40

data/app/controllers/invitations_controller.rb

@@ -12,6 +12,7 @@ class InvitationsController < ApplicationController
   def create
     @invitation = Invitation.new(params[:invitation])
     @invitation.account = current_account
+    @invitation.sender  = current_user
     if @invitation.save
       flash[:success] = "User invited."
       redirect_to account_memberships_url(current_account)

data/app/mailers/invitation_mailer.rb

@@ -4,8 +4,15 @@ class InvitationMailer < ActionMailer::Base
     subject = I18n.t(:subject,
                      :scope   => [:saucy, :mailers, :invitation_mailer, :invititation],
                      :default => "Invitation")
-    mail :to      => invitation.email,
-         :subject => subject,
-         :from    => Saucy::Configuration.mailer_sender
+    mail :to       => invitation.email,
+         :subject  => subject,
+         :reply_to => invitation.sender_email,
+         :from     => sender_name_and_support_address
+  end
+
+  private
+
+  def sender_name_and_support_address
+    %{"#{@invitation.sender_name}" <#{Saucy::Configuration.mailer_sender}>}
   end
 end

data/app/models/invitation.rb

@@ -1,5 +1,6 @@
 class Invitation < ActiveRecord::Base
   belongs_to :account
+  belongs_to :sender, :class_name => 'User'
   validates_presence_of :account_id
   validates_presence_of :email
   has_and_belongs_to_many :projects
@@ -46,6 +47,14 @@ class Invitation < ActiveRecord::Base
     code
   end
 
+  def sender_name
+    sender.name
+  end
+
+  def sender_email
+    sender.email
+  end
+
   private
 
   def deliver_invitation

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

@@ -48,6 +48,7 @@ end
 Factory.define :invitation do |f|
   f.email { Factory.next(:email) }
   f.association :account
+  f.association :sender, :factory => :user
 end
 
 Factory.define :plan do |f|

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

@@ -34,6 +34,7 @@ class CreateSaucyTables < ActiveRecord::Migration
     create_table :invitations do |table|
       table.string   :email
       table.integer  :account_id
+      table.integer  :sender_id
       table.boolean  :admin, :null => false, :default => false
       table.string   :code
       table.boolean  :used, :default => false, :null => false

data/spec/controllers/invitations_controller_spec.rb

@@ -55,6 +55,7 @@ describe InvitationsController, "valid create", :as => :account_admin do
   before do
     Invitation.stubs(:new => invitation)
     invitation.stubs(:account=)
+    invitation.stubs(:sender=)
     invitation.stubs(:save => true)
     post :create, :account_id => account.to_param, :invitation => attributes
   end
@@ -66,6 +67,7 @@ describe InvitationsController, "valid create", :as => :account_admin do
   it "saves an invitation" do
     Invitation.should have_received(:new).with(attributes)
     invitation.should have_received(:account=).with(account)
+    invitation.should have_received(:sender=).with(current_user)
     invitation.should have_received(:save)
   end
 

data/spec/mailers/invitiation_mailer_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe InvitationMailer, "invitation" do
+  let(:invitation) { Factory(:invitation) }
+  subject { InvitationMailer.invitation(invitation) }
+
+  it "sets reply-to to the user that sent the invitation" do
+    subject.reply_to.should == [invitation.sender_email]
+  end
+
+  it "sets from to the user's name" do
+    from = subject.header_fields.detect { |field| field.name == "From"}
+    from.value.should =~ %r{^"#{invitation.sender_name}" <.*>$}
+  end
+
+  it "sends from the support address" do
+    subject.from.should == [Saucy::Configuration.mailer_sender]
+  end
+end

data/spec/models/invitation_spec.rb

@@ -4,6 +4,7 @@ describe Invitation do
   it { should validate_presence_of(:account_id) }
   it { should validate_presence_of(:email) }
   it { should belong_to(:account) }
+  it { should belong_to(:sender) }
   it { should have_and_belong_to_many(:projects) }
 
   it { should_not allow_mass_assignment_of(:account_id) }
@@ -55,6 +56,14 @@ describe Invitation, "saved" do
   it "uses the code in the url" do
     subject.to_param.should == code
   end
+
+  it "delegates sender email" do
+    subject.sender_email.should == subject.sender.email
+  end
+
+  it "delegates sender name" do
+    subject.sender_name.should == subject.sender.name
+  end
 end
 
 describe Invitation, "valid accept for a new user" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 71
   prerelease: 
   segments: 
   - 0
   - 2
-  - 39
-  version: 0.2.39
+  - 40
+  version: 0.2.40
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -241,6 +241,7 @@ files:
 - spec/controllers/projects_controller_spec.rb
 - spec/environment.rb
 - spec/layouts_spec.rb
+- spec/mailers/invitiation_mailer_spec.rb
 - spec/models/account_spec.rb
 - spec/models/invitation_spec.rb
 - spec/models/limit_spec.rb