mail_engine 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/app/controllers/mail_engine/application_controller.rb

@@ -1,14 +1,16 @@
 class MailEngine::ApplicationController < ApplicationController
+  include MailEngine
+  helper MailEngine::MailEngineHelper
+
   layout 'mail_engine/mail_engine'
 
-  # set the access check method.
+  # set the access check method which set in the config.
   if MailEngine::Base.current_config["access_check_method"].present?
     before_filter MailEngine::Base.current_config["access_check_method"]
   end
 
-  include MailEngine
-  helper MailEngine::MailEngineHelper
-
+  ###
+  # return js o close fancy box and refresh page.
   def close_modal_and_refresh
     render :text => "<script>parent.$.fancybox.close();parent.window.location.reload();</script>"
   end

data/app/controllers/mail_engine/dashboard_controller.rb

@@ -2,6 +2,7 @@ class MailEngine::DashboardController < MailEngine::ApplicationController
   def index
     @pie_chart_columns = ["bounces", "unique_opens", "spamreports", "blocks", "unopened"]
     @data_of_today = MailEngine::Sendgrid::RestApi.stats
+    # unopened data needs you calculate by yourself.
     @data_of_today.merge!("unopened" => (@data_of_today["delivered"].to_i - @data_of_today["unique_opens"].to_i))
   end
 end

data/app/controllers/mail_engine/mail_logs_controller.rb

@@ -14,6 +14,7 @@ class MailEngine::MailLogsController < MailEngine::ApplicationController
   end
 
   private
+
   def find_model
     @mail_log = MailLog.find(params[:id]) if params[:id].present?
   end

data/app/controllers/mail_engine/mail_schedules_controller.rb

@@ -8,6 +8,9 @@ class MailEngine::MailSchedulesController < MailEngine::ApplicationController
   def show
   end
 
+  def edit
+  end
+
   def destroy
     @mail_schedule.destroy
     redirect_to mail_schedules_path
@@ -39,9 +42,6 @@ class MailEngine::MailSchedulesController < MailEngine::ApplicationController
     end
   end
 
-  def edit
-  end
-
   def send_test_mail
     @mail_schedule.send_test_mail_to!(params[:recipient], params[:sample_user_id])
     render :text => %Q{alert("Test Mail sent to #{params[:recipient]}"); $('#recipient').val('');}

data/app/controllers/mail_engine/mail_template_files_controller.rb

@@ -5,6 +5,12 @@ class MailEngine::MailTemplateFilesController < MailEngine::ApplicationControlle
   def index
   end
 
+  def edit
+  end
+
+  def show
+  end
+
   def new
     @mail_template_file = @mail_template.mail_template_files.new
   end
@@ -18,9 +24,6 @@ class MailEngine::MailTemplateFilesController < MailEngine::ApplicationControlle
     end
   end
 
-  def edit
-  end
-
   def update
     if @mail_template_file.update_attributes(params[:mail_engine_mail_template_file])
       close_modal_and_refresh
@@ -34,9 +37,6 @@ class MailEngine::MailTemplateFilesController < MailEngine::ApplicationControlle
     render :text => "window.location.reload()"
   end
 
-  def show
-  end
-
   private
 
   def find_model

data/app/controllers/mail_engine/mail_templates_controller.rb

@@ -17,9 +17,6 @@ class MailEngine::MailTemplatesController < MailEngine::ApplicationController
     @mail_templates = @mail_templates.group("path").page(params[:page]).per(20)
   end
 
-  def show
-  end
-
   def preview
     @mail_template = MailEngine::MailTemplate.new if @mail_template.blank?
     @mail_template.body = params[:new_body] if params[:new_body]
@@ -129,6 +126,9 @@ class MailEngine::MailTemplatesController < MailEngine::ApplicationController
     end
   end
 
+  def show
+  end
+
   def edit
   end
 
@@ -144,14 +144,8 @@ class MailEngine::MailTemplatesController < MailEngine::ApplicationController
     render :import
   end
 
-  # def send_test_mail
-  #   @mail_template.send_test_mail_to!(params[:recipient])
-  #   render :text => "alert('Test Mail sent to #{params[:recipient]}'); $('#recipient').val('');"
-  # rescue => e
-  #   render :text => "alert(\"Test Mail failed to send to #{params[:recipient]}, due to #{e.to_s}\"); $('#recipient').val('');"
-  # end
-
   private
+
   def find_model
     @mail_template = MailTemplate.find(params[:id]) if params[:id].present?
   end

data/app/controllers/mail_engine/reports_controller.rb

@@ -17,7 +17,6 @@ class MailEngine::ReportsController < MailEngine::ApplicationController
       "unsubscribes",
       "repeat_unsubscribes"
     ]
-
     @stats_data = if params[:report] and params[:report][:from] and params[:report][:to]
                     MailEngine::Sendgrid::RestApi.stats(:start_date => params[:report][:from], :end_date => params[:report][:to])
                   else

data/app/helpers/mail_engine/mail_engine_helper.rb

@@ -26,5 +26,6 @@ module MailEngine
         "Mail Template"
       end
     end
+
   end
 end

data/app/mailers/mail_engine/mail_dispatcher.rb

@@ -1,8 +1,7 @@
 class MailEngine::MailDispatcher < ActionMailer::Base
-  default :from => "info@itjob.fm"
+  default :from => MailEngine::Base.current_config["default_from"]
   sendgrid_header do
-    category MailEngine::Base.current_config["sendgrid_category"]
-
+    category MailEngine::Base.current_config["sendgrid"]["category_name"]
     filters {
       opentrack "enable" => 1
       clicktrack "enable" => 1
@@ -22,12 +21,11 @@ class MailEngine::MailDispatcher < ActionMailer::Base
   # ).deliver
   #
   def self.method_missing(method, *args)
-    return super if respond_to?(method) # basically it won't unless subclass
+    return super if respond_to?(method)
 
     options = args.dup.extract_options!
     options[:locale] ||= I18n.locale
 
-    # TODO if template file exists, don't need to exam the db.
     templates = MailEngine::MailTemplate.where(:path => method, :locale => options[:locale], :for_marketing => true, :partial => false).order('format desc').all
     raise "No Template added." if templates.blank?
 

data/lib/mail_engine/action_mailer_patch.rb

@@ -28,8 +28,7 @@ module ActionMailer
       # Why here but not add to default_params of action_mailer? because the receiver email [:to] only can get here.
       if self.sendgrid_config
         # if add "replacement_email" option in config
-        receiver = if replacement_email = MailEngine::Base.current_config["replacement_email"]
-                     replacement_email
+        receiver = if (replacement_email = MailEngine::Base.current_config["replacement_email"]).present?
                      headers[:to] = replacement_email
                    else
                      headers[:to]

data/lib/mail_engine/generators/templates/mail_engine_config.yml

@@ -3,8 +3,10 @@ development:
   user_class_name: "User"
   mount_at: "/admin/mail_engine"
   access_check_method: "logged_in?"
+  default_from: "your@email.address"
   replacement_email: "dev@youdomain.com"
   sendgrid:
+    category_name: "you category name"
     sendgrid_user: "you send grid username"
     sendgrid_key: "password"
     sendgrid_category: "my sendgrid category"
@@ -15,7 +17,9 @@ test:
   mount_at: "/admin/mail_engine"
   access_check_method: "logged_in?"
   replacement_email: "dev@youdomain.com"
+  default_from: "your@email.address"
   sendgrid:
+    category_name: "you category name"
     sendgrid_user: "you send grid username"
     sendgrid_key: "password"
     sendgrid_category: "my sendgrid category"
@@ -25,8 +29,9 @@ production:
   user_class_name: "User"
   mount_at: "/admin/mail_engine"
   access_check_method: "logged_in?"
-  replacement_email: "dev@youdomain.com"
+  default_from: "your@email.address"
   sendgrid:
+    category_name: "you category name"
     sendgrid_user: "you send grid username"
     sendgrid_key: "password"
     sendgrid_category: "my sendgrid category"

data/mail_engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_engine}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael he"]
-  s.date = %q{2011-03-15}
+  s.date = %q{2011-03-16}
   s.description = %q{Rails system mail management solution.}
   s.email = %q{hlxwell@gmail.com}
   s.extra_rdoc_files = [

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

@@ -1,8 +1,7 @@
 class UserMailer < ActionMailer::Base
-  default :from => "info@itjob.fm"
-
+  default :from => MailEngine::Base.current_config["default_from"]
   sendgrid_header do
-    category "itjob"
+    category MailEngine::Base.current_config["sendgrid"]["category_name"]
 
     filters {
       opentrack "enable" => 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail_engine
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - michael he
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +08:00
+date: 2011-03-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency