mail_engine 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/app/controllers/mail_engine/application_controller.rb

@@ -1,4 +1,7 @@
 class MailEngine::ApplicationController < ApplicationController
+  # used when mail_template preview.
+  prepend_view_path MailEngine::MailTemplateResolver.instance
+
   include MailEngine
   helper MailEngine::MailEngineHelper
 

data/app/controllers/mail_engine/mail_schedules_controller.rb

@@ -44,9 +44,9 @@ class MailEngine::MailSchedulesController < MailEngine::ApplicationController
 
   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('');}
+    render :js => %Q{alert("Test Mail sent to #{params[:recipient]}"); $('#recipient').val('');}
   rescue => e
-    render :text => %Q{alert("Test Mail failed to send to #{params[:recipient]}, due to #{e.to_s}"); $('#recipient').val('');}
+    render :js => %Q{alert("Test Mail failed to send to #{params[:recipient]}, due to #{e.to_s.gsub(/\n/, '')}"); $('#recipient').val('');}
   end
 
   def start

data/app/controllers/mail_engine/mail_template_files_controller.rb

@@ -34,7 +34,7 @@ class MailEngine::MailTemplateFilesController < MailEngine::ApplicationControlle
 
   def destroy
     @mail_template_file.destroy
-    render :text => "window.location.reload()"
+    render :js => "window.location.reload()"
   end
 
   private

data/app/mailers/mail_engine/mail_dispatcher.rb

@@ -30,7 +30,6 @@ class MailEngine::MailDispatcher < ActionMailer::Base
     raise "No Template added." if templates.blank?
 
     subject = templates.first.subject
-    formats = templates.map {|t| "format.#{t.format}" }.sort.reverse
 
     # generate the method for db template.
     class_eval <<-METHOD
@@ -53,9 +52,7 @@ class MailEngine::MailDispatcher < ActionMailer::Base
           instance_variable_set "@" + key.to_s, value
         end
 
-        mail mail_options do |format|
-          #{formats.join(';')}
-        end
+        mail mail_options
       end
     METHOD
 

data/lib/mail_engine/action_mailer_patch.rb

@@ -13,17 +13,6 @@ module ActionMailer
       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?
-        puts "\e[1;31;40m[Mail Engine Warning]\e[0m Please pass a block to 'mail' method as below style,
-        mail engine needs you to specify the format to send:
-          \e[1;34;40m
-          mail :to => 'xxx@xxx.com' do |format|
-            format.text
-            format.html
-          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
@@ -47,19 +36,11 @@ module ActionMailer
     # need to set layout and pass partial path to each format of mail template.
     #
     # Completed copied from lib/action_mailer/base.rb#665
-    # but used revisioned ActionMailer::Collector
     def collect_responses_and_parts_order(headers) #:nodoc:
       responses, parts_order = [], nil
 
       if block_given?
-        ### modified this like, it's very strange when use resolver.is_a?(MailEngine::MailTemplate::Resolver) it will give false sometime.
-        if lookup_context.view_paths.detect {|resolver| resolver.class.to_s == "MailEngine::MailTemplate::Resolver" }
-          collector = ActionMailer::Collector.new(lookup_context) { |mime| set_layout_and_partials(mime) }
-        else
-          collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
-        end
-        ######################################################################################
-
+        collector = ActionMailer::Collector.new(lookup_context) { render(action_name) }
         yield(collector)
         parts_order = collector.responses.map { |r| r[:content_type] }
         responses  = collector.responses
@@ -71,23 +52,27 @@ module ActionMailer
       else
         templates_path = headers.delete(:template_path) || self.class.mailer_name
         templates_name = headers.delete(:template_name) || action_name
-
         each_template(templates_path, templates_name) do |template|
           self.formats = template.formats
-
-          responses << {
-            :body => render(:template => template),
-            :content_type => template.mime_type.to_s
-          }
+          responses <<  if lookup_context.view_paths.detect {|resolver| resolver.class.to_s == "MailEngine::MailTemplateResolver" }
+                          {
+                            :body => render_with_layout_and_partials(template.mime_type.to_sym.to_s),
+                            :content_type => template.mime_type.to_s
+                          }
+                        else
+                          {
+                            :body => render(:template => template),
+                            :content_type => template.mime_type.to_s
+                          }
+                        end
         end
       end
 
       [responses, parts_order]
     end
 
-
-    # set layout and partials
-    def set_layout_and_partials(format)
+    # render template with layout and partials
+    def render_with_layout_and_partials(format)
       # looking for system mail.
       template = MailEngine::MailTemplate.where(:path => "#{controller_path}/#{action_name}", :format => format, :locale => I18n.locale, :partial => false, :for_marketing => false).first
       # looking for marketing mail.
@@ -109,25 +94,4 @@ module ActionMailer
      end
     end
   end
-end
-
-###
-# REASON TO OVERRIDE THIS METHOD:
-# pass mime format to renderrer
-#
-# One concern if user provided block, there will be problem. like:
-# format.text { xxxx; render 'xxx' }
-#
-module ActionMailer
-  class Collector
-    def custom(mime, options={})
-      options.reverse_merge!(:content_type => mime.to_s)
-      @context.freeze_formats([mime.to_sym])
-      ### modified this line
-      # change from:
-      # options[:body] = block_given? ? yield : @default_render.call
-      options[:body] = block_given? ? yield : @default_render.call(mime.to_sym)
-      @responses << options
-    end
-  end
 end

data/lib/mail_engine/base.rb

@@ -33,9 +33,8 @@ module MailEngine
         raise "Should specify :to option" if options[:to].blank?
 
         # find the template from database.
-        template_path = File.join("mail_engine", "mail_dispatcher", template)
-        unless mail_template = MailEngine::MailTemplate.where(:path => template_path, :locale => options[:locale], :for_marketing => true, :partial => false).first
-          raise "Can't find the template: #{template_path}"
+        unless mail_template = MailEngine::MailTemplate.where(:path => template, :locale => options[:locale], :for_marketing => true, :partial => false).first
+          raise "Can't find the template: #{template}"
         end
 
         options[:subject] ||= mail_template.subject

data/lib/mail_engine/engine.rb

@@ -22,8 +22,6 @@ module MailEngine
     initializer "mail_engine.register_database_template" do
       ActionMailer::Base.layout "layouts/mail_engine/mail_template_layouts/none"
       ActionMailer::Base.prepend_view_path(MailEngine::MailTemplateResolver.instance)
-      # used when mail_template preview.
-      MailEngine::ApplicationController.prepend_view_path(MailEngine::MailTemplateResolver.instance)
     end
 
     initializer "mail_engine.add_acts_as_mail_receiver" do

data/lib/mail_engine/mail_template_resolver.rb

@@ -11,8 +11,8 @@ module MailEngine
 
       conditions = {
         :path    => template_path_and_name,
-        :locale  => normalize_array(details[:locale]).first,
-        :format  => normalize_array(details[:formats]).first,
+        :locale  => normalize_array(details[:locale]),
+        :format  => normalize_array(details[:formats]),
         :handler => normalize_array(details[:handlers]),
         :partial => partial || false
       }

data/mail_engine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_engine}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael he"]

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

@@ -17,10 +17,7 @@ class UserMailer < ActionMailer::Base
 
     # html must below text
     # should use subject in the db mail template.
-    mail :to => to, :subject => "subject in mailer" do |f|
-      f.text
-      f.html
-    end
+    mail :to => to, :subject => "subject in mailer"
   end
 
   def notify_to_user(user)
@@ -28,9 +25,6 @@ class UserMailer < ActionMailer::Base
     @lastname = user.lastname
 
     # html must below text
-    mail :to => user.email do |f|
-      f.text
-      f.html
-    end
+    mail :to => user.email
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail_engine
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - michael he