maildown 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e4be44fd6d8f2dfc2ea77c9a8043a26ba75948be6843d21c96ff0b5a79b597
-  data.tar.gz: ef13d877c6310a918f1f200f6a08d1b283552973e26606fc2b3e46ef6f2b1556
+  metadata.gz: 3015c6cd2855144aaa66368e064f210e38b9558f07eaeef739f4330e5d7325cb
+  data.tar.gz: 3e7ce8df93af569dad9ead634a7df86f9fcf75a5797858ab64f9485e0cbc95c7
 SHA512:
-  metadata.gz: 61cb9dd93f18024cff25827f2106a012be77cdba0c1ce938a7213333c7c60432e38f92f778827f097bd7a92c1fb0295a65ed2dbe460b02091ec8c50a755ea01f
-  data.tar.gz: 2038ec28c9e60db0513ddb454f1dd6bac325d12655228259a39fa4db8cd25f2f4739c05eb8a9faaa364593a0ec8000803f8f7e4447b8ae09054a1d4ab8b2fb37
+  metadata.gz: fb872109df5155820dbc63005e45afef0af5db00688f5bb69210166422e9a2c1233ae7a4e7cedf63c1f000fec75cddb057be51903daa7ba2309ce94ae4045526
+  data.tar.gz: dd047ceec3b6898e5488aefe6c131ce74b6136fbac8855c03c691c83cc16e83db692539df16bb02856e7a17066b76369dc6b0050cd0dff55be9de5b8f3238169

data/lib/maildown/ext/action_mailer.rb

@@ -11,7 +11,22 @@ class ActionMailer::Base
     responses = original_collect_responses(*args, &block)
     md = ::Maildown::Md.new(responses)
     if md.contains_md?
-      return md.to_responses
+      rendered_response = md.to_responses
+
+      if Maildown.enable_layouts
+        text = rendered_response[0]
+        html = rendered_response[1]
+
+        layout_name   = _layout(text[:content_type])
+        text[:layout] = "#{layout_name}.text.erb"
+        text[:body]   = render(text)
+
+        layout_name   = _layout(html[:content_type])
+        html[:layout] = "#{layout_name}.html.erb"
+        html[:body]   = render(html)
+      end
+
+      return rendered_response
     else
       return responses
     end

data/lib/maildown/version.rb

@@ -1,3 +1,3 @@
 module Maildown
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/maildown.rb

@@ -1,5 +1,6 @@
 module Maildown
   @allow_indentations = false
+  @enable_layouts     = false
 
   def self.allow_indentation
     @allow_indentations
@@ -8,6 +9,14 @@ module Maildown
   def self.allow_indentation=(allow_indentations)
     @allow_indentations = allow_indentations
   end
+
+  def self.enable_layouts
+    @enable_layouts
+  end
+
+  def self.enable_layouts=(enable_layouts)
+    @enable_layouts = enable_layouts
+  end
 end
 
 require 'maildown/markdown_engine'

data/test/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+end
+

data/test/dummy/app/mailers/user_no_layout_mailer.rb

@@ -0,0 +1,11 @@
+class UserNoLayoutMailer < ApplicationMailer
+  layout false
+
+  def welcome
+    mail(
+      to:       "foo@example.com",
+      reply_to: "noreply@schneems.com",
+      subject:  "hello world"
+    )
+  end
+end

data/test/dummy/app/mailers/user_with_layout_mailer.rb

@@ -0,0 +1,11 @@
+class UserWithLayoutMailer < ApplicationMailer
+  layout "mail_layout"
+
+  def welcome
+    mail(
+      to:       "foo@example.com",
+      reply_to: "noreply@schneems.com",
+      subject:  "hello world"
+    )
+  end
+end

data/test/dummy/app/views/layouts/mail_layout.html.erb

@@ -0,0 +1 @@
+HTML<%= yield %>

data/test/dummy/app/views/layouts/mail_layout.text.erb

@@ -0,0 +1 @@
+TEXT<%= yield %>

data/test/dummy/app/views/user_no_layout_mailer/welcome.md.erb

@@ -0,0 +1 @@
+## Welcome!

data/test/dummy/app/views/user_with_layout_mailer/welcome.md.erb

@@ -0,0 +1 @@
+## Welcome!

data/test/dummy/config/environments/development.rb

@@ -20,10 +20,10 @@ Dummy::Application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
+  # config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  # config.assets.debug = true
 end