mail_engine 0.1.3 → 0.1.4

data/README.mkd

@@ -42,21 +42,48 @@ Add management page needed javascript lib and css files, migration files and mai
 Run migration.
 
     rake db:migrate
-    
+
 ** Step 4: **
 
 Add acts_as_mail_receiver definition to "Your User" model.
 
-  class User < AR
-    acts_as_mail_receiver :payload_columns => %w{firstname lastname},
-                          :groups => %w{all english_users chinese_users}
-  end
-  
+    class User < AR
+      acts_as_mail_receiver :payload_columns => %w{firstname lastname},
+                            :groups => %w{all english_users chinese_users}
+    end
+
   1. User model must have 'email' and payload specified columns, or else you can delegate to other model.
   2. "acts_as_mail_receiver" statement has to place below the scope statements.
 
 ** Step 5: **
 
+Add sendgrid smtp api configure:
+
+    class UserMailer < ActionMailer::Base
+      sendgrid_header do
+        category "xxx"
+
+        filters {
+          opentrack "enable" => 1
+          clicktrack "enable" => 1
+          subscriptiontrack "enable" => 0
+          template "enable" => 0
+          footer "enable" => 0
+        }
+      end
+    end
+  
+For the detail information please check sendgrid.com.
+  
+** Step 6: **
+
+Add below line to production.rb or development.rb for specifing the host.
+it will used when generate resource url when upload zip file.
+
+    config.action_mailer.default_url_options = { :host => "lvh.me:3000" }
+
+** Step 7: **
+
 Add below line to the crontab list of your sever:
 
     ### check mail schedule for every 15 minutes ###
@@ -97,6 +124,12 @@ Notes
 =====
 Currently only support above rails3.
 
+Tips
+====
+Use below rake task, you can export local mail engine data, then import to production environment.
+
+    rake mail_engine:export_mail_engine_database
+
 Screenshots
 ===========
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/mail_engine/mail_schedules_controller.rb

@@ -49,6 +49,22 @@ class MailEngine::MailSchedulesController < MailEngine::ApplicationController
     render :text => %Q{alert("Test Mail failed to send to #{params[:recipient]}, due to #{e.to_s}"); $('#recipient').val('');}
   end
 
+  def start
+    if @mail_schedule.update_attribute :available, true
+      render :js => %Q{alert('Start schedule successfully.'); showStopScheduleButton(#{@mail_schedule.id});}
+    else
+      render :js => %Q{alert('Failed to start schedule.')}
+    end
+  end
+
+  def stop
+    if @mail_schedule.update_attribute :available, false
+      render :js => %Q{alert('Stop schedule successfully.'); showStartScheduleButton(#{@mail_schedule.id});}
+    else
+      render :js => %Q{alert('Failed to stop schedule.')}
+    end
+  end
+
   private
   def find_model
     @mail_schedule = MailSchedule.find(params[:id]) if params[:id]

data/app/helpers/mail_engine/mail_engine_helper.rb

@@ -2,7 +2,7 @@ module MailEngine
   module MailEngineHelper
 
     def show_no_record collection, &block
-      if collection.is_a?(Array) ? collection.blank? : collection.all.blank?
+      if collection.is_a?(Array) ? collection.blank? : collection.try(:all).blank?
         return raw("<div class='notice' style='margin-top:10px'>No Record</div>")
       else
         block.call

data/app/models/mail_engine/mail_schedule.rb

@@ -20,22 +20,67 @@ class MailEngine::MailSchedule < ActiveRecord::Base
   validates_presence_of :name, :user_group, :mail_template_id, :period, :count, :first_send_at
   validates_inclusion_of :period, :in => %w( once daily weekly monthly yearly), :message => "period should in 'daily', 'weekly' and 'monthly'"
   belongs_to :mail_template
-  scope :available, where("sent_count < count OR count = 0")
+  scope :available, where("(sent_count < count OR count = 0) AND available=?", true)
 
   PERIOD_TO_UNIT_TABLE = {
-    "daily" => "day",
-    "weekly" => "week",
-    "monthly" => "month",
-    "yearly" => "year"
+    "daily" => ["day", 1],
+    "weekly" => ["week", 7],
+    "monthly" => ["month", 30],
+    "yearly" => ["year", 365]
   }
 
-  def self.future_schedules
+  # will return an array like
+  #
+  #   [
+  #     [MailSchedule#xxx, 2010-01-01 20:15],
+  #     [MailSchedule#xxx, 2010-01-01 20:15]
+  #   ]
+  #
+  def self.future_schedules(schedule_count = 5)
+    schedule_count = 5 if schedule_count < 5
     all_future_schedules = []
     MailEngine::MailSchedule.available.all.each do |schedule|
-      next_schedules = [schedule].product(schedule.next_several_schedules)
-      all_future_schedules << next_schedules.flatten if next_schedules.present?
+      next_schedules = [schedule].product(schedule.next_several_schedule_dates(schedule_count))
+      all_future_schedules += next_schedules if next_schedules.present?
+    end
+    # sort by date
+    all_future_schedules.sort{|x,y| x[1] <=> y[1]}.slice(1..schedule_count)
+  end
+
+  # FIXME monthly will has some problem due to each month is not exact 30 days.
+  # this func will return an array of date.
+  def next_several_schedule_dates(schedule_count = 5)
+    # check if send count reached the top limit count.
+    return [] if (sent_count >= count and count != 0)
+    # only send once.
+    if period == 'once'
+      # check if it is still available.
+      if first_send_at > Time.now
+        return [first_send_at]
+      else
+        return []
+     end
+    end
+
+    # other periods
+    rest_count     = (count == 0 ? schedule_count : count - sent_count)
+    (1..rest_count).map do |i|
+      last_schedule_time + i.send(PERIOD_TO_UNIT_TABLE[period].first)
+    end
+  end
+
+  # if a weekly schedule, first send at last monday, and today is tuesday, so the last schedule time should be this monday
+  # if a weekly schedule, first send at next monday, and today is tuesday, so the last schedule time should be the first_send_at
+  def last_schedule_time
+    period_unit    = PERIOD_TO_UNIT_TABLE[period].first
+    period_days    = PERIOD_TO_UNIT_TABLE[period].last
+    if first_send_at.past?
+      days_past = ((Time.now - first_send_at)/(3600*24)).round
+      periods_past = days_past / period_days
+      first_send_at + periods_past * 1.send(period_unit)
+    else
+      first_send_at
     end
-    all_future_schedules.sort {|x,y| x[1] <=> y[1]}
   end
 
   # list mail log with the same mail_template_path to current mail_template's path
@@ -62,26 +107,6 @@ class MailEngine::MailSchedule < ActiveRecord::Base
     end
   end
 
-  def next_several_schedules(schedule_count = 5)
-    # check if send count reached the total count.
-    return [] if (sent_count >= count and count != 0)
-    # only send once.
-    if period == 'once'
-      if first_send_at > Time.now
-        return [first_send_at]
-      else
-        return []
-     end
-    end
-
-    # other period
-    rest_count = (count == 0 ? schedule_count : count - sent_count)
-    start_datetime = Time.parse("#{(last_sent_at||first_send_at).strftime("%D")} #{first_send_at.strftime("%T")}")
-    (1..rest_count).map do |i|
-      start_datetime + i.send(PERIOD_TO_UNIT_TABLE[period])
-    end
-  end
-
   # If execute sendmail twice very soon(within 14 minutes), it should not be able to send mail again.
   def ready_to_send?
     # check if send count reached the total count.

data/app/models/mail_engine/mail_template.rb

@@ -171,7 +171,7 @@ class MailEngine::MailTemplate < ActiveRecord::Base
   end
 
   # FIXME: remove the hostname
-  def process_zip_file(hostname = "localhost:3000")
+  def process_zip_file(hostname = ActionMailer::Base.default_url_options[:host] || "localhost:3000")
     return if @extracted_files.blank?
     self.update_attribute :body, MailEngine::HtmlDocumentAssetsReplacer.process(self, @extracted_files, hostname)
     # remove the tmp files

data/app/views/mail_engine/dashboard/index.html.erb

@@ -66,46 +66,50 @@
 </div>
 <div class="clearer"></div>
 
-<div class="today-report left">
+<div class="today-report left" style="width: 920px;">
   <h2>Next Scheduled Mail</h2>
   <div class="clearer"></div>
-  <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 910px; margin-top: 30px; margin-right: 30px">
-    <tr>
-      <th>Schedule Name</th><th width="120">Send Time</th>
-    </tr>
-    <% MailEngine::MailSchedule.future_schedules.each do |schedule, scheduled_time| %>
-    <tr>
-      <td><%= link_to schedule.name, mail_schedule_path(schedule) %></td><td><%= scheduled_time.to_s(:db) %></td>
-    </tr>
-    <% end %>
-  </table>
+  <%= show_no_record(future_schedules = MailEngine::MailSchedule.future_schedules) do %>
+    <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 910px; margin-top: 30px; margin-right: 30px">
+      <tr>
+        <th>Schedule Name</th><th width="120">Send Time</th>
+      </tr>
+      <% future_schedules.each do |schedule, scheduled_time| %>
+      <tr>
+        <td><%= link_to schedule.name, mail_schedule_path(schedule) %></td><td><%= scheduled_time.to_s(:db) %></td>
+      </tr>
+      <% end %>
+    </table>
+  <% end %>
 </div>
 <div class="clearer"></div>
 
-<div class="today-report left">
+<div class="today-report left" style="width: 920px;">
   <h2>Recently Sent Mails</h2>
   <div class="clearer"></div>
 
-  <table class="data-table" style="width: 910px; margin-top: 30px; margin-right: 30px">
-    <tr>
-      <th>Subject</th>
-      <th>Sender</th>
-      <th>Recipient</th>
-      <th>mime_type</th>
-      <th>Sent at</th>
-      <th width="20"></th>
-    </tr>
+  <%= show_no_record(mail_log = MailEngine::MailLog.order("id desc").limit(10)) do %>
+    <table class="data-table" style="width: 910px; margin-top: 30px; margin-right: 30px">
+      <tr>
+        <th>Subject</th>
+        <th>Sender</th>
+        <th>Recipient</th>
+        <th>mime_type</th>
+        <th>Sent at</th>
+        <th width="20"></th>
+      </tr>
 
-  <% MailEngine::MailLog.order("id desc").limit(10).each do |log| %>
-    <tr class="even">
-      <td><%= log.subject %></td>
-      <td><%= log.sender %></td>
-      <td><%= log.recipient %></td>
-      <td><%= log.mime_type %></td>
-      <td><%= log.created_at %></td>
-      <td><%= link_to image_tag('mail_engine/icons/show.png'), mail_log_path(log) %></td>
-    </tr>
+    <% mail_log.each do |log| %>
+      <tr class="even">
+        <td><%= log.subject %></td>
+        <td><%= log.sender %></td>
+        <td><%= log.recipient %></td>
+        <td><%= log.mime_type %></td>
+        <td><%= log.created_at %></td>
+        <td><%= link_to image_tag('mail_engine/icons/show.png'), mail_log_path(log) %></td>
+      </tr>
+    <% end %>
+    </table>
   <% end %>
-  </table>
 </div>
 <div class="clearer"></div>

data/app/views/mail_engine/mail_schedules/_form.html.erb

@@ -34,6 +34,11 @@
   <%= f.label :first_send_at, "First Send At" %><br />
   <%= f.datetime_select :first_send_at, :start_year => Time.now.year, :include_seconds => false, :minute_step => 15 %>
 </div>
+<div class="field">
+  <%= f.label :available, "Available?" %><br />
+  <%= f.check_box :available %>
+  <div class="hint">If you don't want to execute this schedule, leave it unchecked.</div>
+</div>
 <div class="field">
   <%= f.label :payload %><br />
   <% MailEngine::USER_MODEL.payload_columns.each do |column| %>

data/app/views/mail_engine/mail_schedules/index.html.erb

@@ -23,12 +23,24 @@
             <tr><th>Payload</th>
               <td><%= raw mail_schedule.payload.gsub(",", "<br/>") %></td>
             </tr>
+            <tr><th>Availability</th><td class="availability_state_of_<%= mail_schedule.id %> loud large"><%= mail_schedule.available? ? "Running" : "Stopped" %></td></tr>
           </table>
         </td>
         <td style="vertical-align:top">
           <%= link_to image_tag('mail_engine/icons/show.png'), mail_schedule_path(mail_schedule) %>
           <%= link_to image_tag('mail_engine/icons/edit.gif'), edit_mail_schedule_path(mail_schedule) %>
           <%= link_to image_tag('mail_engine/icons/delete.png'), mail_schedule_path(mail_schedule), :confirm => 'Are you sure?', :method => :delete %>
+          <%= link_to image_tag('mail_engine/icons/start.png'), start_mail_schedule_path(mail_schedule), :confirm => 'Are you sure to start this schedule?', :class => "start_button_#{mail_schedule.id}", :remote => true, :method => :post %>
+          <%= link_to image_tag('mail_engine/icons/pause.png'), stop_mail_schedule_path(mail_schedule), :confirm => 'Are you sure to stop this schedule?', :class => "stop_button_#{mail_schedule.id}", :remote => true, :method => :post %>
+          <script>
+            $(function(){
+              if(<%= mail_schedule.available? %>) {
+                showStopScheduleButton("<%= mail_schedule.id %>");
+              } else {
+                showStartScheduleButton("<%= mail_schedule.id %>");
+              }
+            });
+          </script>
           <br>
           <%= form_tag send_test_mail_mail_schedule_path(mail_schedule), :remote => true do %>
             <div>
@@ -54,4 +66,18 @@
     </h5>
     <div class="clearer">&nbsp;</div>
 	</div>
-</div>
+</div>
+
+<script>
+  function showStartScheduleButton(id) {
+    $(".start_button_" + id).show();
+    $(".stop_button_" + id).hide();
+    $(".availability_state_of_" + id).html("Stopped");
+  }
+
+  function showStopScheduleButton(id) {
+    $(".start_button_" + id).hide();
+    $(".stop_button_" + id).show();
+    $(".availability_state_of_" + id).html("Running");
+  }
+</script>

data/app/views/mail_engine/reports/index.html.erb

@@ -67,7 +67,7 @@
 
   <div id='line_chart'></div>
   <div class="history" style="margin-top: 50px;">
-    <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 95%;">
+    <table border="0" cellspacing="5" cellpadding="5" class="data-table" style="width: 910px;">
       <tr>
         <th>Date</th>
         <th>Requests</th>

data/config/routes.rb

@@ -33,6 +33,8 @@ module MailEngine
 
         resources :mail_schedules do
           member do
+            post :start
+            post :stop
             post :send_test_mail
           end
         end

data/db/migrate/20110126030525_create_mail_schedules.rb

@@ -10,6 +10,7 @@ class CreateMailSchedules < ActiveRecord::Migration
       t.string :payload
       t.datetime :first_send_at
       t.datetime :last_sent_at
+      t.boolean :available, :default => false
 
       t.timestamps
     end

data/lib/mail_engine/action_mailer_patch.rb

@@ -5,7 +5,12 @@ module ActionMailer
     def mail(headers={}, &block)
       # order by latest uploaded, for get the latest updated 'subject'
       current_template = MailEngine::MailTemplate.where(:path => "#{controller_path}/#{action_name}", :locale => I18n.locale, :partial => false).order("updated_at desc").first
-      headers[:subject] = current_template.subject if headers[:subject].blank? && current_template.present?
+
+      # {'username' => @username, 'gender' => @gender}
+      instance_variable_hash = {}
+      self.instance_variables.each { |var| instance_variable_hash[var.sub(/^@/,'')] = self.instance_variable_get(var) }
+
+      headers[:subject] = Liquid::Template.parse(current_template.subject).render(instance_variable_hash) if current_template.present?
       headers[:message_id] = "#{controller_path}/#{action_name}"
 
       unless block_given?
@@ -18,11 +23,11 @@ module ActionMailer
           end
           \e[0m"
       end
-      
+
       # Add sendgrid header before sending mail.
       # Why here but not add to default_params of action_mailer? because the receiver email [:to] only can get here.
       if self.sendgrid_config
-        self.sendgrid_config.add_to headers[:to]
+        self.sendgrid_config.set_send_to headers[:to]
         origin_mail(headers.merge(self.sendgrid_config.to_hash), &block)
       else
         origin_mail(headers, &block)

data/lib/mail_engine/engine.rb

@@ -27,6 +27,7 @@ module MailEngine
 
     rake_tasks do
       load "mail_engine/tasks/sendmail.rake"
+      load "mail_engine/tasks/export_mail_engine_database.rake"
     end
 
     generators do

data/lib/mail_engine/sendgrid/base.rb

@@ -40,6 +40,7 @@ module MailEngine
 
       module InstanceMethods
       end
+
     end
   end
 end

data/lib/mail_engine/sendgrid/smtp_api.rb

@@ -54,17 +54,25 @@ module MailEngine
         @data["filters"] = filter_setting.data
       end
 
+      # for now only allow to send to one receiver once.
+      # maybe we don't like people received a mail which allow people to view all receivers
+      def set_send_to(to)
+        @data['to'] ||= []
+        @data['to'] = Array.wrap(to)
+        @data['to'].uniq!
+      end
+
       def add_to(to)
         @data['to'] ||= []
-        @data['to'] += to.kind_of?(Array) ? to : [to]
+        @data['to'] += Array.wrap(to)
         @data['to'].uniq!
       end
 
       def add_sub_val(var, val)
         @data['sub'] ||= {}
-        @data['sub'][var] = val.instance_of?(Array) ? var : [var]
+        @data['sub'][var] = Array.wrap(val)
       end
-      
+
       def set_unique_args(val)
         @data['unique_args'] = val if val.instance_of?(Hash)
       end

data/lib/mail_engine/tasks/export_mail_engine_database.rake

@@ -0,0 +1,17 @@
+namespace :mail_engine do
+  desc "Check mail schedule table and send the scheduled mail."
+  task :export_mail_engine_database => :environment do
+    datetime = Time.now.strftime("%Y%m%d")
+
+    db_config = YAML.load_file(File.join(Rails.root, 'config', 'database.yml'))[Rails.env]
+    db_username = db_config["username"]
+    db_password = db_config["password"]
+    db_database = db_config["database"]
+    db_socket   = db_config["socket"]
+    tables = ['mail_templates', 'mail_schedules', "mail_template_files", "template_partials"]
+    backup_file_path = File.join(Rails.root,"tmp", "mail_engine_backup", "#{db_database}_#{datetime}.sql")
+
+    system "mkdir -p #{File.join(Rails.root,"tmp", "mail_engine_backup")}"
+    system "mysqldump -u #{db_username} -S #{db_socket} -p'#{db_password}' #{db_database} #{tables.join(' ')}> #{backup_file_path}"
+  end
+end

data/lib/mail_engine/tasks/sendmail.rake

@@ -2,7 +2,7 @@ namespace :mail_engine do
   desc "Check mail schedule table and send the scheduled mail."
   task :sendmail => :environment do
     puts "==== Start sending scheduled mail ===="
-    MailEngine::MailSchedule.all.each { |schedule| schedule.sendmail }
+    MailEngine::MailSchedule.available.each { |schedule| schedule.sendmail }
     puts "==== End sending scheduled mail ===="
   end
 end

data/mail_engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_engine}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael he"]
-  s.date = %q{2011-03-06}
+  s.date = %q{2011-03-09}
   s.description = %q{Rails system mail management solution.}
   s.email = %q{hlxwell@gmail.com}
   s.extra_rdoc_files = [
@@ -209,6 +209,7 @@ Gem::Specification.new do |s|
     "lib/mail_engine/sendgrid/base.rb",
     "lib/mail_engine/sendgrid/rest_api.rb",
     "lib/mail_engine/sendgrid/smtp_api.rb",
+    "lib/mail_engine/tasks/export_mail_engine_database.rake",
     "lib/mail_engine/tasks/sendmail.rake",
     "lib/mail_engine/version.rb",
     "lib/mail_engine/zip_processor.rb",
@@ -219,8 +220,12 @@ Gem::Specification.new do |s|
     "public/images/mail_engine/icons/delete.png",
     "public/images/mail_engine/icons/edit.gif",
     "public/images/mail_engine/icons/missing.png",
+    "public/images/mail_engine/icons/pause.png",
+    "public/images/mail_engine/icons/play.png",
     "public/images/mail_engine/icons/save.png",
     "public/images/mail_engine/icons/show.png",
+    "public/images/mail_engine/icons/start.png",
+    "public/images/mail_engine/icons/stop.png",
     "public/images/mail_engine/logo.gif",
     "public/images/mail_engine/logo.png",
     "public/images/mail_engine/none_layout.png",
@@ -362,7 +367,7 @@ Gem::Specification.new do |s|
     "test/dummy/app/mailers/user_mailer.rb",
     "test/dummy/app/models/user.rb",
     "test/dummy/app/views/user_mailer/notify.html.erb",
-    "test/dummy/app/views/user_mailer/notify.text.erb",
+    "test/dummy/app/views/user_mailer/notify.text.liquid",
     "test/dummy/config.ru",
     "test/dummy/config/application.rb",
     "test/dummy/config/boot.rb",
@@ -396,8 +401,11 @@ Gem::Specification.new do |s|
     "test/dummy/public/images/mail_engine/icons/delete.png",
     "test/dummy/public/images/mail_engine/icons/edit.gif",
     "test/dummy/public/images/mail_engine/icons/missing.png",
+    "test/dummy/public/images/mail_engine/icons/pause.png",
     "test/dummy/public/images/mail_engine/icons/save.png",
     "test/dummy/public/images/mail_engine/icons/show.png",
+    "test/dummy/public/images/mail_engine/icons/start.png",
+    "test/dummy/public/images/mail_engine/icons/stop.png",
     "test/dummy/public/images/mail_engine/logo.gif",
     "test/dummy/public/images/mail_engine/logo.png",
     "test/dummy/public/images/mail_engine/none_layout.png",

data/test/dummy/app/mailers/user_mailer.rb

@@ -17,7 +17,7 @@ class UserMailer < ActionMailer::Base
     @username = "Michael He"
 
     # html must below text
-    mail :to => to do |f|
+    mail :to => to, :subject => "subject in mailer" do |f|
       f.html
       f.text
     end

data/test/dummy/config/environments/development.rb

@@ -38,6 +38,7 @@ Dummy::Application.configure do
     :authentication       => :plain
   }
 
+  config.action_mailer.default_url_options = { :host => "lvh.me:3000" }
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 

data/test/dummy/db/migrate/20110125094530_create_users.rb

@@ -8,6 +8,8 @@ class CreateUsers < ActiveRecord::Migration
 
       t.timestamps
     end
+
+    User.create! :email => "m@theplant.jp", :firstname => "Michael", :lastname => "He", :locale => "en"
   end
 
   def self.down

data/test/dummy/db/migrate/20110126030525_create_mail_schedules.rb

@@ -10,6 +10,7 @@ class CreateMailSchedules < ActiveRecord::Migration
       t.string :payload
       t.datetime :first_send_at
       t.datetime :last_sent_at
+      t.boolean :available
 
       t.timestamps
     end

data/test/dummy/db/schema.rb

@@ -33,6 +33,7 @@ ActiveRecord::Schema.define(:version => 20110217062316) do
     t.string   "payload"
     t.datetime "first_send_at"
     t.datetime "last_sent_at"
+    t.boolean  "available"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/test/functional/user_mailer_test.rb

@@ -1,14 +1,24 @@
 require 'test_helper'
 
 class UserMailerTest < ActionController::TestCase
-  context "description" do
-    setup do
-      
+  context "UserMailer" do
+    should "has sendgrid header" do
+      assert UserMailer.sendgrid_config.to_hash["X-SMTPAPI"].present?
     end
 
-    should "description" do
-      
+    should "only send mail to the receiver" do
+      UserMailer.notify("x@x.com").deliver
+      assert UserMailer.sendgrid_config.to_hash["X-SMTPAPI"].include?("[\"x@x.com\"]")
+
+      UserMailer.notify("y@y.com").deliver
+      assert UserMailer.sendgrid_config.to_hash["X-SMTPAPI"].include?("[\"y@y.com\"]")
+    end
+
+    should "override subject by db tempate.subject" do
+      @template = FactoryGirl.build(:system_mail_template_with_footer, :format => "html")
+      assert_equal "subject in mailer", UserMailer.notify("x@x.com").subject
+      @template.save
+      assert_equal @template.subject, UserMailer.notify("x@x.com").subject
     end
   end
-  
 end

data/test/unit/mail_engine/mail_schedule_test.rb

@@ -33,9 +33,39 @@ class MailEngine::MailScheduleTest < ActiveSupport::TestCase
         @schedule.send_test_mail_to!("hlxwell@gmail.com", 0)
       end
     end
-    
-    should "be able to get next_several_schedules" do
-      assert_equal [], @schedule.next_several_schedules
+
+    context "when get next_several_schedules" do
+      setup do
+        @schedule.first_send_at = 2.days.ago
+      end
+
+      should "get correct list for once schedule" do
+        @schedule.sent_count = 1
+        assert_equal [], @schedule.next_several_schedule_dates
+
+        @schedule.sent_count = 0
+        assert_equal [], @schedule.next_several_schedule_dates
+      end
+
+      should "get correct list for daily schedule" do
+        @schedule.period = "daily"
+        assert_equal Time.now.tomorrow.day, @schedule.next_several_schedule_dates.first.day
+      end
+
+      should "get correct list for weekly schedule" do
+        @schedule.period = "weekly"
+        assert_equal (@schedule.first_send_at + 1.week).day, @schedule.next_several_schedule_dates.first.day
+      end
+
+      should "get correct list for monthly schedule" do
+        @schedule.period = "monthly"
+        assert_equal (@schedule.first_send_at + 1.month).day, @schedule.next_several_schedule_dates.first.day
+      end
+
+      should "get correct list for yearly schedule" do
+        @schedule.period = "yearly"
+        assert_equal (@schedule.first_send_at + 1.year).day, @schedule.next_several_schedule_dates.first.day
+      end
     end
   end
 
@@ -71,6 +101,7 @@ class MailEngine::MailScheduleTest < ActiveSupport::TestCase
       assert @schedule.ready_to_send?
       @schedule.sendmail
       assert !@schedule.ready_to_send?
+      Timecop.return
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail_engine
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - michael he
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 +08:00
+date: 2011-03-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -446,6 +446,7 @@ files:
 - lib/mail_engine/sendgrid/base.rb
 - lib/mail_engine/sendgrid/rest_api.rb
 - lib/mail_engine/sendgrid/smtp_api.rb
+- lib/mail_engine/tasks/export_mail_engine_database.rake
 - lib/mail_engine/tasks/sendmail.rake
 - lib/mail_engine/version.rb
 - lib/mail_engine/zip_processor.rb
@@ -456,8 +457,12 @@ files:
 - public/images/mail_engine/icons/delete.png
 - public/images/mail_engine/icons/edit.gif
 - public/images/mail_engine/icons/missing.png
+- public/images/mail_engine/icons/pause.png
+- public/images/mail_engine/icons/play.png
 - public/images/mail_engine/icons/save.png
 - public/images/mail_engine/icons/show.png
+- public/images/mail_engine/icons/start.png
+- public/images/mail_engine/icons/stop.png
 - public/images/mail_engine/logo.gif
 - public/images/mail_engine/logo.png
 - public/images/mail_engine/none_layout.png
@@ -599,7 +604,7 @@ files:
 - test/dummy/app/mailers/user_mailer.rb
 - test/dummy/app/models/user.rb
 - test/dummy/app/views/user_mailer/notify.html.erb
-- test/dummy/app/views/user_mailer/notify.text.erb
+- test/dummy/app/views/user_mailer/notify.text.liquid
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -633,8 +638,11 @@ files:
 - test/dummy/public/images/mail_engine/icons/delete.png
 - test/dummy/public/images/mail_engine/icons/edit.gif
 - test/dummy/public/images/mail_engine/icons/missing.png
+- test/dummy/public/images/mail_engine/icons/pause.png
 - test/dummy/public/images/mail_engine/icons/save.png
 - test/dummy/public/images/mail_engine/icons/show.png
+- test/dummy/public/images/mail_engine/icons/start.png
+- test/dummy/public/images/mail_engine/icons/stop.png
 - test/dummy/public/images/mail_engine/logo.gif
 - test/dummy/public/images/mail_engine/logo.png
 - test/dummy/public/images/mail_engine/none_layout.png