padrino-mailer 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5c3d68dca38c921b216966cf53a59875676625
-  data.tar.gz: cc6e925a53190cf74b13225d63f6cacee50dfce3
+  metadata.gz: 7baba7ff644a9a815ff9fe791dd28d86e2c8d9f5
+  data.tar.gz: a799cb637729c620af35252046e24d8665ea9787
 SHA512:
-  metadata.gz: 5764fea3d2dbf9a985acf48d507d5c160fc2615d28327b4e78bd172243aeace105a81fa4a20f024f8f46963e0cd20bd0a6fdb110cf726fd3f9bd0590e5ae2c67
-  data.tar.gz: 12ca985b256bfc5abf94dc31161cb94b7ac1aa2c20b1b1855715bb8f5650060350309fd8accd806a05b56a3c66ce8b9e2056d770fc0db301ab14f006bb233cee
+  metadata.gz: d16e68bd5e2e890f40cbd177ae11e1780e99e5fcf54fa0c0b400431f0b8ee8d8289377290e75ee37a2d1e8fd7cb464e350a0120a1ee5c08360966b30cc94091e
+  data.tar.gz: 89eeea40ee3abd0c12c5dfb89dfcba7925f8dc3f6acfa0184393f7eda91dee82eccceeba0b4801be9f7eb2cb2d4c7ef2c0e57f8035ee52e0818a7f7a3ac81339

data/lib/padrino-mailer.rb

@@ -3,7 +3,6 @@ begin
 rescue LoadError
   require 'sinatra/tilt'
 end
-require 'padrino-core/support_lite' unless defined?(SupportLite)
 
 module Padrino
   ##

data/test/fixtures/padrino_app/app.rb

@@ -2,7 +2,6 @@ ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 class PadrinoApp < Padrino::Application
-  register Padrino::Rendering
   register Padrino::Helpers
   register Padrino::Mailer
 

data/test/helper.rb

@@ -2,10 +2,13 @@ ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 require File.expand_path('../../../load_paths', __FILE__)
-require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda')
+require 'minitest/autorun'
+require 'minitest/pride'
 require 'rack/test'
 require 'padrino-core'
 require 'padrino-helpers'
+require 'mail'
+require 'padrino-mailer/ext'
 require 'padrino-mailer'
 
 class MiniTest::Spec

data/test/test_email.rb

@@ -1,9 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Email" do
-
-  context 'the mailer in an app' do
-    should 'send a basic inline email' do
+  describe 'the mailer in an app' do
+    it 'should send a basic inline email' do
       mock_app do
         register Padrino::Mailer
         get "/" do
@@ -25,7 +24,7 @@ describe "Email" do
       assert_equal 'Body',                email.body.to_s
     end
 
-    should 'send a basic inline from hash' do
+    it 'should send a basic inline from hash' do
       mock_app do
         register Padrino::Mailer
         get "/" do
@@ -47,7 +46,7 @@ describe "Email" do
       assert_equal 'Body',                email.body.to_s
     end
 
-    should 'send an basic email with body template' do
+    it 'should send an basic email with body template' do
       mock_app do
         register Padrino::Mailer
         get "/" do
@@ -70,7 +69,7 @@ describe "Email" do
       assert_equal 'This is a body of text from a template with interpolated &lt;i&gt; and non-interpolated tags<br/>', email.body.to_s.chomp
     end
 
-    should 'send emails with scoped mailer defaults' do
+    it 'should send emails with scoped mailer defaults' do
       mock_app do
         register Padrino::Mailer
         set :views, File.dirname(__FILE__) + '/fixtures/views'
@@ -95,7 +94,7 @@ describe "Email" do
       assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s.chomp
     end
 
-    should 'send emails with app mailer defaults' do
+    it 'should send emails with app mailer defaults' do
       mock_app do
         register Padrino::Mailer
         set :delivery_method, :test
@@ -119,7 +118,7 @@ describe "Email" do
       assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s.chomp
     end
 
-    should 'send emails without layout' do
+    it 'should send emails without layout' do
       mock_app do
         register Padrino::Mailer
         set :views, File.dirname(__FILE__) + '/fixtures/views'
@@ -145,7 +144,7 @@ describe "Email" do
       assert_match /TestMailer/, email.delivery_method.to_s
     end
 
-    should 'raise an error if there are two messages with the same name' do
+    it 'should raise an error if there are two messages with the same name' do
       assert_raises RuntimeError do
         mock_app do
           register Padrino::Mailer

data/test/test_message.rb

@@ -1,9 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Message" do
-
-  context 'the message' do
-    should "accept headers and body" do
+  describe 'the message' do
+    it 'should accept headers and body' do
       message = Mail::Message.new do
         from    'padrino@me.com'
         to      'padrino@you.com'
@@ -17,7 +16,7 @@ describe "Message" do
       assert_equal 'This is a body of text', message.body.to_s.chomp
     end
 
-    should "raise an error if template was not found" do
+    it 'should raise an error if template was not found' do
       assert_raises Padrino::Rendering::TemplateNotFound do
         Mail::Message.new do
           from    'padrino@me.com'
@@ -28,7 +27,7 @@ describe "Message" do
       end
     end
 
-    should "use locals" do
+    it 'should use locals' do
       message = Mail::Message.new do
         from    'padrino@me.com'
         to      'padrino@you.com'
@@ -43,7 +42,7 @@ describe "Message" do
       assert_equal 'Im Foo!',             message.body.to_s.chomp
     end
 
-    should "use views paths" do
+    it 'should use views paths' do
       message = Mail::Message.new do
         views   File.dirname(__FILE__) + '/fixtures/views/mailers'
         from    'padrino@me.com'
@@ -58,7 +57,7 @@ describe "Message" do
       assert_equal 'This is a bar message in mailers dir', message.body.to_s.chomp
     end
 
-    should "use views and mailers paths" do
+    it 'should use views and mailers paths' do
       message = Mail::Message.new do
         views   File.dirname(__FILE__) + '/fixtures/views/mailers'
         from    'padrino@me.com'
@@ -73,7 +72,7 @@ describe "Message" do
       assert_equal 'This is a foo message in mailers/alternate dir', message.body.to_s.chomp
     end
 
-    should "use layouts" do
+    it 'should use layouts' do
       message = Mail::Message.new do
         views   File.dirname(__FILE__) + '/fixtures/views/mailers'
         from    'padrino@me.com'
@@ -88,7 +87,7 @@ describe "Message" do
       assert_equal 'Layout Sample This is a foo message in mailers/sample dir', message.body.to_s.strip
     end
 
-    should "use i18n" do
+    it 'should use i18n' do
       I18n.locale = :en
 
       message = Mail::Message.new do
@@ -120,7 +119,7 @@ describe "Message" do
       assert_equal 'Salve Mondo',         message.body.to_s.chomp
     end
 
-    should "auto lookup template for the given content_type" do
+    it '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'

data/test/test_padrino_mailer.rb

@@ -3,11 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/sinatra_app/app')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/padrino_app/app')
 
 describe "PadrinoMailer" do
+  describe 'for mail delivery in sample Sinatra application' do
+    before { @app = SinatraApp }
 
-  context 'for mail delivery in sample Sinatra application' do
-    setup { @app = SinatraApp }
-
-    should "be able to deliver inline emails using the email helper" do
+    it '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',
@@ -17,7 +16,7 @@ describe "PadrinoMailer" do
                         :delivery_method => @app.delivery_method)
     end
 
-    should 'be able to deliver plain text emails' do
+    it 'should be able to deliver plain text emails' do
       post '/deliver/plain'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'john@fake.com',
@@ -27,7 +26,7 @@ describe "PadrinoMailer" do
                         :body => "Happy Birthday Joey!\nYou are turning 21")
     end
 
-    should 'be able to deliver emails with custom view' do
+    it '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',
@@ -38,7 +37,7 @@ describe "PadrinoMailer" do
                         :body => 'Hello to Bobby')
     end
 
-    should 'be able to deliver html emails' do
+    it 'should be able to deliver html emails' do
       post '/deliver/html'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'julie@fake.com',
@@ -49,7 +48,7 @@ describe "PadrinoMailer" do
                         :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
+    it '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)
@@ -59,10 +58,10 @@ describe "PadrinoMailer" do
     end
   end
 
-  context 'for mail delivery in sample Padrino application' do
-    setup { @app = PadrinoApp }
+  describe 'for mail delivery in sample Padrino application' do
+    before { @app = PadrinoApp }
 
-    should "be able to deliver inline emails using the email helper" do
+    it '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',
@@ -70,7 +69,7 @@ describe "PadrinoMailer" do
                         :body => 'Test Body')
     end
 
-    should 'be able to deliver plain text emails' do
+    it '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',
@@ -78,7 +77,7 @@ describe "PadrinoMailer" do
                         :body => "Happy Birthday Joey!\nYou are turning 21")
     end
 
-    should 'be able to deliver emails with custom view' do
+    it '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',
@@ -86,7 +85,7 @@ describe "PadrinoMailer" do
                         :subject => 'Welcome Message!', :body => 'Hello to Bobby')
     end
 
-    should 'be able to deliver html emails' do
+    it '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',
@@ -94,7 +93,7 @@ describe "PadrinoMailer" do
                         :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
+    it '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)
@@ -103,7 +102,8 @@ describe "PadrinoMailer" do
                         :delivery_method => @app.delivery_method)
     end
 
-    should_eventually 'be able to deliver a basic email using Padrino::Helpers' do
+    it 'should be able to deliver a basic email using Padrino::Helpers' do
+      skip #FIXME
       post '/deliver/helper'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',

data/test/test_part.rb

@@ -1,9 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Part" do
-
-  context "the part" do
-    should "use correctly parts" do
+  describe "the part" do
+    it 'should use correctly parts' do
       message = Mail::Message.new do
         views   File.dirname(__FILE__) + '/fixtures/views/mailers'
         to      'padrino@test.lindsaar.net'
@@ -23,8 +22,8 @@ describe "Part" do
         end
       end
 
-      assert_not_nil message.html_part
-      assert_not_nil message.text_part
+      refute_nil message.html_part
+      refute_nil message.text_part
       assert_equal 4, message.parts.length
       assert_equal :plain, message.parts[0].content_type
       assert_equal 'plain text', message.parts[0].body.decoded
@@ -34,7 +33,7 @@ describe "Part" do
       assert_equal 'other', message.parts[2].body.decoded
     end
 
-    should "works with multipart templates" do
+    it 'should works with multipart templates' do
       message = Mail::Message.new do
         views   File.dirname(__FILE__) + '/fixtures/views/mailers'
         to      'padrino@test.lindsaar.net'
@@ -50,8 +49,8 @@ describe "Part" do
         end
       end
 
-      assert_not_nil message.html_part
-      assert_not_nil message.text_part
+      refute_nil message.html_part
+      refute_nil message.text_part
       assert_equal 2, message.parts.length
       assert_equal :plain, message.parts[0].content_type
       assert_equal 'plain text', message.parts[0].body.decoded.chomp
@@ -59,7 +58,7 @@ describe "Part" do
       assert_equal 'text html', message.parts[1].body.decoded.chomp
     end
 
-    should "works with less explict multipart templates" do
+    it 'should works with less explict multipart templates' do
       message = Mail::Message.new do
         views   File.dirname(__FILE__) + '/fixtures/views/mailers'
         to      'padrino@test.lindsaar.net'
@@ -70,8 +69,8 @@ describe "Part" do
         html_part { render('multipart/basic.html')  }
       end
 
-      assert_not_nil message.html_part
-      assert_not_nil message.text_part
+      refute_nil message.html_part
+      refute_nil message.text_part
       assert_equal 2, message.parts.length
       assert_equal :plain, message.parts[0].content_type
       assert_equal 'plain text', message.parts[0].body.decoded.chomp
@@ -79,7 +78,7 @@ describe "Part" do
       assert_equal 'text html', message.parts[1].body.decoded.chomp
     end
 
-    should "works with provides" do
+    it 'should works with provides' do
       message = Mail::Message.new do
         views   File.dirname(__FILE__) + '/fixtures/views/mailers'
         to      'padrino@test.lindsaar.net'
@@ -97,7 +96,7 @@ describe "Part" do
       assert_equal 'text html', message.parts[1].body.decoded.chomp
     end
 
-    # should "provide a way to instantiate a new part as you go down" do
+    # it 'should provide a way to instantiate a new part as you go down' do
     #   message = Mail::Message.new do
     #     to           'padrino@test.lindsaar.net'
     #     subject      "nested multipart"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement