maildown 2.0.3 → 3.0.0

data/test/integration/layouts_test.rb

@@ -17,7 +17,6 @@ class LayoutsTest < ActionMailer::TestCase
   end
 
   def test_layout_renders_fine
-    Maildown.enable_layouts = true
     email = UserWithLayoutMailer.welcome.deliver_now
     assert !ActionMailer::Base.deliveries.empty?
     # Test the body of the sent email contains what we expect it to
@@ -29,7 +28,5 @@ class LayoutsTest < ActionMailer::TestCase
 
     body_contents = /TEXT## Welcome!/
     assert_match body_contents,       email.text_part.body.to_s
-  ensure
-    Maildown.enable_layouts = false
   end
 end

data/test/integration/strip_leading_whitespace_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class TemplateHandlerTest < ActionDispatch::IntegrationTest
+  def test_strip_whitespace_templates
+    Maildown.allow_indentation = true
+    email = UserNoLayoutMailer.leading_whitespace.deliver_now
+
+    assert_equal 2, email.parts.size
+    assert_equal "multipart/alternative", email.mime_type
+
+    assert_equal "text/plain", email.text_part.mime_type
+    assert_equal "## Leading\n", email.text_part.body.to_s
+
+    assert_equal "text/html", email.html_part.mime_type
+    assert_equal %Q{<h2 id="leading">Leading</h2>\n}, email.html_part.body.to_s
+  ensure
+    Maildown.allow_indentation = false
+  end
+
+  test "dont whitespace templates" do
+    Maildown.allow_indentation = false
+    email = UserNoLayoutMailer.leading_whitespace_again.deliver_now
+
+    assert_equal 2, email.parts.size
+    assert_equal "multipart/alternative", email.mime_type
+
+    assert_equal "text/plain", email.text_part.mime_type
+    assert_equal "         ## Leading again\n", email.text_part.body.to_s
+
+    assert_equal "text/html", email.html_part.mime_type
+    assert_equal "<pre><code>     ## Leading again\n</code></pre>\n", email.html_part.body.to_s
+  end
+end

data/test/integration/template_handler_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class TemplateHandlerTest < ActionDispatch::IntegrationTest
+  test ".md template handler" do
+    get "/handlers/plain_markdown"
+    expected = "<p>Hello</p>"
+    assert_match expected, response.body
+  end
+
+  test "dual templates" do
+    email = UserNoLayoutMailer.contact.deliver_now
+
+    assert_equal 2, email.parts.size
+    assert_equal "multipart/alternative", email.mime_type
+
+    assert_equal "text/plain", email.text_part.mime_type
+    assert_match "Dual templates **rock**!", email.text_part.body.to_s
+
+    assert_equal "text/html", email.html_part.mime_type
+    assert_match "<p>Dual templates <strong>rock</strong>!</p>", email.html_part.body.to_s
+  end
+end

data/test/test_helper.rb

@@ -14,61 +14,3 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 # if ActiveSupport::TestCase.method_defined?(:fixture_path=)
 #   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 # end
-
-
-def default_body
-  "Hi,\n\n##\n\n\nName:\n  test_to_yaml_with_time_with_zone_should_not_raise_exception\nLocation:\n  https://github.com/rails/rails/blob/master/test/cases/yaml_serialization_test.rb/#L7\nName:\n  test_roundtrip\nLocation:\n  https://github.com/rails/rails/blob/master/test/cases/yaml_serialization_test.rb/#L20\nName:\n  test_roundtrip_serialized_column\nLocation:\n  https://github.com/rails/rails/blob/master/test/cases/yaml_serialization_test.rb/#L27\nName:\n  test_encode_with_coder\nLocation:\n  https://github.com/rails/rails/blob/master/test/cases/yaml_serialization_test.rb/#L32\nName:\n  test_psych_roundtrip\nLocation:\n  https://github.com/rails/rails/blob/master/test/cases/yaml_serialization_test.rb/#L39\nName:\n  test_psych_roundtrip_new_object\nLocation:\n  https://github.com/rails/rails/blob/master/test/cases/yaml_serialization_test.rb/#L46\n\n--\n@schneems\n"
-end
-
-def orig_text_response
-  {
-    :body         => default_body,
-    :content_type => "text/plain"
-  }.dup
-end
-
-def orig_html_response
-  {
-    :body         => default_body,
-    :content_type => "text/html"
-  }.dup
-end
-
-def md_response
-  {
-    :body         => default_body,
-    :content_type => "text/md"
-  }.dup
-end
-
-def full_responses
-  [orig_text_response, orig_html_response, md_response].dup
-end
-
-def parsed_html_response
-  {
-    body:         Kramdown::Document.new(orig_text_response[:body]).to_html,
-    content_type: "text/html"
-  }
-end
-
-def string_to_response_array(string)
-  [
-    {
-      body:         string,
-      content_type: "text/plain"
-    }.dup,
-    {
-      body:         string,
-      content_type: "text/html"
-    }.dup,
-    {
-      body:         string,
-      content_type: "text/md"
-    }.dup,
-  ]
-end
-
-def parses_responses
-  [orig_text_response, parsed_html_response]
-end

data/test/unit/ext_action_mailer_test.rb

@@ -2,19 +2,13 @@ require 'test_helper'
 
 class ExtActionMailerTest < ActiveSupport::TestCase
 
-  test "correctly registered md mime type" do
-    assert_equal Mime[:md], Mime::Type.lookup("text/md")
-    assert_equal "text/md", Mime[:md].to_s
-  end
-
-  test "default types on action mailer base" do
-    actual   = ActionMailer::Base.view_context_class.default_formats
-    assert_equal actual.include?(:md), true, "Expected #{actual.inspect} to include :md but it did not"
-  end
-
   test "monkeypatch location" do
-    monkeypatch = ActionMailer::Base.instance_method(:collect_responses)
+    monkeypatch = ActionMailer::Base.instance_method(:each_template)
     path        = monkeypatch.source_location.first
     assert_match "maildown/ext/action_mailer.rb", path
+
+    monkeypatch = ActionView::OptimizedFileSystemResolver.instance_method(:extract_handler_and_format_and_variant)
+    path        = monkeypatch.source_location.first
+    assert_match "maildown/ext/action_view.rb", path
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maildown
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - schneems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -92,24 +92,29 @@ files:
 - Rakefile
 - lib/maildown.rb
 - lib/maildown/ext/action_mailer.rb
+- lib/maildown/ext/action_view.rb
+- lib/maildown/handlers/markdown.rb
 - lib/maildown/markdown_engine.rb
-- lib/maildown/md.rb
 - lib/maildown/version.rb
-- lib/tasks/maildown_tasks.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/handlers_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/application_mailer.rb
 - test/dummy/app/mailers/user_no_layout_mailer.rb
 - test/dummy/app/mailers/user_with_layout_mailer.rb
+- test/dummy/app/views/handlers/plain_markdown.html.md
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/layouts/mail_layout.html.erb
 - test/dummy/app/views/layouts/mail_layout.text.erb
-- test/dummy/app/views/user_no_layout_mailer/welcome.md.erb
-- test/dummy/app/views/user_with_layout_mailer/welcome.md.erb
+- test/dummy/app/views/user_no_layout_mailer/contact.md.erb
+- test/dummy/app/views/user_no_layout_mailer/leading_whitespace.md+erb
+- test/dummy/app/views/user_no_layout_mailer/leading_whitespace_again.md+erb
+- test/dummy/app/views/user_no_layout_mailer/welcome.md+erb
+- test/dummy/app/views/user_with_layout_mailer/welcome.md+erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -141,9 +146,10 @@ files:
 - test/dummy/test/mailers/user_no_layout_mailer_test.rb
 - test/dummy/test/mailers/user_with_layout_mailer_test.rb
 - test/integration/layouts_test.rb
+- test/integration/strip_leading_whitespace_test.rb
+- test/integration/template_handler_test.rb
 - test/test_helper.rb
 - test/unit/ext_action_mailer_test.rb
-- test/unit/maildown_test.rb
 - test/unit/markdown_engine_test.rb
 homepage: https://www.github.com/schneems/maildown
 licenses:
@@ -165,23 +171,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Markdown in your mailbox
 test_files:
 - test/unit/ext_action_mailer_test.rb
-- test/unit/maildown_test.rb
 - test/unit/markdown_engine_test.rb
 - test/dummy/app/mailers/user_with_layout_mailer.rb
 - test/dummy/app/mailers/user_no_layout_mailer.rb
 - test/dummy/app/mailers/application_mailer.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/user_with_layout_mailer/welcome.md.erb
-- test/dummy/app/views/user_no_layout_mailer/welcome.md.erb
+- test/dummy/app/controllers/handlers_controller.rb
+- test/dummy/app/views/user_with_layout_mailer/welcome.md+erb
+- test/dummy/app/views/user_no_layout_mailer/leading_whitespace_again.md+erb
+- test/dummy/app/views/user_no_layout_mailer/contact.md.erb
+- test/dummy/app/views/user_no_layout_mailer/welcome.md+erb
+- test/dummy/app/views/user_no_layout_mailer/leading_whitespace.md+erb
 - test/dummy/app/views/layouts/mail_layout.html.erb
 - test/dummy/app/views/layouts/mail_layout.text.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/handlers/plain_markdown.html.md
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/helpers/application_helper.rb
@@ -217,5 +227,7 @@ test_files:
 - test/dummy/log/test.log
 - test/dummy/log/development.log
 - test/dummy/README.rdoc
+- test/integration/strip_leading_whitespace_test.rb
+- test/integration/template_handler_test.rb
 - test/integration/layouts_test.rb
 - test/test_helper.rb

data/lib/maildown/md.rb

@@ -1,38 +0,0 @@
-module Maildown
-  class Md
-    attr_accessor :string
-
-    # responses is an array of hashes containing a body: and :content_type
-    def initialize(responses)
-      @responses  = responses.reject {|r| r[:content_type] == Mime[:html].to_s || r[:content_type] == Mime[:text].to_s }
-      md_response = responses.detect {|r| r[:content_type] == Mime[:md].to_s }
-      if md_response.present?
-        @string = md_response[:body]
-        # Match beginning whitespace but not newline http://rubular.com/r/uCXQ58OOC8
-        @string.gsub!(/^[^\S\n]+/, ''.freeze) if Maildown.allow_indentation
-
-        @responses.delete(md_response)
-      end
-    end
-
-    def to_text
-      Maildown::MarkdownEngine.to_text(string)
-    end
-
-    def to_html
-      Maildown::MarkdownEngine.to_html(string)
-    end
-
-    def to_responses
-      [
-        { body: to_text, content_type: "text/plain"},
-        { body: to_html, content_type: "text/html"}
-      ].concat(@responses)
-    end
-
-
-    def contains_md?
-      string.present?
-    end
-  end
-end

data/lib/tasks/maildown_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :maildown do
-#   # Task goes here
-# end

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

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

data/test/unit/maildown_test.rb

@@ -1,55 +0,0 @@
-require 'test_helper'
-
-class MaildownTest < ActiveSupport::TestCase
-  test "parse md response" do
-    md = ::Maildown::Md.new(full_responses)
-    assert md.contains_md?
-    assert_equal parses_responses, md.to_responses
-  end
-
-
-  test "allow indentation strips leading whitespace" do
-    begin
-      Maildown.allow_indentation = true
-
-      string = "foo"
-
-      md = ::Maildown::Md.new(string_to_response_array("\n    #{string}"))
-      assert md.contains_md?
-
-      expected = [{
-                   body:         "\n#{string}",
-                   content_type: "text/plain"
-                  },
-                  {
-                   body:         "\n<p>#{string}</p>\n",
-                   content_type: "text/html"
-                  }]
-      assert_equal expected, md.to_responses
-    ensure
-      Maildown.allow_indentation = false
-    end
-  end
-
-  test "whitespace is not stripped by default" do
-    string = "foo"
-
-    md = ::Maildown::Md.new(string_to_response_array("    #{string}"))
-    assert md.contains_md?
-
-    expected = [{
-                 body:         "    #{string}",
-                 content_type: "text/plain"
-                },
-                {
-                 body:         "<pre><code>foo\n</code></pre>\n",
-                 content_type: "text/html"
-                }]
-    assert_equal expected, md.to_responses
-  end
-
-  test "no md in response" do
-    md = ::Maildown::Md.new([])
-    refute md.contains_md?
-  end
-end