Add a watcher address that will be the user's email or the email listed on the w…

…atcher. Send to this address.

Add a watcher address that will be the user's email or the email listed on the w…
…atcher. Send to this address.
Jared Pace
1 parent cccdfbdc
Showing 3 changed files with 18 additions and 3 deletions Show diff stats
app/mailers/mailer.rb
app/models/watcher.rb
spec/models/watcher_spec.rb
@@ -6,7 +6,7 @@ class Mailer &lt; ActionMailer::Base
     @app  = notice.err.app
     mail({
-      :to       => @app.watchers.map(&:email),
+      :to       => @app.watchers.map(&:address),
       :subject  => "[#{@app.name}] #{@notice.err.message}"
     })
   end
@@ -16,7 +16,7 @@ class Mailer &lt; ActionMailer::Base
     @app  = deploy.app
     mail({
-      :to       => @app.watchers.map(&:email),
+      :to       => @app.watchers.map(&:address),
       :subject  => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
     })
   end
@@ -13,6 +13,10 @@ class Watcher
     user ? user.name : email
   end
+  def address
+    user.try(:email) || email
+  end
+  
   protected
     def ensure_user_or_email
@@ -17,8 +17,19 @@ describe Watcher do
       watcher.user = Factory(:user)
       watcher.should be_valid
     end
+  end
+  
+  context 'address' do
+    it "returns the user's email address if there is a user" do
+      user = Factory(:user, :email => 'foo@bar.com')
+      watcher = Factory(:watcher, :user => user)
+      watcher.address.should == 'foo@bar.com'
+    end
-    
+    it "returns the email if there is no user" do
+      watcher = Factory(:watcher, :email => 'widgets@acme.com', :user => nil)
+      watcher.address.should == 'widgets@acme.com'
+    end
   end
 end
	@@ -6,7 +6,7 @@ class Mailer < ActionMailer::Base		@@ -6,7 +6,7 @@ class Mailer < ActionMailer::Base
6	@app = notice.err.app	6	@app = notice.err.app
7		7
8	mail({	8	mail({
9	- :to => @app.watchers.map(&:email),	9	+ :to => @app.watchers.map(&:address),
10	:subject => "[#{@app.name}] #{@notice.err.message}"	10	:subject => "[#{@app.name}] #{@notice.err.message}"
11	})	11	})
12	end	12	end
	@@ -16,7 +16,7 @@ class Mailer < ActionMailer::Base		@@ -16,7 +16,7 @@ class Mailer < ActionMailer::Base
16	@app = deploy.app	16	@app = deploy.app
17		17
18	mail({	18	mail({
19	- :to => @app.watchers.map(&:email),	19	+ :to => @app.watchers.map(&:address),
20	:subject => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"	20	:subject => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
21	})	21	})
22	end	22	end
	@@ -17,8 +17,19 @@ describe Watcher do		@@ -17,8 +17,19 @@ describe Watcher do
17	watcher.user = Factory(:user)	17	watcher.user = Factory(:user)
18	watcher.should be_valid	18	watcher.should be_valid
19	end	19	end
		20	+ end
		21	+
		22	+ context 'address' do
		23	+ it "returns the user's email address if there is a user" do
		24	+ user = Factory(:user, :email => 'foo@bar.com')
		25	+ watcher = Factory(:watcher, :user => user)
		26	+ watcher.address.should == 'foo@bar.com'
		27	+ end
20		28
21	-	29	+ it "returns the email if there is no user" do
		30	+ watcher = Factory(:watcher, :email => 'widgets@acme.com', :user => nil)
		31	+ watcher.address.should == 'widgets@acme.com'
		32	+ end
22	end	33	end
23		34
24	end	35	end