padrino-mailer 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcadea24539f54965f30482d6ba1031e2d2c1735
-  data.tar.gz: 7072ecef88d36253f720ff449e4b4472548d3854
+  metadata.gz: adc0d683d6b9dd4c72b0e9d357981fcf7f701b07
+  data.tar.gz: 750b27c369a4f1aec4f1db417a4ac5e5b7a687a0
 SHA512:
-  metadata.gz: 715759f9eafb48d542337f4f42205228d6b875edc3fe4b9c26c414d6c48525abb5476dd42a4802fdf3755ce277a345762b80485876ba53f480ab148464af4691
-  data.tar.gz: e9509f3b64f2aa534886c746bd8747721dcdae10f5da81b0d9aa703f594a32283efb4a588f2b0a22e8c1f6def4be1ca0e00c4e9db413329e3960fdc1c066331b
+  metadata.gz: 6c6100bd09fc0514db1f1b79f33b1645abe34a34965f73c74b45f95bac57ca3f00df8fe961973fc3f1747f29e3a623e54ebe30f51ffb72ca4abfc2b69536a92c
+  data.tar.gz: e79bf65fb5f875bc1961114256bc0a5f884f7b7b2af968e9cc89a5b0318aaebad56a2ddbb62c6e8901a072925906588874dbd67ca6b7f0ac95fe89e330c365e7

data/lib/padrino-mailer/base.rb

@@ -84,6 +84,8 @@ module Padrino
         raise "The email '#{name}' is already defined" if self.messages[name].present?
         self.messages[name] = Proc.new { |*attrs|
           message = app.settings._padrino_mailer::Message.new(self.app)
+          message.mailer_name = mailer_name
+          message.message_name = name
           message.defaults = self.defaults if self.defaults.any?
           message.delivery_method(*delivery_settings)
           message.instance_exec(*attrs, &block)

data/lib/padrino-mailer/ext.rb

@@ -6,6 +6,7 @@ module Mail # @private
     include Padrino::Rendering if defined?(Padrino::Rendering)
     include Padrino::Helpers::RenderHelpers if defined? Padrino::Helpers::RenderHelpers
     attr_reader :template_cache
+    attr_accessor :mailer_name, :message_name
 
     def initialize_with_app(*args, &block)
       @template_cache = Tilt::Cache.new
@@ -253,10 +254,17 @@ module Mail # @private
     ##
     # Defines the render for the mailer utilizing the padrino 'rendering' module
     #
-    def render(engine, data=nil, options={}, locals={}, &block)
+    def render(engine=nil, data=nil, options={}, locals={}, &block)
       locals = @_locals if options[:locals].blank? && locals.blank?
       @template_cache.clear if settings.reload_templates?
 
+      engine ||= message_name
+
+      if mailer_name
+        settings.views += "/#{mailer_name}"
+        engine = engine.to_s.sub(%r{^#{mailer_name}/}, '')
+      end
+
       provides.each do |format|
         part do |p|
           p.content_type(format)

data/test/fixtures/padrino_app/app.rb

@@ -44,6 +44,24 @@ class PadrinoApp < Padrino::Application
       via     :test
       render  'sample/helper_message'
     end
+
+    message :default_mailer_name do |name|
+      subject "Welcome Helper!"
+      to      'jim@fake.com'
+      from    'noreply@custom.com'
+      locals  :name => name
+      via     :test
+      render  'default_mailer_name'
+    end
+
+    message :default_mailer_email_name do |name|
+      subject "Welcome Helper!"
+      to      'jim@fake.com'
+      from    'noreply@custom.com'
+      locals  :name => name
+      via     :test
+      render
+    end
   end
 
   mailer :nonexistant do
@@ -81,6 +99,16 @@ class PadrinoApp < Padrino::Application
   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'
+  end
+
+  post "/deliver/default_mailer_email_name" do
+    result = deliver(:sample, :default_mailer_email_name, "Jim")
+    result ? "mail delivered" : 'mail not delivered'
+  end
 end
 
 Padrino.mount("PadrinoApp").to("/")

data/test/fixtures/padrino_app/views/mailers/sample/default_mailer_email_name.erb

@@ -0,0 +1 @@
+dmen

data/test/fixtures/padrino_app/views/mailers/sample/default_mailer_name.erb

@@ -0,0 +1 @@
+dmn

data/test/helper.rb

@@ -6,6 +6,7 @@ require 'minitest/pride'
 require 'rack/test'
 require 'padrino-core'
 require 'padrino-helpers'
+require 'padrino/rendering'
 require 'padrino-mailer/ext'
 require 'padrino-mailer'
 
@@ -34,11 +35,13 @@ class MiniTest::Spec
     mail_message = Mail::TestMailer.deliveries.last
     raise "No mail message has been sent!" unless mail_message.present?
     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
+    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)
+      actual = actual.to_s.chomp if key == :body
+      actual = mail_message.content_type_without_symbol.split(';').first if key == :content_type
+      assert_equal expected, actual, "Mail failure at field '#{key}'"
     end
     Mail::TestMailer.deliveries.clear
   end

data/test/test_padrino_mailer.rb

@@ -12,8 +12,7 @@ describe "PadrinoMailer" do
       assert_email_sent(:to => 'john@apple.com',
                         :from => 'joe@smith.com',
                         :subject => 'Test Email',
-                        :body => 'Test Body',
-                        :delivery_method => @app.delivery_method)
+                        :body => 'Test Body')
     end
 
     it 'should be able to deliver plain text emails' do
@@ -21,7 +20,6 @@ describe "PadrinoMailer" do
       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
@@ -32,7 +30,6 @@ describe "PadrinoMailer" do
       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
@@ -43,9 +40,8 @@ describe "PadrinoMailer" do
       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>")
+                        :body => "<p>Yay Joey &amp; Charlotte!</p>\n<p>You have been married 16 years</p>")
     end
 
     it 'should be able to deliver a basic email using app settings' do
@@ -53,8 +49,7 @@ describe "PadrinoMailer" do
                  :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)
+                        :subject => 'Test Email', :body => 'Test Body')
     end
   end
 
@@ -65,7 +60,7 @@ describe "PadrinoMailer" 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',
+                        :subject => 'Test Email',
                         :body => 'Test Body')
     end
 
@@ -73,7 +68,7 @@ describe "PadrinoMailer" 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!",
+                        :subject => "Happy Birthday!",
                         :body => "Happy Birthday Joey!\nYou are turning 21")
     end
 
@@ -81,7 +76,7 @@ describe "PadrinoMailer" 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,
+                        :from => 'noreply@custom.com',
                         :subject => 'Welcome Message!', :body => 'Hello to Bobby')
     end
 
@@ -89,8 +84,8 @@ describe "PadrinoMailer" 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>")
+                        :content_type => 'text/html',
+                        :subject => 'Happy anniversary!', :body => "<p>Yay Joey &amp; Charlotte!</p>\n<p>You have been married 16 years</p>")
     end
 
     it 'should be able to deliver a basic email using app settings' do
@@ -98,8 +93,7 @@ describe "PadrinoMailer" do
                  :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)
+                        :subject => 'Test Email', :body => 'Test Body')
     end
 
     it 'should be able to deliver a basic email using Padrino::Helpers' do
@@ -107,7 +101,7 @@ describe "PadrinoMailer" do
       post '/deliver/helper'
       assert_equal 'mail delivered', body
       assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',
-                        :content_type => 'text/html', :delivery_method => @app.delivery_method,
+                        :content_type => 'text/html',
                         :subject => 'Welcome Helper!', :body => "<a href=\"#\">jim</a>")
     end
 
@@ -124,5 +118,19 @@ describe "PadrinoMailer" do
       end
       assert_match /has no message/, error.message
     end
+
+    it 'should be able to render default mailer names' do
+      post '/deliver/default_mailer_name'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',
+                        :content_type => 'text/plain', :body => "dmn")
+    end
+
+    it 'should be able to render default mailer email names' do
+      post '/deliver/default_mailer_email_name'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',
+                        :content_type => 'text/plain', :body => "dmen")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-08-17 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.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,8 @@ files:
 - test/fixtures/padrino_app/views/mailers/demo/sample_mail.erb
 - test/fixtures/padrino_app/views/mailers/sample/anniversary.erb
 - test/fixtures/padrino_app/views/mailers/sample/birthday.erb
+- test/fixtures/padrino_app/views/mailers/sample/default_mailer_email_name.erb
+- test/fixtures/padrino_app/views/mailers/sample/default_mailer_name.erb
 - test/fixtures/padrino_app/views/mailers/sample/foo_message.erb
 - test/fixtures/padrino_app/views/mailers/sample/helper_message.erb
 - test/fixtures/sinatra_app/app.rb
@@ -122,36 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-mailer
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Mailer system for padrino
-test_files:
-- test/fixtures/basic.erb
-- test/fixtures/layout.erb
-- test/fixtures/padrino_app/app.rb
-- test/fixtures/padrino_app/views/mailers/demo/sample_mail.erb
-- test/fixtures/padrino_app/views/mailers/sample/anniversary.erb
-- test/fixtures/padrino_app/views/mailers/sample/birthday.erb
-- test/fixtures/padrino_app/views/mailers/sample/foo_message.erb
-- test/fixtures/padrino_app/views/mailers/sample/helper_message.erb
-- test/fixtures/sinatra_app/app.rb
-- test/fixtures/sinatra_app/views/mailers/demo/sample_mail.erb
-- test/fixtures/sinatra_app/views/mailers/sample/anniversary.erb
-- test/fixtures/sinatra_app/views/mailers/sample/birthday.erb
-- test/fixtures/sinatra_app/views/mailers/sample/foo_message.erb
-- test/fixtures/views/mailers/alternate/foo.erb
-- test/fixtures/views/mailers/bar.erb
-- test/fixtures/views/mailers/i18n/hello.en.erb
-- test/fixtures/views/mailers/i18n/hello.it.erb
-- test/fixtures/views/mailers/layouts/sample.erb
-- test/fixtures/views/mailers/multipart/basic.html.erb
-- test/fixtures/views/mailers/multipart/basic.plain.erb
-- test/fixtures/views/mailers/partial/_object.erb
-- test/fixtures/views/mailers/sample/foo.erb
-- test/helper.rb
-- test/test_email.rb
-- test/test_message.rb
-- test/test_padrino_mailer.rb
-- test/test_part.rb
-has_rdoc: 
+test_files: []