padrino-mailer 0.13.3.1 → 0.13.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9122facbc58ce0d4cc3230ef14a0d3e27f2e9a5
-  data.tar.gz: e89625b56cd50655c9c5168d27ddd51d8fc55a11
+  metadata.gz: f67b83b57346695ae8e0f54f06955b96f9cfb8d6
+  data.tar.gz: d4404d3d8832786decc0a2e125355c095adc4524
 SHA512:
-  metadata.gz: cde9b72a4d6297dfae425e4a630adffe4e1c2e7320d279dbe19ff24a30b8f0d20bca17ef17bc2920f0f04fad9e73b38cf9dc096b22ae2777470ed427c730a6ec
-  data.tar.gz: fb496cc0b26821ad600b86db0b2fb5234cbd117db89c90933eddbabd2dd31bdb1dd814ff29324cdbcdc831b86992ce8928b294b2a278006683888558aef3b926
+  metadata.gz: 0f8c1b295737f82be9e1e565913929890f52d640d995443859a364d95b51fad07fe119bd3a5b8292250b5b798455443c1075e26cc200c101f264a3b7f3eb1e4a
+  data.tar.gz: 85ce501a98f07310dfc9449e7fb24b81fdb23aa81de728b28f1b92ab3fcc5fe0918365887e48f5cbcd1c656e40254c17266c9fb2bde1acaa6d6e6adbe879fc05

data/lib/padrino-mailer/ext.rb

@@ -260,8 +260,8 @@ module Mail # @private
 
       engine ||= message_name
 
-      if mailer_name
-        settings.views += "/#{mailer_name}"
+      if mailer_name && !engine.to_s.index('/')
+        settings.views += "/#{mailer_name}" 
         engine = engine.to_s.sub(%r{^#{mailer_name}/}, '')
       end
 

data/test/fixtures/padrino_app/app.rb

@@ -62,6 +62,15 @@ class PadrinoApp < Padrino::Application
       via     :test
       render
     end
+
+    message :external do |name|
+      subject "Welcome Message!"
+      to      'john@fake.com'
+      from    'noreply@custom.com'
+      locals  :name => name
+      via     :test
+      render  'demo/sample_mail'
+    end
   end
 
   mailer :nonexistant do
@@ -109,6 +118,11 @@ class PadrinoApp < Padrino::Application
     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'
+  end
 end
 
 Padrino.mount("PadrinoApp").to("/")

data/test/test_padrino_mailer.rb

@@ -88,6 +88,11 @@ describe "PadrinoMailer" do
                         :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 emails with views in custom-named folders' do
+      post '/deliver/external'
+      assert_equal 'mail delivered', body
+    end
+
     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',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.13.3.1
+  version: 0.13.3.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-06 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.3.1
+        version: 0.13.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.1
+        version: 0.13.3.2
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement