Run Mailer#prepare on initialize

hanami · Sep 23, 2015 · 389d889 · 389d889
1 parent 25e97bc
commit 389d889
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/lotus/mailer.rb b/lib/lotus/mailer.rb
@@ -291,10 +291,6 @@ module InstanceMethods
       #
       # @since 0.1.0
       def deliver
-        if self.respond_to? ('prepare')
-          self.prepare
-        end
-
         mail.deliver
       end
     end

diff --git a/lib/lotus/mailer/rendering.rb b/lib/lotus/mailer/rendering.rb
@@ -29,6 +29,8 @@ def initialize(locals = {})
 
             m.delivery_method(*Lotus::Mailer.configuration.delivery_method)
           end
+
+          prepare
         end
 
         # Render a single template with the specified format.
@@ -45,6 +47,11 @@ def render(format)
           self.class.templates(format).render(self, @locals)
         end
 
+        protected
+
+        def prepare
+        end
+
         private
 
         # @private