padrino-mailer 0.13.0.beta3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 588f5fbacc42d2a775d8f29adc5ba16b137b965c
-  data.tar.gz: 5326b3fd0916cd73f4a4a2fbfc32f2cd904a241f
+  metadata.gz: e966bcfe7783ad875d3f3d3eb065cf8ac15bf936
+  data.tar.gz: 279a169fe389f3c8c31e2313c68cf0dabc75acf2
 SHA512:
-  metadata.gz: 6fd20351c96b4671d0ee04d665a83aa024d52f22531b6d6ea0469b886cc12206f4e6e92a8fbd465137b866c1176d345c0dbacc9bf545193087fe78a46a39d0a3
-  data.tar.gz: 76442ebc78a77cce1117b0bfb731879fa81ddb8bd0f2974e5543052910923c8d11635afe7979db7f8b01b951ddb813bb869b53e012e7ee2cea9e0313adaf8536
+  metadata.gz: 1c0d5e2e64bb9e1c6217ebffd6bfe5e9c26b3502f42a1c9f3077bb54c88cf1d1b98ff7c8828e7deaa6b6e26ff058210081d6ccb0979a9aa674736acacaeb19d8
+  data.tar.gz: fe2102a39fad06b924517a5e6f4fea4fbf90bb5f0609db76311685ac90cfddd176a93840eecc7cb81d3fc7cb862f8a01e370e967ebe7d4798d2321324cd89e01

data/lib/padrino-mailer/ext.rb

@@ -4,6 +4,7 @@ module Mail # @private
   class Message # @private
     include Sinatra::Templates
     include Padrino::Rendering if defined?(Padrino::Rendering)
+    include Padrino::Helpers::RenderHelpers if defined? Padrino::Helpers::RenderHelpers
     attr_reader :template_cache
 
     def initialize_with_app(*args, &block)
@@ -262,6 +263,12 @@ module Mail # @private
       self.body = super(engine, data, options, locals, &block) if provides.empty?
     end
 
+    alias_method :original_partial, :partial if instance_methods.include?(:partial)
+    def partial(template, options={}, &block)
+      raise "gem 'padrino-helpers' is required to render partials" unless respond_to?(:original_partial)
+      self.body = original_partial(template, options, &block)
+    end
+
     ##
     # Register all special template configurations Padrino has to our fake settings object.
     #

data/lib/padrino-mailer/helpers.rb

@@ -106,7 +106,9 @@ module Padrino
         #   deliver(:example, :message, "John")
         #
         def deliver(mailer_name, message_name, *attributes)
-          message = registered_mailers[mailer_name].messages[message_name].call(*attributes)
+          mailer = registered_mailers[mailer_name] or fail "mailer '#{mailer_name}' is not registered"
+          message = mailer.messages[message_name] or fail "mailer '#{mailer_name}' has no message '#{message_name}'"
+          message = message.call(*attributes)
           message.delivery_method(*delivery_settings)
           message.deliver
         end

data/test/fixtures/padrino_app/app.rb

@@ -44,7 +44,9 @@ class PadrinoApp < Padrino::Application
       via     :test
       render  'sample/helper_message'
     end
+  end
 
+  mailer :nonexistant do
   end
 
   post "/deliver/inline" do
@@ -72,6 +74,13 @@ class PadrinoApp < Padrino::Application
     result ? "mail delivered" : 'mail not delivered'
   end
 
+  post "/deliver/failing_mailer" do
+    deliver(:nonregistered, :mailer, "hey")
+  end
+
+  post "/deliver/failing_message" do
+    deliver(:nonexistant, :message, "hey")
+  end
 end
 
 Padrino.mount("PadrinoApp").to("/")

data/test/fixtures/views/mailers/partial/_object.erb

@@ -0,0 +1 @@
+Object <%= object %><br>

data/test/test_message.rb

@@ -152,5 +152,18 @@ describe "Message" do
       message.encoded
       assert_equal :plain,                message.content_type
     end
+
+    it 'should render partials' do
+      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
+      end
+
+      assert_equal "Object 1<br>\nObject 2<br>\nObject &lt;evil&gt;<br>\nObject <good><br>", message.body.to_s.chomp
+    end
   end
 end

data/test/test_padrino_mailer.rb

@@ -110,5 +110,19 @@ describe "PadrinoMailer" do
                         :content_type => 'text/html', :delivery_method => @app.delivery_method,
                         :subject => 'Welcome Helper!', :body => "<a href=\"#\">jim</a>")
     end
+
+    it 'should fail with proper message if mailer is not registered' do
+      error = assert_raises RuntimeError do
+        post '/deliver/failing_mailer'
+      end
+      assert_match /is not registered/, error.message
+    end
+
+    it 'should fail with proper message if message does not exist' do
+      error = assert_raises RuntimeError do
+        post '/deliver/failing_message'
+      end
+      assert_match /has no message/, error.message
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-mailer
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta3
+  version: 0.13.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-10-11 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.0.beta3
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,7 @@ files:
 - 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
@@ -102,12 +103,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-mailer
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Mailer system for padrino
@@ -132,6 +133,7 @@ test_files:
 - 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