mail_engine 0.1.6 → 0.1.7

data/.yardoc/checksums

@@ -1,18 +1,20 @@
 lib/mail_engine/sendgrid.rb 9ddb5014301ea6c90f51c53a8f491b81d4fe2e13
 lib/mail_engine/version.rb ef61db17982e6fe17b507089a3bc407c2c511669
-lib/mail_engine/base.rb 506de34b61619211701fbe9dbf22e9055dc6bc1f
-lib/mail_engine/engine.rb 4571a2ccd3a26b6acbb07c6a3412ec2e06bb8b35
-lib/mail_engine/action_mailer_patch.rb 020e6e92590559e30a0cf8f875cc2b004316171d
+lib/mail_engine/base.rb bf22ead460d3b26ebfdfa6699f86fa1bf9e947ea
+lib/mail_engine/engine.rb ca1860ff1467a6b5c31b47949ecbdf4f95fc9ed8
+lib/mail_engine/action_mailer_patch.rb c152911c5f89dcae841c478ed739a8319e20de46
 lib/mail_engine/generators/copy_resources.rb 3e72e4f094070d342c090dd9cca036538b4ebdc6
 lib/mail_engine/generators/create_config.rb 05cbb67778c9094bf60469ccf32401360d599265
+lib/mail_engine/mail_template_resolver.rb 10b48ffe79f58f0a2bc4248c85bfd67e293bd9cc
 lib/mail_engine/generators/install.rb 8de1454821677173bfc7ca1e4d580e92981f285a
-lib/mail_engine/sendgrid/rest_api.rb 7245e928594306c21d9cbf6f8173d06f0f430e7a
-lib/mail_engine/sendgrid/base.rb 3b5a99c4157a654de4f0888a2b8185c80b4e49f7
+lib/mail_engine/sendgrid/rest_api.rb 3b13a57ff688d093643e407a77574d0488d6708c
+lib/mail_engine/sendgrid/base.rb 4a5cdf92eda4808cae9d4e08843f9ee9ec309374
 lib/mail_engine/zip_processor.rb 81a8ad517a7b9c6545a0d97644aeb35e84417ab0
 lib/mail_engine/configuration.rb 7ca78849a5e8d92d6b72ea6c3407417c0cefbe3b
 lib/mail_engine/generators/copy_migrations.rb 217d9e93cf3610b6fdf7474d1430a2a8410e2501
 lib/mail_engine/mail_log_subscriber.rb c36429e447bc6291169d096e424ff0394bdf7233
+lib/mail_engine/liquid_view_patch/liquid_view.rb c355d11144f80c1f6673101626ff3a8a803af09e
 lib/mail_engine/html_document_assets_replacer.rb 079ed661e53513feef39380beaf2824c589aa1b4
 lib/mail_engine/acts_as_mail_receiver.rb 69eb7d9fc658d51f55a815ec993e8aa19bb3d43c
-lib/mail_engine/sendgrid/smtp_api.rb 36e3486fd4df48866b94f8865ade269295a4cabb
-lib/mail_engine.rb bc7fb06744c05b94e442b2a0365a118925517758
+lib/mail_engine/sendgrid/smtp_api.rb e3fae4e21740fa73f7cb3ab18cb7c867f5f69e60
+lib/mail_engine.rb 21212df5c1480610f01760c6a3aef61aad804540

data/Gemfile

@@ -10,7 +10,6 @@ gem 'rack', :git => 'git://github.com/rack/rack.git'
 gem "liquid"
 gem 'kaminari', :git => 'https://github.com/amatsuda/kaminari.git'
 gem "carrierwave", :git => "git://github.com/jnicklas/carrierwave.git"
-gem "mail_safe"
 
 group :development do
   gem "annotate"

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/app/controllers/mail_engine/application_controller.rb

@@ -1,6 +1,4 @@
 class MailEngine::ApplicationController < ApplicationController
-  # used when mail_template preview.
-  prepend_view_path MailEngine::MailTemplateResolver.instance
   layout 'mail_engine/mail_engine'
 
   # set the access check method.

data/doc/ActionMailer/Base.html

@@ -153,7 +153,29 @@
 16
 17
 18
-19</pre>
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/mail_engine/action_mailer_patch.rb', line 5</span>
@@ -161,13 +183,35 @@
 <span class='def def kw'>def</span> <span class='mail identifier id'>mail</span><span class='lparen token'>(</span><span class='headers identifier id'>headers</span><span class='assign token'>=</span><span class='lbrace token'>{</span><span class='rbrace token'>}</span><span class='comma token'>,</span> <span class='bitand op'>&amp;</span><span class='block identifier id'>block</span><span class='rparen token'>)</span>
   <span class='comment val'># order by latest uploaded, for get the latest updated 'subject'</span>
   <span class='current_template identifier id'>current_template</span> <span class='assign token'>=</span> <span class='MailEngine constant id'>MailEngine</span><span class='colon2 op'>::</span><span class='MailTemplate constant id'>MailTemplate</span><span class='dot token'>.</span><span class='where identifier id'>where</span><span class='lparen token'>(</span><span class='symbol val'>:path</span> <span class='assign token'>=</span><span class='gt op'>&gt;</span> <span class='dstring node'>&quot;#{controller_path}/#{action_name}&quot;</span><span class='comma token'>,</span> <span class='symbol val'>:locale</span> <span class='assign token'>=</span><span class='gt op'>&gt;</span> <span class='I18n constant id'>I18n</span><span class='dot token'>.</span><span class='locale identifier id'>locale</span><span class='comma token'>,</span> <span class='symbol val'>:partial</span> <span class='assign token'>=</span><span class='gt op'>&gt;</span> <span class='false false kw'>false</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='order identifier id'>order</span><span class='lparen token'>(</span><span class='string val'>&quot;updated_at desc&quot;</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='first identifier id'>first</span>
-  <span class='headers identifier id'>headers</span><span class='lbrack token'>[</span><span class='symbol val'>:subject</span><span class='rbrack token'>]</span> <span class='assign token'>=</span> <span class='current_template identifier id'>current_template</span><span class='dot token'>.</span><span class='subject identifier id'>subject</span> <span class='if if_mod kw'>if</span> <span class='headers identifier id'>headers</span><span class='lbrack token'>[</span><span class='symbol val'>:subject</span><span class='rbrack token'>]</span><span class='dot token'>.</span><span class='blank? fid id'>blank?</span> <span class='andop op'>&amp;&amp;</span> <span class='current_template identifier id'>current_template</span><span class='dot token'>.</span><span class='present? fid id'>present?</span>
+
+  <span class='comment val'># {'username' =&gt; @username, 'gender' =&gt; @gender}</span>
+  <span class='instance_variable_hash identifier id'>instance_variable_hash</span> <span class='assign token'>=</span> <span class='lbrace token'>{</span><span class='rbrace token'>}</span>
+  <span class='self self kw'>self</span><span class='dot token'>.</span><span class='instance_variables identifier id'>instance_variables</span><span class='dot token'>.</span><span class='each identifier id'>each</span> <span class='lbrace token'>{</span> <span class='bitor op'>|</span><span class='var identifier id'>var</span><span class='bitor op'>|</span> <span class='instance_variable_hash identifier id'>instance_variable_hash</span><span class='lbrack token'>[</span><span class='var identifier id'>var</span><span class='dot token'>.</span><span class='sub identifier id'>sub</span><span class='lparen token'>(</span><span class='regexp val'>/^@/</span><span class='comma token'>,</span><span class='string val'>''</span><span class='rparen token'>)</span><span class='rbrack token'>]</span> <span class='assign token'>=</span> <span class='self self kw'>self</span><span class='dot token'>.</span><span class='instance_variable_get identifier id'>instance_variable_get</span><span class='lparen token'>(</span><span class='var identifier id'>var</span><span class='rparen token'>)</span> <span class='rbrace token'>}</span>
+
+  <span class='headers identifier id'>headers</span><span class='lbrack token'>[</span><span class='symbol val'>:subject</span><span class='rbrack token'>]</span> <span class='assign token'>=</span> <span class='Liquid constant id'>Liquid</span><span class='colon2 op'>::</span><span class='Template constant id'>Template</span><span class='dot token'>.</span><span class='parse identifier id'>parse</span><span class='lparen token'>(</span><span class='current_template identifier id'>current_template</span><span class='dot token'>.</span><span class='subject identifier id'>subject</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='render identifier id'>render</span><span class='lparen token'>(</span><span class='instance_variable_hash identifier id'>instance_variable_hash</span><span class='rparen token'>)</span> <span class='if if_mod kw'>if</span> <span class='current_template identifier id'>current_template</span><span class='dot token'>.</span><span class='present? fid id'>present?</span>
   <span class='headers identifier id'>headers</span><span class='lbrack token'>[</span><span class='symbol val'>:message_id</span><span class='rbrack token'>]</span> <span class='assign token'>=</span> <span class='dstring node'>&quot;#{controller_path}/#{action_name}&quot;</span>
 
+  <span class='unless unless kw'>unless</span> <span class='block_given? fid id'>block_given?</span>
+    <span class='puts identifier id'>puts</span> <span class='string val'>&quot;\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 =&gt; 'xxx@xxx.com' do |format|
+        format.text
+        format.html
+      end
+      \e[0m&quot;</span>
+  <span class='end end kw'>end</span>
+
   <span class='comment val'># Add sendgrid header before sending mail.</span>
   <span class='comment val'># Why here but not add to default_params of action_mailer? because the receiver email [:to] only can get here.</span>
   <span class='if if kw'>if</span> <span class='self self kw'>self</span><span class='dot token'>.</span><span class='sendgrid_config identifier id'>sendgrid_config</span>
-    <span class='self self kw'>self</span><span class='dot token'>.</span><span class='sendgrid_config identifier id'>sendgrid_config</span><span class='dot token'>.</span><span class='add_to identifier id'>add_to</span> <span class='headers identifier id'>headers</span><span class='lbrack token'>[</span><span class='symbol val'>:to</span><span class='rbrack token'>]</span>
+    <span class='comment val'># if add &quot;replacement_email&quot; option in config</span>
+    <span class='receiver identifier id'>receiver</span> <span class='assign token'>=</span> <span class='if if kw'>if</span> <span class='defined? defined kw'>defined?</span><span class='lparen token'>(</span><span class='colon3 op'>::</span><span class='MailSafe constant id'>MailSafe</span><span class='colon2 op'>::</span><span class='Config constant id'>Config</span><span class='rparen token'>)</span> <span class='and and kw'>and</span> <span class='colon3 op'>::</span><span class='MailSafe constant id'>MailSafe</span><span class='colon2 op'>::</span><span class='Config constant id'>Config</span><span class='dot token'>.</span><span class='replacement_address identifier id'>replacement_address</span>
+                 <span class='colon3 op'>::</span><span class='MailSafe constant id'>MailSafe</span><span class='colon2 op'>::</span><span class='Config constant id'>Config</span><span class='dot token'>.</span><span class='get_replacement_address identifier id'>get_replacement_address</span><span class='lparen token'>(</span><span class='headers identifier id'>headers</span><span class='lbrack token'>[</span><span class='symbol val'>:to</span><span class='rbrack token'>]</span><span class='rparen token'>)</span>
+               <span class='else else kw'>else</span>
+                 <span class='headers identifier id'>headers</span><span class='lbrack token'>[</span><span class='symbol val'>:to</span><span class='rbrack token'>]</span>
+               <span class='end end kw'>end</span>
+    <span class='self self kw'>self</span><span class='dot token'>.</span><span class='sendgrid_config identifier id'>sendgrid_config</span><span class='dot token'>.</span><span class='set_send_to identifier id'>set_send_to</span> <span class='receiver identifier id'>receiver</span>
     <span class='origin_mail identifier id'>origin_mail</span><span class='lparen token'>(</span><span class='headers identifier id'>headers</span><span class='dot token'>.</span><span class='merge identifier id'>merge</span><span class='lparen token'>(</span><span class='self self kw'>self</span><span class='dot token'>.</span><span class='sendgrid_config identifier id'>sendgrid_config</span><span class='dot token'>.</span><span class='to_hash identifier id'>to_hash</span><span class='rparen token'>)</span><span class='comma token'>,</span> <span class='bitand op'>&amp;</span><span class='block identifier id'>block</span><span class='rparen token'>)</span>
   <span class='else else kw'>else</span>
     <span class='origin_mail identifier id'>origin_mail</span><span class='lparen token'>(</span><span class='headers identifier id'>headers</span><span class='comma token'>,</span> <span class='bitand op'>&amp;</span><span class='block identifier id'>block</span><span class='rparen token'>)</span>
@@ -184,7 +228,7 @@
 </div>
     
     <div id="footer">
-  Generated on Fri Mar  4 17:56:26 2011 by 
+  Generated on Mon Mar 14 22:31:46 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.4 (ruby-1.8.7).
 </div>

data/doc/ActionMailer/Collector.html

@@ -133,18 +133,18 @@
       <pre class="lines">
 
 
-101
-102
-103
-104
-105
-106
-107
-108
-109</pre>
+123
+124
+125
+126
+127
+128
+129
+130
+131</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/mail_engine/action_mailer_patch.rb', line 101</span>
+      <pre class="code"><span class="info file"># File 'lib/mail_engine/action_mailer_patch.rb', line 123</span>
 
 <span class='def def kw'>def</span> <span class='custom identifier id'>custom</span><span class='lparen token'>(</span><span class='mime identifier id'>mime</span><span class='comma token'>,</span> <span class='options identifier id'>options</span><span class='assign token'>=</span><span class='lbrace token'>{</span><span class='rbrace token'>}</span><span class='rparen token'>)</span>
   <span class='options identifier id'>options</span><span class='dot token'>.</span><span class='reverse_merge! fid id'>reverse_merge!</span><span class='lparen token'>(</span><span class='symbol val'>:content_type</span> <span class='assign token'>=</span><span class='gt op'>&gt;</span> <span class='mime identifier id'>mime</span><span class='dot token'>.</span><span class='to_s identifier id'>to_s</span><span class='rparen token'>)</span>
@@ -166,7 +166,7 @@
 </div>
     
     <div id="footer">
-  Generated on Fri Mar  4 17:56:26 2011 by 
+  Generated on Mon Mar 14 22:31:43 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.4 (ruby-1.8.7).
 </div>

data/doc/ActionMailer.html

@@ -99,7 +99,7 @@ format.text { xxxx; render ‘xxx’ }
 </div>
     
     <div id="footer">
-  Generated on Fri Mar  4 17:56:26 2011 by 
+  Generated on Mon Mar 14 22:31:44 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.4 (ruby-1.8.7).
 </div>