0
@@ -49,7 +49,8 @@
0
     # Make a pending connection request.
0
     def request(person, contact, mail = nil)
0
       if mail.nil?
0
-        mail = global_prefs.email_notifications?
0
+        mail = global_prefs.email_notifications? &&
0
+               contact.connection_notifications?
0
       end
0
       if person == contact or Connection.exists?(person, contact)
0
         nil

0
@@ -1 +1,16 @@
0
+class AddEmailNotificationPreferences < ActiveRecord::Migration
0
+  def self.up
0
+    add_column :people, :connection_notifications, :boolean, :default => true
0
+    add_column :people, :message_notifications, :boolean, :default => true
0
+    add_column :people, :wall_comment_notifications, :boolean, :default => true
0
+    add_column :people, :blog_comment_notifications, :boolean, :default => true
0
+  end
0
+
0
+  def self.down
0
+    remove_column :people, :blog_comment_notifications
0
+    remove_column :people, :wall_comment_notifications
0
+    remove_column :people, :message_notifications
0
+    remove_column :people, :connection_notifications
0
+  end
0
+end

0
@@ -9,6 +9,10 @@
0
   created_at: <%= 5.days.ago.to_s :db %>
0
   last_logged_in_at: <%= 1.day.ago.to_s :db %>
0
   deactivated: false
0
+  connection_notifications: true
0
+  message_notifications: true
0
+  wall_comment_notifications: true
0
+  blog_comment_notifications: true
0
 
0
 aaron:
0
   email: aaron@example.com
0
@@ -17,6 +21,10 @@
0
   crypted_password: <%= password %>
0
   created_at: <%= 1.day.ago.to_s :db %>
0
   deactivated: false
0
+  connection_notifications: true
0
+  message_notifications: true
0
+  wall_comment_notifications: true
0
+  blog_comment_notifications: true
0
 
0
 kelly:
0
   email: kelly@example.com
0
@@ -25,6 +33,10 @@
0
   crypted_password: <%= password %>
0
   created_at: <%= 1.day.ago.to_s :db %>
0
   deactivated: false
0
+  connection_notifications: true
0
+  message_notifications: true
0
+  wall_comment_notifications: true
0
+  blog_comment_notifications: true
0
   
0
 admin:
0
   email: admin@example.com
0
@@ -34,4 +46,8 @@
0
   crypted_password: <%= password %>
0
   created_at: <%= 5.days.ago.to_s :db %>
0
   deactivated: false
0
+  connection_notifications: true
0
+  message_notifications: true
0
+  wall_comment_notifications: true
0
+  blog_comment_notifications: true

0
@@ -19,14 +19,22 @@
0
       status(@contact, @person).should == Connection::REQUESTED
0
     end
0
   
0
-    it "should send a request notification when notifications are on" do
0
+    it "should send an email when global and notifications are on" do
0
       @global_prefs.update_attributes(:email_notifications => true)
0
       lambda do
0
         Connection.request(@person, @contact)
0
       end.should change(@emails, :length).by(1)
0
     end
0
     
0
-    it "should not send a request notification when notifications are off" do
0
+    it "should not send an email when contact's notifications are off" do
0
+      @global_prefs.update_attributes(:email_notifications => true)
0
+      @contact.toggle!(:connection_notifications)
0
+      lambda do
0
+        Connection.request(@person, @contact)
0
+      end.should_not change(@emails, :length).by(1)      
0
+    end
0
+    
0
+    it "should not send an email when global notifications are off" do
0
       @global_prefs.update_attributes(:email_notifications => false)
0
       lambda do
0
         Connection.request(@person, @contact)