send emails on public events

technoweenie · technoweenie · commit b66fc3ea9cae · 2012-04-18T15:26:47.000-06:00
diff --git a/services/email.rb b/services/email.rb
@@ -15,6 +15,15 @@ class Service::Email < Service
 
   def receive_push
     extend PushEmail
+    deliver_to_addresses
+  end
+
+  def receive_public
+    extend PublicEmail
+    deliver_to_addresses
+  end
+
+  def deliver_to_addresses
     configure_mail_defaults unless mail_configured?
 
     addresses.each do |address|
@@ -139,7 +148,27 @@ def noreply_address
     @noreply_address ||= email_config['noreply_address'] || "GitHub <noreply@github.com>"
   end
 
+  module RepositoryEmailHelpers
+    def name_with_owner
+      File.join(owner_name, repository_name)
+    end
+
+    def owner_name
+      payload['repository']['owner']['name']
+    end
+
+    def repository_name
+      payload['repository']['name']
+    end
+
+    def repo_url
+      payload['repository']['url']
+    end
+  end
+
   module PushEmail
+    include RepositoryEmailHelpers
+
     # Public
     def mail_subject
       if first_commit
@@ -250,10 +279,6 @@ def branch_ref
       payload['ref']
     end
 
-    def repo_url
-      payload['repository']['url']
-    end
-
     def author_address
       "#{author_name} <#{author_email}>"
     end
@@ -275,18 +300,6 @@ def last_commit
       payload['commits'].last # assume that the last committer is also the pusher
     end
 
-    def name_with_owner
-      File.join(owner_name, repository_name)
-    end
-
-    def owner_name
-      payload['repository']['owner']['name']
-    end
-
-    def repository_name
-      payload['repository']['name']
-    end
-
     def first_commit_sha
       first_commit['id']
     end
@@ -301,4 +314,23 @@ def first_commit
       payload['commits'].first
     end
   end
+
+  module PublicEmail
+    include RepositoryEmailHelpers
+
+    # Public
+    def mail_subject
+      "#{name_with_owner} has changed from Private to Public"
+    end
+
+    # Public
+    def mail_body
+      "#{name_with_owner} has changed from Private to Public\n\n#{repo_url}"
+    end
+
+    # Public
+    def mail_from
+      noreply_address
+    end
+  end
 end
diff --git a/test/email_test.rb b/test/email_test.rb
@@ -19,6 +19,21 @@ def test_push
     assert_nil svc.messages.shift
   end
 
+  def test_public
+    svc = service({'address' => 'a'}, payload)
+
+    svc.receive_public
+
+    msg, from, to, subject = svc.messages.shift
+    assert_match "noreply@github.com", from
+    assert_equal 'a', to
+    assert_match "mojombo/grit has changed from Private to Public", subject
+    assert_match subject, msg
+    assert_match "github.com/mojombo/grit", msg
+
+    assert_nil svc.messages.shift
+  end
+
   def test_multiple_address
     svc = service(
       {'address' => ' a b c'},
@@ -78,7 +93,7 @@ def svc.messages
     end
 
     def svc.send_mail(mail)
-      messages << [mail.to_s, mail.from.first, mail.to.first]
+      messages << [mail.to_s, mail.from.first, mail.to.first, mail.subject]
     end
     svc
   end
