mail_spy 0.0.16 → 0.0.17

data/app/models/mail_spy/email.rb

@@ -99,6 +99,54 @@ module MailSpy
     end
 
 
+
+    #var key_hash = {
+    #  campaign:this.campaign,
+    #  stream:this.stream,
+    #  component:this.component,
+    #  campaign:this.subject
+    #};
+    #
+
+
+    def self.generate_subject_reports
+      map = <<-eof
+        function(){
+          var action_counts = {};
+          for(var i=0, len = this.actions.length; i < len; i++){
+            var action = this.actions[i];
+            action_counts[action.action_type] = action_counts[action.action_type] || 0;
+            action_counts[action.action_type]++;
+          }
+
+          emit({
+                campaign:this.campaign,
+                stream:this.stream,
+                component:this.component,
+                subject:this.subject
+              }, action_counts);
+        }
+      eof
+
+      reduce = <<-eof
+        function(key, values){
+          var result = {};
+
+          values.forEach(function(hash){
+            for(var key in hash){
+              result[key] = result[key] || 0
+              result[key] += hash[key]
+            }
+          });
+
+          return result;
+        }
+      eof
+
+      results = collection.map_reduce(map, reduce, :out => "test_reports")
+
+    end
+
     def self.generate_campaign_stats
 
       map = <<-eof

data/app/models/mail_spy/process_log.rb

@@ -0,0 +1,25 @@
+module MailSpy
+  class ProcessLog
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    field :start, :type => Time
+    field :end, :type => Time
+    field :seconds_elapsed, :type => Integer
+    field :success, :type => Boolean, :default => false
+    field :running, :type => Boolean, :default => false
+
+
+    def self.currently_processing?
+      self.where(:running => true).first.present?
+    end
+
+    # Deletes logs after a given date if no date is given we default
+    # to logs that are older that 3 months.
+    def self.delete_stale_logs(date=nil)
+      date = Time.now.advance(:months => -3) if date.nil?
+      self.where("created_at < #{date}").delete_all
+    end
+
+  end
+end

data/lib/mail_spy/manager.rb

@@ -19,11 +19,11 @@ module MailSpy
       # These keys are used to define the s3 paths for the templates
       [:campaign, :stream, :component].each { |key| raise "##{key} can't be blank" if options[key].blank? }
 
-      # Make sure we have someone to send to
-      # TODO need to test setting the options but filling with nil
+      # Make sure we have someone to send to and its not blank
       has_sender = to_options.select { |option| options[option].present? }.present?
       raise "Email instance has no sender (to,cc,bcc were all blank)" unless has_sender
 
+
       # Make sure that all options passed map to a accessor so we don't errantly
       # think we are passing something correctly and really its getting silently
       # ignored
@@ -54,25 +54,39 @@ module MailSpy
       end
 
       #Create the email
-      email = MailSpy::Email.create!(options)
+      email = MailSpy::Email.new(options)
+
+      # Ensure we have the template for the email on s3
+      raise "Missing html template" unless email.html_erb.present?
+      raise "Missing text template" unless email.text_erb.present?
 
-      #Enable sendgrid specific enhancements
+      email.save!
+
+      # Enable sendgrid specific enhancements
+      # Must happen after the email has been saved for the id
       if esp.options[:enable_sendgrid_event_tracking].present?
         header = MailSpy::Sendgrid::SmtpApiHeader.new
         header.setUniqueArgs({:eid => email.id.to_s})
         email.headers = {'X-SMTPAPI' => header.asJSON}.merge(email.headers)
       end
-
-      email.save!
       email
     end
 
     # ------------------------------------------- SEND OUTSTANDING EMAILS
     # Batches through all the emails that were scheduled and have come due
-    # sends them out (step many at a time)
+    # sends them out (step many at a time). Don't thread this method, instead
+    # use the parameters to control concurrency
     def send_outstanding_emails(step=100, num_threads=50)
+      success = false
       raise "No Email service providers installed" unless MailSpy.esps.present?
 
+      return if MailSpy::ProcessLog.currently_processing?
+      current_process = MailSpy::ProcessLog.create!(
+        {
+          :start => Time.now,
+          :running => true,
+        })
+
       wq = WorkQueue.new(num_threads, step*2)
       current_time = DateTime.now
       offset = 0
@@ -87,7 +101,7 @@ module MailSpy
 
       while true
         emails = MailSpy::Email.
-          limit(step).offset(offset).
+          limit(step).offset(offset).asc(:_id).
           where(:schedule_at.lte => current_time, :sent => false, :failed => false).collect
         break if emails.count <= 0 #returns enumerator which is never blank
         emails.each do |email|
@@ -104,13 +118,25 @@ module MailSpy
             end
           end
         end
+
         # We must join here otherwise the next loop email lookup will be in a
         # race condition with the results of our worker_queue.
         wq.join
         offset += step
       end
 
-      sent
+      success = true
+      return sent
+
+    ensure
+      if current_process
+        end_time = Time.now
+        current_process.end = end_time
+        current_process.seconds_elapsed = end_time.to_i - current_process.start.to_i
+        current_process.running = false
+        current_process.success = success
+        current_process.save!
+      end
     end
 
 

data/lib/mail_spy/version.rb

@@ -1,3 +1,3 @@
 module MailSpy
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/test/dummy/db/seeds.rb

@@ -1,16 +1,19 @@
 (0..10).each do |i|
-  MailSpy::Email.create(
-    {
-      :email_address => "trcarden@gmail.com",
-      :user_id => 1,
-      :campaign =>"testCampaign#{i%2}",
-      :stream => "testStream#{i}",
-      :component => "a",
-      :actions => [
-        {:action_type => "open"},
-        {:action_type => "delivered"}
-      ]
-    }
-  )
+  3.times.each do
+    MailSpy::Email.create!(
+      {
+        :email_address => "trcarden@gmail.com",
+        :user_id => 1,
+        :campaign => "testCampaign#{i%2}",
+        :stream => "testStream#{i}",
+        :component => "a",
+        :email_service_provider => 'sendgrid',
+        :actions => [
+          {:action_type => "open"},
+          {:action_type => "delivered"}
+        ]
+      }
+    )
+  end
 end