padrino-mailer 0.9.10 → 0.9.11

data/test/fixtures/views/mailers/multipart/basic.html.erb

@@ -0,0 +1 @@
+text html

data/test/fixtures/views/mailers/multipart/basic.plain.erb

@@ -0,0 +1 @@
+plain text

data/test/fixtures/views/mailers/sample/foo.erb

@@ -0,0 +1 @@
+This is a foo message in mailers/sample dir

data/test/helper.rb

@@ -1,51 +1,26 @@
-require 'rubygems'
+ENV['PADRINO_ENV'] = 'test'
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+require File.expand_path('../../../load_paths', __FILE__)
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require 'rack/test'
-require 'webrat'
-
-# We try to load the vendored padrino-core if exist
-%w(core).each do |lib|
-  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{lib}/lib")
-    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{lib}/lib"
-  end
-end
-
+require 'padrino-core'
 require 'padrino-mailer'
 
 class Test::Unit::TestCase
   include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
 
-  Webrat.configure do |config|
-    config.mode = :rack
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(base=Padrino::Application, &block)
+    @app = Sinatra.new(base, &block)
   end
 
-  def stop_time_for_test
-    time = Time.now
-    Time.stubs(:now).returns(time)
-    return time
-  end
-
-  # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_tag(name, attributes = {}, &block)
-    html = block && block.call
-    matcher = HaveSelector.new(name, attributes)
-    raise "Please specify a block!" if html.blank?
-    assert matcher.matches?(html), matcher.failure_message
-  end
-
-  # assert_has_no_tag, tag(:h1, :content => "yellow") { "<h1>green</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_no_tag(name, attributes = {}, &block)
-    html = block && block.call
-    attributes.merge!(:count => 0)
-    matcher = HaveSelector.new(name, attributes)
-    raise "Please specify a block!" if html.blank?
-    assert matcher.matches?(html), matcher.failure_message
+  def app
+    Rack::Lint.new(@app)
   end
 
   # Silences the output by redirecting to stringIO
@@ -58,17 +33,38 @@ class Test::Unit::TestCase
     log_buffer.rewind && log_buffer.read
   end
 
+  def pop_last_delivery
+    Mail::TestMailer.deliveries.pop
+  end
+
+  # Asserts that the specified email object was delivered
+  def assert_email_sent(mail_attributes, options={})
+    mail_message = Mail::TestMailer.deliveries.last
+    raise "No mail message has been sent!" unless mail_message.present?
+    smtp_settings = options.delete(:smtp) || mail_attributes.delete(:smtp)
+    delivery_attributes = mail_attributes
+    delivery_attributes = { :to => Array(mail_attributes[:to]), :from => Array(mail_attributes[:from]) }
+    delivery_attributes.each_pair do |k, v|
+      unless mail_message.method(k).call == v
+        raise "Mail failure (#{k}): #{mail_message.attributes.inspect} does not match #{delivery_attributes.inspect}"
+      end
+    end
+    Mail::TestMailer.deliveries.clear
+  end
+
   # Asserts that a file matches the pattern
   def assert_match_in_file(pattern, file)
     assert File.exist?(file), "File '#{file}' does not exist!"
     assert_match pattern, File.read(file)
   end
-end
 
-module Webrat
-  module Logging
-    def logger # :nodoc:
-      @logger = nil
+  # Delegate other missing methods to response.
+  def method_missing(name, *args, &block)
+    if response && response.respond_to?(name)
+      response.send(name, *args, &block)
+    else
+      super(name, *args, &block)
     end
   end
+  alias :response :last_response
 end

data/test/test_email.rb

@@ -0,0 +1,158 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestEmail < Test::Unit::TestCase
+
+  context 'the mailer in a app' do
+
+    should 'send a basic inline email' do
+      mock_app do
+        register Padrino::Mailer
+        get "/" do
+          email do
+            from    'padrino@me.com'
+            to      'padrino@you.com'
+            subject 'Hello there Padrino'
+            body    'Body'
+            via     :test
+          end
+        end
+      end
+      get "/"
+      assert ok?
+      email = pop_last_delivery
+      assert_equal ['padrino@me.com'],    email.from
+      assert_equal ['padrino@you.com'],   email.to
+      assert_equal 'Hello there Padrino', email.subject
+      assert_equal 'Body',                email.body.to_s
+    end
+
+    should 'send a basic inline from hash' do
+      mock_app do
+        register Padrino::Mailer
+        get "/" do
+          email({
+            :from    => 'padrino@me.com',
+            :to      => 'padrino@you.com',
+            :subject => 'Hello there Padrino',
+            :body    => 'Body',
+            :via     => :test
+          })
+        end
+      end
+      get "/"
+      assert ok?
+      email = pop_last_delivery
+      assert_equal ['padrino@me.com'],    email.from
+      assert_equal ['padrino@you.com'],   email.to
+      assert_equal 'Hello there Padrino', email.subject
+      assert_equal 'Body',                email.body.to_s
+    end
+
+    should 'send an basic email with body template' do
+      mock_app do
+        register Padrino::Mailer
+        get "/" do
+          email do
+            views   File.dirname(__FILE__) + '/fixtures'
+            from    'padrino@me.com'
+            to      'padrino@you.com'
+            subject 'Hello there Padrino'
+            render  :basic
+            via     :test
+          end
+        end
+      end
+      get "/"
+      assert ok?
+      email = pop_last_delivery
+      assert_equal ['padrino@me.com'],    email.from
+      assert_equal ['padrino@you.com'],   email.to
+      assert_equal 'Hello there Padrino', email.subject
+      assert_equal 'This is a body of text from a template', email.body.to_s
+    end
+
+    should 'send emails with scoped mailer defaults' do
+      mock_app do
+        register Padrino::Mailer
+        set :views, File.dirname(__FILE__) + '/fixtures/views'
+        mailer :alternate do
+          defaults :from => 'padrino@from.com', :to => 'padrino@to.com'
+          email :foo do
+            to 'padrino@different.com'
+            subject 'Hello there again Padrino'
+            via     :test
+            render  'alternate/foo'
+          end
+        end
+        get("/") { deliver(:alternate, :foo) }
+      end
+      get "/"
+      assert ok?
+      email = pop_last_delivery
+      assert_equal ['padrino@from.com'],    email.from, "should have used default value"
+      assert_equal ['padrino@different.com'],   email.to, "should have overwritten default value"
+      assert_equal 'Hello there again Padrino', email.subject
+      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s
+    end
+
+    should 'send emails with app mailer defaults' do
+      mock_app do
+        register Padrino::Mailer
+        set :views, File.dirname(__FILE__) + '/fixtures/views'
+        set :mailer_defaults, :from => 'padrino@from.com', :to => 'padrino@to.com', :subject => "This is a test"
+        mailer :alternate do
+          email :foo do
+            to 'padrino@different.com'
+            via     :test
+            render  'alternate/foo'
+          end
+        end
+        get("/") { deliver(:alternate, :foo) }
+      end
+      get "/"
+      assert ok?
+      email = pop_last_delivery
+      assert_equal ['padrino@from.com'],    email.from, "should have used default value"
+      assert_equal ['padrino@different.com'],   email.to, "should have overwritten default value"
+      assert_equal 'This is a test', email.subject
+      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s
+    end
+
+    should 'send emails without layout' do
+      mock_app do
+        register Padrino::Mailer
+        set :views, File.dirname(__FILE__) + '/fixtures/views'
+        mailer :alternate do
+          email :foo do
+            from    'padrino@me.com'
+            to      'padrino@you.com'
+            subject 'Hello there Padrino'
+            via     :test
+            render  'alternate/foo'
+          end
+        end
+        get("/") { deliver(:alternate, :foo) }
+      end
+      get "/"
+      assert ok?
+      email = pop_last_delivery
+      assert_equal ['padrino@me.com'],    email.from
+      assert_equal ['padrino@you.com'],   email.to
+      assert_equal 'Hello there Padrino', email.subject
+      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s
+      assert_match /TestMailer/, email.delivery_method.to_s
+    end
+
+    should 'raise an error if there are two messages with the same name' do
+      assert_raise RuntimeError do
+        mock_app do
+          register Padrino::Mailer
+          mailer :foo do
+            email :bar do; end
+            email :bar do; end
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_message.rb

@@ -0,0 +1,153 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestMessage < Test::Unit::TestCase
+
+  context 'the message' do
+    should "accept headers and body" do
+      message = Mail::Message.new do
+        from    'padrino@me.com'
+        to      'padrino@you.com'
+        subject 'Hello there Padrino'
+        body    'This is a body of text'
+      end
+
+      assert_equal ['padrino@me.com'],       message.from
+      assert_equal ['padrino@you.com'],      message.to
+      assert_equal 'Hello there Padrino',    message.subject
+      assert_equal 'This is a body of text', message.body.to_s
+    end
+
+    should "raise an error if template was not found" do
+      assert_raise Padrino::Rendering::TemplateNotFound do
+        Mail::Message.new do
+          from    'padrino@me.com'
+          to      'padrino@you.com'
+          subject 'Hello there Padrino'
+          render  'foo/bar'
+        end
+      end
+    end
+
+    should "use locals" do
+      message = Mail::Message.new do
+        from    'padrino@me.com'
+        to      'padrino@you.com'
+        subject 'Hello there Padrino'
+        locals  :foo => "Im Foo!"
+        body    erb("<%= foo %>")
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'Im Foo!',             message.body.to_s
+    end
+
+    should "use views paths" do
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        from    'padrino@me.com'
+        to      'padrino@you.com'
+        subject 'Hello there Padrino'
+        render  :bar
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'This is a bar message in mailers dir', message.body.to_s
+    end
+
+    should "use views and mailers paths" do
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        from    'padrino@me.com'
+        to      'padrino@you.com'
+        subject 'Hello there Padrino'
+        render  'alternate/foo'
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'This is a foo message in mailers/alternate dir', message.body.to_s
+    end
+
+    should "use layouts" do
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        from    'padrino@me.com'
+        to      'padrino@you.com'
+        subject 'Hello there Padrino'
+        render  'sample/foo', :layout => :"layouts/sample"
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'Layout Sample This is a foo message in mailers/sample dir', message.body.to_s
+    end
+
+    should "use i18n" do
+      I18n.locale = :en
+
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        from    'padrino@me.com'
+        to      'padrino@you.com'
+        subject 'Hello there Padrino'
+        render  'i18n/hello'
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'Hello World',         message.body.to_s
+
+      I18n.locale = :it
+
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        from    'padrino@me.com'
+        to      'padrino@you.com'
+        subject 'Hello there Padrino'
+        render  'i18n/hello'
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'Salve Mondo',         message.body.to_s
+    end
+
+    should "auto lookup template for the given content_type" do
+      message = Mail::Message.new do
+        views        File.dirname(__FILE__) + '/fixtures/views/mailers'
+        from         'padrino@me.com'
+        to           'padrino@you.com'
+        subject      'Hello there Padrino'
+        content_type 'text/html'
+        render       'multipart/basic'
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'text html',           message.body.to_s
+
+      message = Mail::Message.new do
+        views        File.dirname(__FILE__) + '/fixtures/views/mailers'
+        from         'padrino@me.com'
+        to           'padrino@you.com'
+        subject      'Hello there Padrino'
+        content_type :plain
+        render       'multipart/basic'
+      end
+
+      assert_equal ['padrino@me.com'],    message.from
+      assert_equal ['padrino@you.com'],   message.to
+      assert_equal 'Hello there Padrino', message.subject
+      assert_equal 'plain text',          message.body.to_s
+    end
+  end
+end

data/test/test_padrino_mailer.rb

@@ -1,45 +1,86 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/mailer_app/app')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/sinatra_app/app')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/padrino_app/app')
 
 class TestPadrinoMailer < Test::Unit::TestCase
-  def app
-    MailerDemo.tap { |app| app.set :environment, :test }
-  end
 
-  context 'for mail delivery in sample application' do
-    setup {
-      Padrino::Mailer::Base::views_path << MailerDemo.views
-      MailerDemo::SampleMailer.smtp_settings = MailerDemo.smtp_settings
-    }
+  context 'for mail delivery in sample sinatra application' do
+    setup { @app = SinatraApp }
+
+    should "be able to deliver inline emails using the email helper" do
+      post '/deliver/inline'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com',
+                        :subject => 'Test Email', :body => 'Test Body', :delivery_method => @app.delivery_method)
+    end
 
     should 'be able to deliver plain text emails' do
-      assert_email_sent(:to => 'john@fake.com', :from => 'noreply@birthday.com', :via => :smtp,
+      post '/deliver/plain'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'john@fake.com', :from => 'noreply@birthday.com', :delivery_method => @app.delivery_method,
                         :subject => "Happy Birthday!", :body => "Happy Birthday Joey!\nYou are turning 21")
-      visit '/deliver/plain', :post
-      assert_equal 'mail delivered', last_response.body
     end
 
     should 'be able to deliver emails with custom view' do
-      assert_email_sent(:template => 'sample_mailer/foo_message', :to => 'john@fake.com',
-                        :from => 'noreply@custom.com', :via => :smtp,
+      post '/deliver/custom'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:template => 'mailers/sample/foo_message', :to => 'john@fake.com',
+                        :from => 'noreply@custom.com', :delivery_method => @app.delivery_method,
                         :subject => "Welcome Message!", :body => "Hello to Bobby")
-      visit '/deliver/custom', :post
-      assert_equal 'mail delivered', last_response.body
     end
 
     should 'be able to deliver html emails' do
+      post '/deliver/html'
+      assert_equal 'mail delivered', body
       assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com',
-                        :content_type => 'text/html', :via => :smtp,
+                        :content_type => 'text/html', :delivery_method => @app.delivery_method,
                         :subject => "Happy anniversary!", :body => "<p>Yay Joey & Charlotte!</p>\n<p>You have been married 16 years</p>")
-      visit '/deliver/html', :post
-      assert_equal 'mail delivered', last_response.body
+    end
+
+    should 'be able to deliver a basic email using app settings' do
+      @app.email(:to => 'john@apple.com', :from => 'joe@smith.com', :subject => 'Test Email', :body => 'Test Body', :via => :test)
+      assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com',
+                        :subject => 'Test Email', :body => 'Test Body', :delivery_method => @app.delivery_method)
     end
   end
 
-  protected
+  context 'for mail delivery in sample padrino application' do
+    setup { @app = PadrinoApp }
 
-    def assert_email_sent(mail_attributes)
-      delivery_attributes = mail_attributes.merge(:smtp => MailerDemo.smtp_settings)
-      Padrino::Mailer::MailObject.any_instance.expects(:send_mail).with(delivery_attributes).once.returns(true)
+    should "be able to deliver inline emails using the email helper" do
+      post '/deliver/inline'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com', :delivery_method => @app.delivery_method,
+                        :subject => 'Test Email', :body => 'Test Body')
     end
+
+    should 'be able to deliver plain text emails' do
+      post '/deliver/plain'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'john@fake.com', :from => 'noreply@birthday.com', :delivery_method => @app.delivery_method,
+                        :subject => "Happy Birthday!", :body => "Happy Birthday Joey!\nYou are turning 21")
+    end
+
+    should 'be able to deliver emails with custom view' do
+      post '/deliver/custom'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:template => 'mailers/sample/foo_message', :to => 'john@fake.com',
+                        :from => 'noreply@custom.com', :delivery_method => @app.delivery_method,
+                        :subject => "Welcome Message!", :body => "Hello to Bobby")
+    end
+
+    should 'be able to deliver html emails' do
+      post '/deliver/html'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com',
+                        :content_type => 'text/html', :delivery_method => @app.delivery_method,
+                        :subject => "Happy anniversary!", :body => "<p>Yay Joey & Charlotte!</p>\n<p>You have been married 16 years</p>")
+    end
+
+    should 'be able to deliver a basic email using app settings' do
+      @app.email(:to => 'john@apple.com', :from => 'joe@smith.com', :subject => 'Test Email', :body => 'Test Body', :via => :test)
+      assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com',
+                        :subject => 'Test Email', :body => 'Test Body', :delivery_method => @app.delivery_method)
+    end
+  end
 end