Adding sendgrid support to pairwise

Dhruv Kapadia
1 parent 24539bcc
Showing 4 changed files with 11 additions and 11 deletions Show diff stats
app/models/cron_mailer.rb
config/environment.rb
config/initializers/mail.rb
lib/tasks/test_api.rake
+unless Rails.env == "development"
+	   include SendGrid
+end
 class CronMailer < ActionMailer::Base
  
 	def info_message(recipients, subject, message, sent_at= Time.now)
@@ -8,8 +11,4 @@ class CronMailer &lt; ActionMailer::Base
 		@body[:message] = message
       		@body[:host] = "www.allourideas.org"
 	end
-
-	
-  
-
 end
@@ -53,5 +53,7 @@ Rails::Initializer.run do |config|
     :version => '2.0.3'
   config.gem 'redis',
     :version => '1.0.7'
+
+  config.gem 'sendgrid'
 end
  
@@ -3,14 +3,13 @@
  
 # heroku config:add GMAIL_EMAIL=dcroak@example.com GMAIL_PASSWORD=password
  
-require 'smtp-tls'
-
 ActionMailer::Base.smtp_settings = {
-  :address        => "smtp.gmail.com",
-  :port           => "587",
+  :address        => "smtp.sendgrid.net",
+  :port           => "25",
   :authentication => :plain,
-  :user_name      => ENV['GMAIL_EMAIL'],
-  :password       => ENV['GMAIL_PASSWORD']
+  :domain	  => "allourideas.org",
+  :user_name      => ENV['SENDGRID_USERNAME'],
+  :password       => ENV['SENDGRID_PASSWORD']
 }
  
 DO_NOT_REPLY = "donotreply@example.com"
@@ -375,7 +375,7 @@ namespace :test_api do
 	    delta = 0.001
  
 	    if (cached_score - generated_score).abs >= delta
-		 error_message += "Error! The cached_score is not equal to the calculated score for choice #{choice.id}"
+		 error_message += "Error! The cached_score is not equal to the calculated score for choice #{choice.id}\n"
  
 		 print "This score is wrong! #{choice.id} , Question ID: #{question.id}, #{cached_score}, #{generated_score}, updated: #{choice.updated_at}\n"
	1	+unless Rails.env == "development"
	2	+ include SendGrid
	3	+end
1	4	class CronMailer < ActionMailer::Base
2	5
3	6	def info_message(recipients, subject, message, sent_at= Time.now)
...	...	@@ -8,8 +11,4 @@ class CronMailer < ActionMailer::Base
8	11	@body[:message] = message
9	12	@body[:host] = "www.allourideas.org"
10	13	end
11		-
12		-
13		-
14		-
15	14	end
...	...
...	...	@@ -53,5 +53,7 @@ Rails::Initializer.run do \|config\|
53	53	:version => '2.0.3'
54	54	config.gem 'redis',
55	55	:version => '1.0.7'
	56	+
	57	+ config.gem 'sendgrid'
56	58	end
57	59
...	...
...	...	@@ -3,14 +3,13 @@
3	3
4	4	# heroku config:add GMAIL_EMAIL=dcroak@example.com GMAIL_PASSWORD=password
5	5
6		-require 'smtp-tls'
7		-
8	6	ActionMailer::Base.smtp_settings = {
9		- :address => "smtp.gmail.com",
10		- :port => "587",
	7	+ :address => "smtp.sendgrid.net",
	8	+ :port => "25",
11	9	:authentication => :plain,
12		- :user_name => ENV['GMAIL_EMAIL'],
13		- :password => ENV['GMAIL_PASSWORD']
	10	+ :domain => "allourideas.org",
	11	+ :user_name => ENV['SENDGRID_USERNAME'],
	12	+ :password => ENV['SENDGRID_PASSWORD']
14	13	}
15	14
16	15	DO_NOT_REPLY = "donotreply@example.com"
...	...
...	...	@@ -375,7 +375,7 @@ namespace :test_api do
375	375	delta = 0.001
376	376
377	377	if (cached_score - generated_score).abs >= delta
378		- error_message += "Error! The cached_score is not equal to the calculated score for choice #{choice.id}"
	378	+ error_message += "Error! The cached_score is not equal to the calculated score for choice #{choice.id}\n"
379	379
380	380	print "This score is wrong! #{choice.id} , Question ID: #{question.id}, #{cached_score}, #{generated_score}, updated: #{choice.updated_at}\n"
381	381
...	...