maildown 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d27d44e89e7c9ba1d896e9c108438014822262f5d7227ee1d9af2fd6c94a33f
-  data.tar.gz: ba13353f957683acb4c5962c7acf6768a170e6b842d5227b9f1ac601ee51fe89
+  metadata.gz: '01758860c9ca7fca23b95b27bd10a98976b52c325c0e34ad296af871b9bdc3ba'
+  data.tar.gz: 14169956b1e4ca0f9cafb55b89785d4ba30e61e331f880fe32207434f6e30980
 SHA512:
-  metadata.gz: e743440ed6a2e1f504e3ad8e9f8fbf9cebadf9f05c913d443a2622beb110625847913e2c629e9993972d9b30067b39c35a9ad4c169d3fd2df24f5b2a04bb85ec
-  data.tar.gz: d8e41bbdd61b74ec7e5527a7a4e46dff6ad85bafde92a2f22f07e039cab6db0ba7d6c01e0f21ab0ff8969ad1c3a1e9bac59200d37c046f9a97abfe78a0685bef
+  metadata.gz: aed376205a32a77f541cf38f76f688442b32a973f0e6347c89f8f563df710018e8c7b95f6a9be5abd1cf913a0eaa1c81d62866a5674375a0e96c1cc590ed68a9
+  data.tar.gz: 479863668fba294112810de76285007380749d8d82b6f35c3cb19b2cb7447f0ddf7d1a10bfe470eb35b3f7c783b7e6f0293b04de1537c9dc5ed16b70bd3d3039

data/lib/maildown/ext/action_mailer.rb

@@ -45,16 +45,32 @@ class ActionMailer::Base
     return templates if templates.first.handler != Maildown::Handlers::Markdown
 
     html_template = templates.first
+
+    # Cached template is already defined
     if html_template.instance_variable_defined?(:"@maildown_text_template")
-       text_template = html_template.instance_variable_get(:"@maildown_text_template")
+      text_template = html_template.instance_variable_get(:"@maildown_text_template")
+      return [html_template, text_template]
+    end
+
+    if Maildown.rails_6?
+      text_template = html_template
+        .class
+        .new(
+          html_template.source,
+          html_template.identifier,
+          html_template.handler,
+          format: :text,
+          locals: html_template.locals
+        )
     else
       text_template = html_template.dup
       formats = html_template.formats.dup.tap { |f| f.delete(:html) }
 
       text_template.formats = formats
-      html_template.instance_variable_set(:"@maildown_text_template", text_template)
     end
 
+    html_template.instance_variable_set(:"@maildown_text_template", text_template)
+
     return [html_template, text_template]
   end
 end

data/lib/maildown/handlers/markdown.rb

@@ -30,15 +30,22 @@ module Maildown
         # with Rails 5.0+.
         source ||= template.source
 
-        # Match beginning whitespace but not newline http://rubular.com/r/uCXQ58OOC8
+        # Match beginning whitespace but not newline
+        # http://rubular.com/r/uCXQ58OOC8
         source.gsub!(/^[^\S\n]+/, ''.freeze) if Maildown.allow_indentation
 
-        compiled_source = erb_handler.call(template)
+        if Maildown.rails_6?
+          compiled_source = erb_handler.call(template, source)
+          is_html = (template.format != :text)
+        else
+          compiled_source = erb_handler.call(template)
+          is_html = template.formats.include?(:html)
+        end
 
-        if template.formats.include?(:html)
-          return "Maildown::MarkdownEngine.to_html(begin;#{compiled_source}; end)"
+        if is_html
+          "Maildown::MarkdownEngine.to_html(begin;#{compiled_source}; end)"
         else
-          return "Maildown::MarkdownEngine.to_text(begin;#{compiled_source}; end)"
+          "Maildown::MarkdownEngine.to_text(begin;#{compiled_source}; end)"
         end
       end
     end
@@ -61,4 +68,3 @@ ActionView::Template.register_template_handler :"md",     Maildown::Handlers::Ma
 # to allow rails to even attempt to process the file, it needs this
 # handler with ".md.erb" to be registered.
 ActionView::Template.register_template_handler :"md.erb", Maildown::Handlers::Markdown
-

data/lib/maildown/version.rb

@@ -1,3 +1,3 @@
 module Maildown
-  VERSION = "3.0.3"
+  VERSION = "3.1.0"
 end

data/lib/maildown.rb

@@ -11,14 +11,8 @@ module Maildown
     @allow_indentations = allow_indentations
   end
 
-  def self.enable_layouts
-    puts "Maildown.enable_layouts is deprecated, setting this does nothing"
-    @enable_layouts
-  end
-
-  def self.enable_layouts=(enable_layouts)
-    puts "Maildown.enable_layouts= is deprecated, setting this does nothing"
-    @enable_layouts = enable_layouts
+  def self.rails_6?
+    @rails_6 ||= Rails.version > "6"
   end
 end