action_mailer_test_via_smtp 0.2.0 → 0.2.1

data/README.rdoc

@@ -29,6 +29,27 @@ or
 
 I know, the gem name is not valid anymore.
 
+== Custom Mail-Header
+
+You can change the standard test mail header by writing your own renderer. Just set
+
+  config.test_mail_header_renderer = CustomMailHeaderRenderer
+  
+Your class should look something like this
+
+  class CustomMailHeaderRenderer < ActionMailerTestViaSmtp::HeaderRenderer::Base
+    def test_mail_header
+      # you can access 'mail' which is a TMail::Mail
+      "return a prepared string"
+    end
+
+    def test_mail_header_html
+      # you can access 'mail' which is a TMail::Mail
+      "return a prepared string"
+    end
+  end
+  
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/action_mailer_test_via_smtp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{action_mailer_test_via_smtp}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andi Bade"]
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
      "VERSION",
      "action_mailer_test_via_smtp.gemspec",
      "lib/action_mailer_test_via_smtp.rb",
+     "lib/action_mailer_test_via_smtp/header_renderer/base.rb",
+     "lib/action_mailer_test_via_smtp/header_renderer/standard.rb",
      "test/action_mailer_test_via_smtp_test.rb",
      "test/templates/notifier/multipart_email.text.html.erb",
      "test/templates/notifier/multipart_email.text.plain.erb",

data/lib/action_mailer_test_via_smtp.rb

@@ -1,23 +1,34 @@
+require "action_mailer_test_via_smtp/header_renderer/standard"
+
 module ActionMailer
   class Base
     @@test_recipient = false
     cattr_accessor :test_recipient
     
+    @@test_mail_header_renderer = ActionMailerTestViaSmtp::HeaderRenderer::Standard
+    cattr_accessor :test_mail_header_renderer
+    
+    def test_mail_header_renderer(mail)
+      @test_mail_header_renderer ||= self.class.test_mail_header_renderer.new(mail)
+    end
+    
     def generate_test_mail_header(mail)
-      %Q{------------------------------- Test-Mail (#{Rails.env}) -------------------------------
-Original-Recipient: #{mail.to.join(", ")}
-CC: #{mail.cc ? mail.cc.join(", ") : "no CC"}
-BCC: #{mail.bcc ? mail.bcc.join(", ") : "no BCC"}
-----------------------------------------------------------------------------------
-}
+      test_mail_header_renderer(mail).test_mail_header
+    end
+    
+    def generate_test_mail_header_html(mail)
+      test_mail_header_renderer(mail).test_mail_header_html
     end
     
     [:sendmail, :smtp, :test].each do |meth|
       define_method "perform_delivery_test_via_#{meth}" do |mail|
         if mail.multipart?
-          test_mail_header = generate_test_mail_header(mail)
           mail.each_part do |part|
-            part.body = test_mail_header + part.body
+            if part.content_type == "text/html"
+              part.body = generate_test_mail_header_html(mail) + part.body
+            else
+              part.body = generate_test_mail_header(mail) + part.body
+            end
           end
         else
           mail.body = generate_test_mail_header(mail) + mail.body
@@ -30,3 +41,6 @@ BCC: #{mail.bcc ? mail.bcc.join(", ") : "no BCC"}
     end
   end
 end
+
+module ActionMailerTestViaSmtp
+end

data/lib/action_mailer_test_via_smtp/header_renderer/base.rb

@@ -0,0 +1,13 @@
+module ActionMailerTestViaSmtp
+  module HeaderRenderer
+    class Base
+      
+      attr_reader :mail
+      
+      def initialize(mail)
+        @mail = mail
+      end
+      
+    end
+  end
+end

data/lib/action_mailer_test_via_smtp/header_renderer/standard.rb

@@ -0,0 +1,22 @@
+require "action_mailer_test_via_smtp/header_renderer/base"
+
+module ActionMailerTestViaSmtp
+  module HeaderRenderer
+    class Standard < Base
+      
+      def test_mail_header
+        %Q{------------------------------- Test-Mail (#{Rails.env}) -------------------------------
+Original-Recipient: #{mail.to.join(", ")}
+CC: #{mail.cc ? mail.cc.join(", ") : "no CC"}
+BCC: #{mail.bcc ? mail.bcc.join(", ") : "no BCC"}
+----------------------------------------------------------------------------------
+}
+      end
+
+      def test_mail_header_html
+        test_mail_header.gsub("\n", "<br>")
+      end
+      
+    end
+  end
+end

data/test/action_mailer_test_via_smtp_test.rb

@@ -12,13 +12,17 @@ class ActionMailerTestViaSmtpTest < ActiveSupport::TestCase
   
   test "should add content to every body of multipart email" do
     Notifier.deliveries = []
-    Rails.expects(:env).returns(:test)
+    Rails.expects(:env).at_least_once.returns(:test)
     assert Notifier.deliver_multipart_email
     assert_equal 1, Notifier.deliveries.size
     mail = Notifier.deliveries.first
     assert Notifier.deliveries.first.parts.size > 0
     Notifier.deliveries.first.each_part do |part|
-      assert_match /Original-Recipient: test@galaxycats.com/, part.body
+      if part.content_type == "text/html"
+        assert_match /Original-Recipient: test@galaxycats.com<br>/, part.body
+      else
+        assert_match /Original-Recipient: test@galaxycats.com/, part.body
+      end
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Andi Bade
@@ -37,6 +37,8 @@ files:
 - VERSION
 - action_mailer_test_via_smtp.gemspec
 - lib/action_mailer_test_via_smtp.rb
+- lib/action_mailer_test_via_smtp/header_renderer/base.rb
+- lib/action_mailer_test_via_smtp/header_renderer/standard.rb
 - test/action_mailer_test_via_smtp_test.rb
 - test/templates/notifier/multipart_email.text.html.erb
 - test/templates/notifier/multipart_email.text.plain.erb