mail_engine 0.1.6 → 0.1.7

data/doc/method_list.html

@@ -69,6 +69,14 @@
   
 
   <li class="r2 ">
+    <span class='object_link'><a href="LiquidView.html#call-class_method" title="LiquidView.call (method)">call</a></span> 
+    
+      <small>LiquidView</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/SmtpApi.html#category-instance_method" title="MailEngine::Sendgrid::SmtpApi#category (method)">#category</a></span> 
     
       <small>MailEngine::Sendgrid::SmtpApi</small>
@@ -76,7 +84,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MailEngine/HtmlDocumentAssetsReplacer.html#check%21-class_method" title="MailEngine::HtmlDocumentAssetsReplacer.check! (method)">check!</a></span> 
     
       <small>MailEngine::HtmlDocumentAssetsReplacer</small>
@@ -84,6 +92,14 @@
   </li>
   
 
+  <li class="r1 ">
+    <span class='object_link'><a href="LiquidView.html#compilable%3F-instance_method" title="LiquidView#compilable? (method)">#compilable?</a></span> 
+    
+      <small>LiquidView</small>
+    
+  </li>
+  
+
   <li class="r2 ">
     <span class='object_link'><a href="MailEngine/Install.html#copy_migrations-instance_method" title="MailEngine::Install#copy_migrations (method)">#copy_migrations</a></span> 
     
@@ -180,6 +196,22 @@
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="MailEngine/MailTemplateResolver.html#find_templates-instance_method" title="MailEngine::MailTemplateResolver#find_templates (method)">#find_templates</a></span> 
+    
+      <small>MailEngine::MailTemplateResolver</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
+    <span class='object_link'><a href="LiquidView.html#initialize-instance_method" title="LiquidView#initialize (method)">#initialize</a></span> 
+    
+      <small>LiquidView</small>
+    
+  </li>
+  
+
   <li class="r2 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/FilterSetting.html#initialize-instance_method" title="MailEngine::Sendgrid::FilterSetting#initialize (method)">#initialize</a></span> 
     
@@ -197,6 +229,14 @@
   
 
   <li class="r2 ">
+    <span class='object_link'><a href="MailEngine/MailTemplateResolver.html#initialize_template-instance_method" title="MailEngine::MailTemplateResolver#initialize_template (method)">#initialize_template</a></span> 
+    
+      <small>MailEngine::MailTemplateResolver</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/RestApi.html#invalidemails-class_method" title="MailEngine::Sendgrid::RestApi.invalidemails (method)">invalidemails</a></span> 
     
       <small>MailEngine::Sendgrid::RestApi</small>
@@ -204,7 +244,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MailEngine/Configuration.html#load-class_method" title="MailEngine::Configuration.load (method)">load</a></span> 
     
       <small>MailEngine::Configuration</small>
@@ -212,7 +252,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="ActionMailer/Base.html#mail-instance_method" title="ActionMailer::Base#mail (method)">#mail</a></span> 
     
       <small>ActionMailer::Base</small>
@@ -220,7 +260,23 @@
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="MailEngine/MailTemplateResolver.html#normalize_array-instance_method" title="MailEngine::MailTemplateResolver#normalize_array (method)">#normalize_array</a></span> 
+    
+      <small>MailEngine::MailTemplateResolver</small>
+    
+  </li>
+  
+
   <li class="r1 ">
+    <span class='object_link'><a href="MailEngine/MailTemplateResolver.html#normalize_path-instance_method" title="MailEngine::MailTemplateResolver#normalize_path (method)">#normalize_path</a></span> 
+    
+      <small>MailEngine::MailTemplateResolver</small>
+    
+  </li>
+  
+
+  <li class="r2 ">
     <span class='object_link'><a href="MailEngine/HtmlDocumentAssetsReplacer.html#process-class_method" title="MailEngine::HtmlDocumentAssetsReplacer.process (method)">process</a></span> 
     
       <small>MailEngine::HtmlDocumentAssetsReplacer</small>
@@ -228,6 +284,14 @@
   </li>
   
 
+  <li class="r1 ">
+    <span class='object_link'><a href="LiquidView.html#render-instance_method" title="LiquidView#render (method)">#render</a></span> 
+    
+      <small>LiquidView</small>
+    
+  </li>
+  
+
   <li class="r2 ">
     <span class='object_link'><a href="MailEngine/HtmlDocumentAssetsReplacer.html#replace_resource_in_html-class_method" title="MailEngine::HtmlDocumentAssetsReplacer.replace_resource_in_html (method)">replace_resource_in_html</a></span> 
     
@@ -253,7 +317,7 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="MailEngine/Sendgrid/SmtpApi.html#set_unique_args-instance_method" title="MailEngine::Sendgrid::SmtpApi#set_unique_args (method)">#set_unique_args</a></span> 
+    <span class='object_link'><a href="MailEngine/Sendgrid/SmtpApi.html#set_send_to-instance_method" title="MailEngine::Sendgrid::SmtpApi#set_send_to (method)">#set_send_to</a></span> 
     
       <small>MailEngine::Sendgrid::SmtpApi</small>
     
@@ -261,6 +325,14 @@
   
 
   <li class="r2 ">
+    <span class='object_link'><a href="MailEngine/Sendgrid/SmtpApi.html#set_unique_args-instance_method" title="MailEngine::Sendgrid::SmtpApi#set_unique_args (method)">#set_unique_args</a></span> 
+    
+      <small>MailEngine::Sendgrid::SmtpApi</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/RestApi.html#spamreports-class_method" title="MailEngine::Sendgrid::RestApi.spamreports (method)">spamreports</a></span> 
     
       <small>MailEngine::Sendgrid::RestApi</small>
@@ -268,7 +340,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/RestApi.html#stats-class_method" title="MailEngine::Sendgrid::RestApi.stats (method)">stats</a></span> 
     
       <small>MailEngine::Sendgrid::RestApi</small>
@@ -276,7 +348,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/SmtpApi.html#to_hash-instance_method" title="MailEngine::Sendgrid::SmtpApi#to_hash (method)">#to_hash</a></span> 
     
       <small>MailEngine::Sendgrid::SmtpApi</small>
@@ -284,7 +356,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/SmtpApi.html#to_json-instance_method" title="MailEngine::Sendgrid::SmtpApi#to_json (method)">#to_json</a></span> 
     
       <small>MailEngine::Sendgrid::SmtpApi</small>
@@ -292,7 +364,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MailEngine/Sendgrid/SmtpApi.html#to_s-instance_method" title="MailEngine::Sendgrid::SmtpApi#to_s (method)">#to_s</a></span> 
     
       <small>MailEngine::Sendgrid::SmtpApi</small>
@@ -300,6 +372,14 @@
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="MailEngine/MailTemplateResolver.html#virtual_path-instance_method" title="MailEngine::MailTemplateResolver#virtual_path (method)">#virtual_path</a></span> 
+    
+      <small>MailEngine::MailTemplateResolver</small>
+    
+  </li>
+  
+
       </ul>
     </div>
   </body>

data/doc/top-level-namespace.html

@@ -69,6 +69,8 @@
     
    
     
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="LiquidView.html" title="LiquidView (class)">LiquidView</a></span>
+    
   
 </p>
 
@@ -79,7 +81,7 @@
 </div>
     
     <div id="footer">
-  Generated on Fri Mar  4 17:56:27 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/lib/mail_engine/action_mailer_patch.rb

@@ -28,8 +28,8 @@ 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 defined?(::MailSafe::Config) and ::MailSafe::Config.replacement_address
-                     ::MailSafe::Config.get_replacement_address(headers[:to])
+        receiver = if replacement_email = MailEngine::Base.current_config["replacement_email"]
+                     replacement_email
                    else
                      headers[:to]
                    end

data/lib/mail_engine/engine.rb

@@ -21,7 +21,9 @@ module MailEngine
 
     initializer "mail_engine.register_database_template" do
       ActionMailer::Base.layout "layouts/mail_engine/mail_template_layouts/none"
-      ActionMailer::Base.send(:prepend_view_path, MailEngine::MailTemplateResolver.instance)
+      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
@@ -48,12 +50,6 @@ module MailEngine
       if MailEngine::Base.current_config.present?
         raise "Please add :user_class_name config into mail_engine_config.yml." if MailEngine::Base.current_config["user_class_name"].blank?
         MailEngine::USER_MODEL = MailEngine::Base.current_config["user_class_name"].constantize unless defined?(MailEngine::USER_MODEL)
-
-        # in development mode all mails send to replacement_email_in_dev_mode
-        if defined?(::MailSafe::Config) and replacement_email = MailEngine::Base.current_config["replacement_email"]
-          ::MailSafe::Config.internal_address_definition = /#{replacement_email}/
-          ::MailSafe::Config.replacement_address = replacement_email
-        end
       else
         puts "\e[1;31;40m[Mail Engine Warning]\e[0m Not found mail_engine_config.yml, so mail_engine won't be able to work."
       end

data/mail_engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_engine}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael he"]
-  s.date = %q{2011-03-14}
+  s.date = %q{2011-03-15}
   s.description = %q{Rails system mail management solution.}
   s.email = %q{hlxwell@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,13 @@ Gem::Specification.new do |s|
     ".yardoc/objects/ActionMailer/Base/set_layout_and_partials_i.dat",
     ".yardoc/objects/ActionMailer/Collector.dat",
     ".yardoc/objects/ActionMailer/Collector/custom_i.dat",
+    ".yardoc/objects/LiquidView.dat",
+    ".yardoc/objects/LiquidView/PROTECTED_ASSIGNS.dat",
+    ".yardoc/objects/LiquidView/PROTECTED_INSTANCE_VARIABLES.dat",
+    ".yardoc/objects/LiquidView/call_c.dat",
+    ".yardoc/objects/LiquidView/compilable_3F_i.dat",
+    ".yardoc/objects/LiquidView/initialize_i.dat",
+    ".yardoc/objects/LiquidView/render_i.dat",
     ".yardoc/objects/MailEngine.dat",
     ".yardoc/objects/MailEngine/ActsAsMailReceiver.dat",
     ".yardoc/objects/MailEngine/ActsAsMailReceiver/ClassMethods.dat",
@@ -54,6 +61,12 @@ Gem::Specification.new do |s|
     ".yardoc/objects/MailEngine/Install/create_config_i.dat",
     ".yardoc/objects/MailEngine/MailLogSubscriber.dat",
     ".yardoc/objects/MailEngine/MailLogSubscriber/deliver_i.dat",
+    ".yardoc/objects/MailEngine/MailTemplateResolver.dat",
+    ".yardoc/objects/MailEngine/MailTemplateResolver/find_templates_i.dat",
+    ".yardoc/objects/MailEngine/MailTemplateResolver/initialize_template_i.dat",
+    ".yardoc/objects/MailEngine/MailTemplateResolver/normalize_array_i.dat",
+    ".yardoc/objects/MailEngine/MailTemplateResolver/normalize_path_i.dat",
+    ".yardoc/objects/MailEngine/MailTemplateResolver/virtual_path_i.dat",
     ".yardoc/objects/MailEngine/PLACEHOLDERS_IN_LAYOUT.dat",
     ".yardoc/objects/MailEngine/Sendgrid.dat",
     ".yardoc/objects/MailEngine/Sendgrid/Base.dat",
@@ -78,6 +91,7 @@ Gem::Specification.new do |s|
     ".yardoc/objects/MailEngine/Sendgrid/SmtpApi/category_i.dat",
     ".yardoc/objects/MailEngine/Sendgrid/SmtpApi/filters_i.dat",
     ".yardoc/objects/MailEngine/Sendgrid/SmtpApi/initialize_i.dat",
+    ".yardoc/objects/MailEngine/Sendgrid/SmtpApi/set_send_to_i.dat",
     ".yardoc/objects/MailEngine/Sendgrid/SmtpApi/set_unique_args_i.dat",
     ".yardoc/objects/MailEngine/Sendgrid/SmtpApi/to_hash_i.dat",
     ".yardoc/objects/MailEngine/Sendgrid/SmtpApi/to_json_i.dat",
@@ -154,6 +168,7 @@ Gem::Specification.new do |s|
     "doc/ActionMailer.html",
     "doc/ActionMailer/Base.html",
     "doc/ActionMailer/Collector.html",
+    "doc/LiquidView.html",
     "doc/MailEngine.html",
     "doc/MailEngine/ActsAsMailReceiver.html",
     "doc/MailEngine/ActsAsMailReceiver/ClassMethods.html",
@@ -167,6 +182,7 @@ Gem::Specification.new do |s|
     "doc/MailEngine/HtmlDocumentAssetsReplacer.html",
     "doc/MailEngine/Install.html",
     "doc/MailEngine/MailLogSubscriber.html",
+    "doc/MailEngine/MailTemplateResolver.html",
     "doc/MailEngine/Sendgrid.html",
     "doc/MailEngine/Sendgrid/Base.html",
     "doc/MailEngine/Sendgrid/Base/ClassMethods.html",
@@ -618,7 +634,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<liquid>, [">= 0"])
       s.add_runtime_dependency(%q<kaminari>, [">= 0"])
       s.add_runtime_dependency(%q<carrierwave>, [">= 0"])
-      s.add_runtime_dependency(%q<mail_safe>, [">= 0"])
       s.add_development_dependency(%q<annotate>, [">= 0"])
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -636,7 +651,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<liquid>, [">= 0"])
       s.add_dependency(%q<kaminari>, [">= 0"])
       s.add_dependency(%q<carrierwave>, [">= 0"])
-      s.add_dependency(%q<mail_safe>, [">= 0"])
       s.add_dependency(%q<annotate>, [">= 0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -655,7 +669,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<liquid>, [">= 0"])
     s.add_dependency(%q<kaminari>, [">= 0"])
     s.add_dependency(%q<carrierwave>, [">= 0"])
-    s.add_dependency(%q<mail_safe>, [">= 0"])
     s.add_dependency(%q<annotate>, [">= 0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/test/functional/user_mailer_test.rb

@@ -7,12 +7,9 @@ class UserMailerTest < ActionController::TestCase
     end
 
     should "send to safe mail address" do
-      replacement_email = "xxx@xxx.com"
-      MailSafe::Config.internal_address_definition = /#{replacement_email}/
-      MailSafe::Config.replacement_address = replacement_email
-
+      MailEngine::Base.current_config["replacement_email"] = "xxx@xxx.com"
       UserMailer.notify("x@x.com").deliver
-      assert UserMailer.sendgrid_config.to_hash["X-SMTPAPI"].include?("[\"#{replacement_email}\"]")
+      assert UserMailer.sendgrid_config.to_hash["X-SMTPAPI"].include?("[\"xxx@xxx.com\"]")
     end
 
     should "only send mail to the receiver" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail_engine
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - michael he
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +08:00
+date: 2011-03-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,8 +158,8 @@ dependencies:
         version: "0"
   requirement: *id010
   prerelease: false
-  name: mail_safe
-  type: :runtime
+  name: annotate
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -172,7 +172,7 @@ dependencies:
         version: "0"
   requirement: *id011
   prerelease: false
-  name: annotate
+  name: bluecloth
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
@@ -186,7 +186,7 @@ dependencies:
         version: "0"
   requirement: *id012
   prerelease: false
-  name: bluecloth
+  name: yard
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
@@ -200,7 +200,7 @@ dependencies:
         version: "0"
   requirement: *id013
   prerelease: false
-  name: yard
+  name: bundler
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
@@ -214,7 +214,7 @@ dependencies:
         version: "0"
   requirement: *id014
   prerelease: false
-  name: bundler
+  name: jeweler
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
@@ -228,7 +228,7 @@ dependencies:
         version: "0"
   requirement: *id015
   prerelease: false
-  name: jeweler
+  name: rcov
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
@@ -242,20 +242,6 @@ dependencies:
         version: "0"
   requirement: *id016
   prerelease: false
-  name: rcov
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id017
-  prerelease: false
   name: reek
   type: :development
 description: Rails system mail management solution.
@@ -276,6 +262,13 @@ files:
 - .yardoc/objects/ActionMailer/Base/set_layout_and_partials_i.dat
 - .yardoc/objects/ActionMailer/Collector.dat
 - .yardoc/objects/ActionMailer/Collector/custom_i.dat
+- .yardoc/objects/LiquidView.dat
+- .yardoc/objects/LiquidView/PROTECTED_ASSIGNS.dat
+- .yardoc/objects/LiquidView/PROTECTED_INSTANCE_VARIABLES.dat
+- .yardoc/objects/LiquidView/call_c.dat
+- .yardoc/objects/LiquidView/compilable_3F_i.dat
+- .yardoc/objects/LiquidView/initialize_i.dat
+- .yardoc/objects/LiquidView/render_i.dat
 - .yardoc/objects/MailEngine.dat
 - .yardoc/objects/MailEngine/ActsAsMailReceiver.dat
 - .yardoc/objects/MailEngine/ActsAsMailReceiver/ClassMethods.dat
@@ -305,6 +298,12 @@ files:
 - .yardoc/objects/MailEngine/Install/create_config_i.dat
 - .yardoc/objects/MailEngine/MailLogSubscriber.dat
 - .yardoc/objects/MailEngine/MailLogSubscriber/deliver_i.dat
+- .yardoc/objects/MailEngine/MailTemplateResolver.dat
+- .yardoc/objects/MailEngine/MailTemplateResolver/find_templates_i.dat
+- .yardoc/objects/MailEngine/MailTemplateResolver/initialize_template_i.dat
+- .yardoc/objects/MailEngine/MailTemplateResolver/normalize_array_i.dat
+- .yardoc/objects/MailEngine/MailTemplateResolver/normalize_path_i.dat
+- .yardoc/objects/MailEngine/MailTemplateResolver/virtual_path_i.dat
 - .yardoc/objects/MailEngine/PLACEHOLDERS_IN_LAYOUT.dat
 - .yardoc/objects/MailEngine/Sendgrid.dat
 - .yardoc/objects/MailEngine/Sendgrid/Base.dat
@@ -329,6 +328,7 @@ files:
 - .yardoc/objects/MailEngine/Sendgrid/SmtpApi/category_i.dat
 - .yardoc/objects/MailEngine/Sendgrid/SmtpApi/filters_i.dat
 - .yardoc/objects/MailEngine/Sendgrid/SmtpApi/initialize_i.dat
+- .yardoc/objects/MailEngine/Sendgrid/SmtpApi/set_send_to_i.dat
 - .yardoc/objects/MailEngine/Sendgrid/SmtpApi/set_unique_args_i.dat
 - .yardoc/objects/MailEngine/Sendgrid/SmtpApi/to_hash_i.dat
 - .yardoc/objects/MailEngine/Sendgrid/SmtpApi/to_json_i.dat
@@ -405,6 +405,7 @@ files:
 - doc/ActionMailer.html
 - doc/ActionMailer/Base.html
 - doc/ActionMailer/Collector.html
+- doc/LiquidView.html
 - doc/MailEngine.html
 - doc/MailEngine/ActsAsMailReceiver.html
 - doc/MailEngine/ActsAsMailReceiver/ClassMethods.html
@@ -418,6 +419,7 @@ files:
 - doc/MailEngine/HtmlDocumentAssetsReplacer.html
 - doc/MailEngine/Install.html
 - doc/MailEngine/MailLogSubscriber.html
+- doc/MailEngine/MailTemplateResolver.html
 - doc/MailEngine/Sendgrid.html
 - doc/MailEngine/Sendgrid/Base.html
 - doc/MailEngine/Sendgrid/Base/ClassMethods.html