Merge pull request #208 from just3ws/master

just3ws · just3ws · commit f5f65a83db3d · 2014-09-22T18:44:34.000-05:00
WIP#374 Handle unsubscribes
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,17 @@
+GIT
+  remote: git://github.com/emberjs/ember-rails.git
+  revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
+  specs:
+    ember-rails (0.15.0)
+      active_model_serializers
+      barber (>= 0.4.1)
+      ember-data-source (>= 1.0.0.beta.5)
+      ember-source (>= 1.1.0)
+      execjs (>= 1.2)
+      handlebars-source (> 1.0.0)
+      jquery-rails (>= 1.0.17)
+      railties (>= 3.1)
+
 GIT
   remote: git://github.com/nixme/jazz_hands.git
   revision: 5e4b48f145883ecb14b55bf04eacc28ac9662676
@@ -24,20 +38,6 @@ GIT
       mime-types (>= 1.25, < 3.0)
       rest-client (~> 1.4)
 
-GIT
-  remote: git://github.com/emberjs/ember-rails.git
-  revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
-  specs:
-    ember-rails (0.15.0)
-      active_model_serializers
-      barber (>= 0.4.1)
-      ember-data-source (>= 1.0.0.beta.5)
-      ember-source (>= 1.1.0)
-      execjs (>= 1.2)
-      handlebars-source (> 1.0.0)
-      jquery-rails (>= 1.0.17)
-      railties (>= 3.1)
-
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb
@@ -8,7 +8,8 @@ def unsubscribe
       elsif params[:email_type] == NotifierMailer::ACTIVITY_EVENT
         user = User.where(email: params[:recipient]).first
         user.update_attribute(:notify_on_award, false)
-      elsif params[:email_type] == NotifierMailer::WEEKLY_DIGEST_EVENT
+      elsif params[:email_type] == NotifierMailer::POPULAR_PROTIPS_EVENT
+        # Piggybacking off the old 'weekly_digest' subscription list
         user = User.where(email: params[:recipient]).first
         user.update_attribute(:receive_weekly_digest, false)
       end
@@ -37,5 +38,4 @@ def mailgun?(api_key, token, timestamp, signature)
   def encrypt_signature(api_key, timestamp, token)
     OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), api_key, '%s%s' % [timestamp, token])
   end
-
 end
diff --git a/app/mailers/protip_mailer.rb b/app/mailers/protip_mailer.rb
@@ -18,6 +18,7 @@ class ProtipMailer < ActionMailer::Base
   }
   CAMPAIGN_ID = 'protip_mailer-popular_protips'
   ACTIVITY_SUBJECT_PREFIX = '[Coderwall]'
+  POPULAR_PROTIPS_EVENT = 'coderwall-popular_protips'
 
   #################################################################################
   def popular_protips(user, protips, from, to)
@@ -68,7 +69,7 @@ def self.already_sent?(mailable, user)
 
   def campaign_params
     {
-      utm_campaign: 'coderwall-popular_protips',
+      utm_campaign: POPULAR_PROTIPS_EVENT,
       utm_content: Date.today.midnight,
       utm_medium: 'email'
     }
diff --git a/app/views/protip_mailer/popular_protips.html.haml b/app/views/protip_mailer/popular_protips.html.haml
@@ -176,7 +176,7 @@
           %p{style: "color: #c9c9c9; font-size: 12px; #{sans_serif}"}
             %preferences{style: "color: #3ca7dd; text-decoration: none;"}>
               %strong
-                %a{href: "https: //coderwall.com/settings#email", style: "color: #3ca7dd; text-decoration: none;"}
+                %a{ href: 'https://coderwall.com/settings#email', style: 'color: #3ca7dd; text-decoration: none;' }
                   Edit your subscription
             \  |  
             %unsubscribe{style: "color: #3ca7dd; text-decoration: none;"}
diff --git a/app/workers/protip_mailer_popular_protips_worker.rb b/app/workers/protip_mailer_popular_protips_worker.rb
@@ -13,7 +13,7 @@ def perform(from, to)
 
     fail "Only #{protip_ids.count} protips but expected 10" unless protip_ids.count == 10
 
-    User.order('updated_at desc').find_each(batch_size: 100) do |user|
+    User.receives_digest.order('updated_at desc').find_each(batch_size: 100) do |user|
       ProtipMailerPopularProtipsSendWorker.perform_async(user.id, protip_ids, from, to)
     end
   end

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ class ProtipMailer < ActionMailer::Base`
`18`	`18`	`}`
`19`	`19`	`CAMPAIGN_ID = 'protip_mailer-popular_protips'`
`20`	`20`	`ACTIVITY_SUBJECT_PREFIX = '[Coderwall]'`
	`21`	`+ POPULAR_PROTIPS_EVENT = 'coderwall-popular_protips'`
`21`	`22`
`22`	`23`	`#################################################################################`
`23`	`24`	`def popular_protips(user, protips, from, to)`
`@@ -68,7 +69,7 @@ def self.already_sent?(mailable, user)`
`68`	`69`
`69`	`70`	`def campaign_params`
`70`	`71`	`{`
`71`		`- utm_campaign: 'coderwall-popular_protips',`
	`72`	`+ utm_campaign: POPULAR_PROTIPS_EVENT,`
`72`	`73`	`utm_content: Date.today.midnight,`
`73`	`74`	`utm_medium: 'email'`
`74`	`75`	`}`