RubyGems - padrino-mailer - Versions diffs - 0.16.0.pre4 → 0.16.0 - Mend

padrino-mailer 0.16.0.pre4 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

checksums.yaml +4 -4
data/README.rdoc +20 -20
data/Rakefile +1 -1
data/lib/padrino-mailer/base.rb +15 -15
data/lib/padrino-mailer/ext.rb +30 -29
data/lib/padrino-mailer/helpers.rb +21 -20
data/lib/padrino-mailer/mime.rb +4 -4
data/lib/padrino-mailer.rb +2 -4
data/padrino-mailer.gemspec +17 -17
data/test/fixtures/padrino_app/app.rb +48 -48
data/test/fixtures/sinatra_app/app.rb +23 -23
data/test/helper.rb +5 -5
data/test/test_email.rb +34 -32
data/test/test_message.rb +17 -17
data/test/test_padrino_mailer.rb +54 -54
data/test/test_part.rb +18 -18
metadata +6 -6

data/test/fixtures/padrino_app/app.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 ENV['RACK_ENV'] = 'test'
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 class PadrinoApp < Padrino::Application
   register Padrino::Helpers
@@ -9,65 +9,65 @@ class PadrinoApp < Padrino::Application
   mailer :sample do
     email :birthday do |name, age|
-      subject "Happy Birthday!"
+      subject 'Happy Birthday!'
       to      'john@fake.com'
       from    'noreply@birthday.com'
-      locals  :name => name, :age => age
+      locals  name: name, age: age
       via     :test
       render  'sample/birthday'
     end
     email :anniversary do |names, years_married|
-      subject "Happy anniversary!"
-      to   'julie@fake.com'
-      from 'noreply@anniversary.com'
+      subject      'Happy anniversary!'
+      to           'julie@fake.com'
+      from         'noreply@anniversary.com'
       content_type :html
-      via     :test
-      locals  :names => names, :years_married => years_married
-      render  'sample/anniversary'
+      via          :test
+      locals       names: names, years_married: years_married
+      render       'sample/anniversary'
     end
     message :welcome do |name|
-      subject "Welcome Message!"
+      subject 'Welcome Message!'
       to      'john@fake.com'
       from    'noreply@custom.com'
-      locals  :name => name
+      locals  name: name
       via     :test
       render  'sample/foo_message'
     end
     message :helper do |name|
-      subject "Welcome Helper!"
+      subject 'Welcome Helper!'
       to      'jim@fake.com'
       from    'noreply@custom.com'
-      locals  :name => name
+      locals  name: name
       via     :test
       render  'sample/helper_message'
     end
     message :default_mailer_name do |name|
-      subject "Welcome Helper!"
+      subject 'Welcome Helper!'
       to      'jim@fake.com'
       from    'noreply@custom.com'
-      locals  :name => name
+      locals  name: name
       via     :test
       render  'default_mailer_name'
     end
     message :default_mailer_email_name do |name|
-      subject "Welcome Helper!"
+      subject 'Welcome Helper!'
       to      'jim@fake.com'
       from    'noreply@custom.com'
-      locals  :name => name
+      locals  name: name
       via     :test
       render
     end
     message :external do |name|
-      subject "Welcome Message!"
+      subject 'Welcome Message!'
       to      'john@fake.com'
       from    'noreply@custom.com'
-      locals  :name => name
+      locals  name: name
       via     :test
       render  'demo/sample_mail'
     end
@@ -76,54 +76,54 @@ class PadrinoApp < Padrino::Application
   mailer :nonexistant do
   end
-  post "/deliver/inline" do
-    result = email(:to => "john@apple.com", :from => "joe@smith.com", :subject => "Test Email", :body => "Test Body", :via => :test)
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/inline' do
+    result = email(to: 'john@apple.com', from: 'joe@smith.com', subject: 'Test Email', body: 'Test Body', via: :test)
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/plain" do
-    result = deliver(:sample, :birthday, "Joey", 21)
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/plain' do
+    result = deliver(:sample, :birthday, 'Joey', 21)
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/html" do
-    result = deliver(:sample, :anniversary, "Joey & Charlotte", 16)
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/html' do
+    result = deliver(:sample, :anniversary, 'Joey & Charlotte', 16)
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/custom" do
-    result = deliver(:sample, :welcome, "Bobby")
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/custom' do
+    result = deliver(:sample, :welcome, 'Bobby')
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/helper" do
-    result = deliver(:sample, :helper, "Jim")
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/helper' do
+    result = deliver(:sample, :helper, 'Jim')
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/failing_mailer" do
-    deliver(:nonregistered, :mailer, "hey")
+  post '/deliver/failing_mailer' do
+    deliver(:nonregistered, :mailer, 'hey')
   end
-  post "/deliver/failing_message" do
-    deliver(:nonexistant, :message, "hey")
+  post '/deliver/failing_message' do
+    deliver(:nonexistant, :message, 'hey')
   end
-  post "/deliver/default_mailer_name" do
-    result = deliver(:sample, :default_mailer_name, "Jim")
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/default_mailer_name' do
+    result = deliver(:sample, :default_mailer_name, 'Jim')
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/default_mailer_email_name" do
-    result = deliver(:sample, :default_mailer_email_name, "Jim")
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/default_mailer_email_name' do
+    result = deliver(:sample, :default_mailer_email_name, 'Jim')
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/external" do
-    result = deliver(:sample, :external, "Joey")
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/external' do
+    result = deliver(:sample, :external, 'Joey')
+    result ? 'mail delivered' : 'mail not delivered'
   end
 end
-Padrino.mount("PadrinoApp").to("/")
+Padrino.mount('PadrinoApp').to('/')
 Padrino.load!

data/test/fixtures/sinatra_app/app.rb CHANGED Viewed

@@ -3,56 +3,56 @@ require 'sinatra/base'
 class SinatraApp < Sinatra::Base
   register Padrino::Mailer
-  set :root, File.dirname(__FILE__)
+  set :root, __dir__
   set :delivery_method, :test
   mailer :sample do
     email :birthday do |name, age|
-      subject "Happy Birthday!"
+      subject 'Happy Birthday!'
       to      'john@fake.com'
       from    'noreply@birthday.com'
-      locals  :name => name, :age => age
+      locals  name: name, age: age
       via     :test
       render  'sample/birthday'
     end
     email :anniversary do |names, years_married|
-      subject "Happy anniversary!"
-      to   'julie@fake.com'
-      from 'noreply@anniversary.com'
-      locals :names => names, :years_married => years_married
+      subject      'Happy anniversary!'
+      to           'julie@fake.com'
+      from         'noreply@anniversary.com'
+      locals       names: names, years_married: years_married
       content_type :html
-      via  :test
-      render 'sample/anniversary'
+      via          :test
+      render       'sample/anniversary'
     end
     message :welcome do |name|
-      subject "Welcome Message!"
+      subject 'Welcome Message!'
       to      'john@fake.com'
       from    'noreply@custom.com'
-      locals  :name => name
+      locals  name: name
       via     :test
       render  'sample/foo_message'
     end
   end
-  post "/deliver/inline" do
-    result = email(:to => "john@apple.com", :from => "joe@smith.com", :subject => "Test Email", :body => "Test Body", :via => :test)
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/inline' do
+    result = email(to: 'john@apple.com', from: 'joe@smith.com', subject: 'Test Email', body: 'Test Body', via: :test)
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/plain" do
-    result = deliver(:sample, :birthday, "Joey", 21)
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/plain' do
+    result = deliver(:sample, :birthday, 'Joey', 21)
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/html" do
-    result = deliver(:sample, :anniversary, "Joey & Charlotte", 16)
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/html' do
+    result = deliver(:sample, :anniversary, 'Joey & Charlotte', 16)
+    result ? 'mail delivered' : 'mail not delivered'
   end
-  post "/deliver/custom" do
-    result = deliver(:sample, :welcome, "Bobby")
-    result ? "mail delivered" : 'mail not delivered'
+  post '/deliver/custom' do
+    result = deliver(:sample, :welcome, 'Bobby')
+    result ? 'mail delivered' : 'mail not delivered'
   end
 end

data/test/helper.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 ENV['RACK_ENV'] = 'test'
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 require 'minitest/autorun'
 require 'minitest/pride'
@@ -18,7 +18,7 @@ class Minitest::Spec
   # 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)
+  def mock_app(base = Padrino::Application, &block)
     @app = Sinatra.new(base, &block)
   end
@@ -31,11 +31,11 @@ class Minitest::Spec
   end
   # Asserts that the specified email object was delivered
-  def assert_email_sent(mail_attributes, options={})
+  def assert_email_sent(mail_attributes, options = {})
     mail_message = Mail::TestMailer.deliveries.last
-    raise "No mail message has been sent!" unless mail_message
+    raise 'No mail message has been sent!' unless mail_message
     delivery_attributes = mail_attributes
-    delivery_attributes.update(:to => Array(mail_attributes[:to]), :from => Array(mail_attributes[:from]))
+    delivery_attributes.update(to: Array(mail_attributes[:to]), from: Array(mail_attributes[:from]))
     delivery_attributes.each_pair do |key, expected|
       next unless mail_message.respond_to?(key)
       actual = mail_message.send(key)

data/test/test_email.rb CHANGED Viewed

@@ -1,11 +1,11 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
-describe "Email" do
+describe '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
+        get '/' do
           email do
             from    'padrino@me.com'
             to      'padrino@you.com'
@@ -15,7 +15,7 @@ describe "Email" do
           end
         end
       end
-      get "/"
+      get '/'
       assert ok?
       email = pop_last_delivery
       assert_equal ['padrino@me.com'],    email.from
@@ -27,17 +27,17 @@ describe "Email" do
     it '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
-          })
+        get '/' do
+          email(
+            from: 'padrino@me.com',
+            to: 'padrino@you.com',
+            subject: 'Hello there Padrino',
+            body: 'Body',
+            via: :test
+          )
         end
       end
-      get "/"
+      get '/'
       assert ok?
       email = pop_last_delivery
       assert_equal ['padrino@me.com'],    email.from
@@ -49,9 +49,9 @@ describe "Email" do
     it 'should send an basic email with body template' do
       mock_app do
         register Padrino::Mailer
-        get "/" do
+        get '/' do
           email do
-            views   File.dirname(__FILE__) + '/fixtures'
+            views   "#{__dir__}/fixtures"
             from    'padrino@me.com'
             to      'padrino@you.com'
             subject 'Hello there Padrino'
@@ -60,7 +60,7 @@ describe "Email" do
           end
         end
       end
-      get "/"
+      get '/'
       assert ok?
       email = pop_last_delivery
       assert_equal ['padrino@me.com'],    email.from
@@ -72,10 +72,10 @@ describe "Email" do
     it 'should send emails with scoped mailer defaults' do
       mock_app do
         register Padrino::Mailer
-        set :views, File.dirname(__FILE__) + '/fixtures/views'
+        set :views, "#{__dir__}/fixtures/views"
         set :delivery_method, :test
         mailer :alternate do
-          defaults :from => 'padrino@from.com', :to => 'padrino@to.com'
+          defaults from: 'padrino@from.com', to: 'padrino@to.com'
           email :foo do
             to 'padrino@different.com'
             subject 'Hello there again Padrino'
@@ -83,13 +83,14 @@ describe "Email" do
             render  'alternate/foo'
           end
         end
-        get("/") { deliver(:alternate, :foo) }
+        get('/') { deliver(:alternate, :foo) }
       end
-      get "/"
+      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 ['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.chomp
     end
@@ -98,8 +99,8 @@ describe "Email" do
       mock_app do
         register Padrino::Mailer
         set :delivery_method, :test
-        set :views, File.dirname(__FILE__) + '/fixtures/views'
-        set :mailer_defaults, :from => 'padrino@from.com', :to => 'padrino@to.com', :subject => "This is a test"
+        set :views, "#{__dir__}/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'
@@ -107,13 +108,14 @@ describe "Email" do
             render  'alternate/foo'
           end
         end
-        get("/") { deliver(:alternate, :foo) }
+        get('/') { deliver(:alternate, :foo) }
       end
-      get "/"
+      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 ['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.chomp
     end
@@ -121,7 +123,7 @@ describe "Email" do
     it 'should send emails without layout' do
       mock_app do
         register Padrino::Mailer
-        set :views, File.dirname(__FILE__) + '/fixtures/views'
+        set :views, "#{__dir__}/fixtures/views"
         set :delivery_method, :test
         mailer :alternate do
           email :foo do
@@ -132,16 +134,16 @@ describe "Email" do
             render  'alternate/foo'
           end
         end
-        get("/") { deliver(:alternate, :foo) }
+        get('/') { deliver(:alternate, :foo) }
       end
-      get "/"
+      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.chomp
-      assert_match /TestMailer/, email.delivery_method.to_s
+      assert_match(/TestMailer/, email.delivery_method.to_s)
     end
     it 'should raise an error if there are two messages with the same name' do

data/test/test_message.rb CHANGED Viewed

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
-describe "Message" do
+describe 'Message' do
   describe 'the message' do
     it 'should accept headers and body' do
       message = Mail::Message.new do
@@ -32,8 +32,8 @@ describe "Message" do
         from    'padrino@me.com'
         to      'padrino@you.com'
         subject 'Hello there Padrino'
-        locals  :foo => "Im Foo!"
-        body    erb("<%= foo %>")
+        locals  foo: 'Im Foo!'
+        body    erb('<%= foo %>')
       end
       assert_equal ['padrino@me.com'],    message.from
@@ -44,7 +44,7 @@ describe "Message" do
     it 'should use views paths' do
       message = Mail::Message.new do
-        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        views   "#{__dir__}/fixtures/views/mailers"
         from    'padrino@me.com'
         to      'padrino@you.com'
         subject 'Hello there Padrino'
@@ -59,7 +59,7 @@ describe "Message" do
     it 'should use views and mailers paths' do
       message = Mail::Message.new do
-        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        views   "#{__dir__}/fixtures/views/mailers"
         from    'padrino@me.com'
         to      'padrino@you.com'
         subject 'Hello there Padrino'
@@ -74,11 +74,11 @@ describe "Message" do
     it 'should use layouts' do
       message = Mail::Message.new do
-        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        views   "#{__dir__}/fixtures/views/mailers"
         from    'padrino@me.com'
         to      'padrino@you.com'
         subject 'Hello there Padrino'
-        render  'sample/foo', :layout => :"layouts/sample"
+        render  'sample/foo', layout: :"layouts/sample"
       end
       assert_equal ['padrino@me.com'],    message.from
@@ -91,7 +91,7 @@ describe "Message" do
       I18n.locale = :en
       message = Mail::Message.new do
-        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        views   "#{__dir__}/fixtures/views/mailers"
         from    'padrino@me.com'
         to      'padrino@you.com'
         subject 'Hello there Padrino'
@@ -106,7 +106,7 @@ describe "Message" do
       I18n.locale = :it
       message = Mail::Message.new do
-        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        views   "#{__dir__}/fixtures/views/mailers"
         from    'padrino@me.com'
         to      'padrino@you.com'
         subject 'Hello there Padrino'
@@ -121,7 +121,7 @@ describe "Message" do
     it 'should auto lookup template for the given content_type' do
       message = Mail::Message.new do
-        views        File.dirname(__FILE__) + '/fixtures/views/mailers'
+        views        "#{__dir__}/fixtures/views/mailers"
         from         'padrino@me.com'
         to           'padrino@you.com'
         subject      'Hello there Padrino'
@@ -129,15 +129,15 @@ describe "Message" do
         render       'multipart/basic'
       end
+      message.encoded
       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.chomp
-      message.encoded
       assert_equal :html,                 message.content_type
       message = Mail::Message.new do
-        views        File.dirname(__FILE__) + '/fixtures/views/mailers'
+        views        "#{__dir__}/fixtures/views/mailers"
         from         'padrino@me.com'
         to           'padrino@you.com'
         subject      'Hello there Padrino'
@@ -145,22 +145,22 @@ describe "Message" do
         render       'multipart/basic'
       end
+      message.encoded
       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.chomp
-      message.encoded
       assert_equal :plain,                message.content_type
     end
     it 'should render partials' do
-      objects = [1,2,'<evil>','<good>'.html_safe]
+      objects = [1, 2, '<evil>', '<good>'.html_safe]
       message = Mail::Message.new do
         from    'padrino@me.com'
         to      'padrino@you.com'
         subject 'Hello there Padrino'
-        views        File.dirname(__FILE__) + '/fixtures/views/mailers'
-        partial 'partial/object', :collection => objects
+        views   "#{__dir__}/fixtures/views/mailers"
+        partial 'partial/object', collection: objects
       end
       assert_equal "Object 1<br>\nObject 2<br>\nObject &lt;evil&gt;<br>\nObject <good><br>", message.body.to_s.chomp