mjml-rails 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4ab2dd426acf0841f1db7464cc2c79c540f9a1
-  data.tar.gz: cd3fa2c7e97994e21e59a388335b6763fd735c7f
+  metadata.gz: ef4f4a694f6d5d155de20776d58e52e2737479e7
+  data.tar.gz: ab526a394813f106708917f422813aae9938a871
 SHA512:
-  metadata.gz: ea06266d0d46cb5f3abcb8ce6276b90edb6b09ae13f77a9c7c2b1849b41dd1b8428683b16d7622b3816e9cfcdc96d442154d5b3b6e7dbc27bb80d7f4e6118a45
-  data.tar.gz: 5b6a45bdf8563304a10be88520775a0bd7c2c4b373e19db3c7cf15685c2a7f15e7c747aef59169579e35326b10959b8be1d0a139f2a2564909c78c1da40505a0
+  metadata.gz: bf4c114510e82242c8cc4cf4411142416eb0de247bb5e37b211e9472fee9811d75b786db8b95720d6bde7964bf002d9da82b867210e1d7e663bad8b0e5e12893
+  data.tar.gz: 35c67496d8d3aa868e71a1801ad41c13545aa5a15cd39f252261ca859d9433c3e5e4d801752a3875ef4dcad68048eada0da9cfeda9f5fdad3c7f1fc4cb71dfa4

data/README.md

@@ -65,6 +65,16 @@ Install the MJML parser (optional -g to install it globally):
 npm install -g mjml@^3.0
 ```
 
+### MJML v3.x support
+
+Version 2.3.0 of this gem brings support for MJML 3.x
+
+If you'd rather still stick with MJML 2.x then lock the mjml-rails gem:
+
+```ruby
+gem 'mjml-rails', '2.2.0'
+```
+
 ### How to guides
 
 [Hugo Giraudel](https://twitter.com/hugogiraudel) wrote a post on [using MJML in Rails](http://dev.edenspiekermann.com/2016/06/02/using-mjml-in-rails/).

data/lib/mjml/railtie.rb

@@ -5,7 +5,7 @@ module Mjml
 
     initializer "mjml-rails.register_template_handler" do
       ActionView::Template.register_template_handler :mjml, Mjml::Handler.new
-      Mime::Type.register "text/html", :mjml
+      Mime::Type.register_alias "text/html", :mjml
     end
   end
-end
+end

data/lib/mjml/version.rb

@@ -1,4 +1,4 @@
 module Mjml
 	# Version number matches MJML.io version
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/test/mjml_subdir_test.rb

@@ -0,0 +1,76 @@
+require "test_helper"
+
+class SubdirNotifier < ActionMailer::Base
+  self.view_paths = File.expand_path("../views", __FILE__)
+
+  layout false
+
+  def simple_block(format_type)
+    mail(:to => 'foo@bar.com', :from => "john.doe@example.com") do |format|
+      format.send(format_type)
+    end
+  end
+
+  def simple_block_and_path(format_type)
+    mail(:template_path => 'template_subdir',:to => 'foo@bar.com', :from => "john.doe@example.com") do |format|
+      format.send(format_type)
+    end
+  end
+
+  def simple_with_path(format_type)
+    mail(:template_path => 'template_subdir',:to => 'foo@bar.com', :from => "john.doe@example.com")
+  end
+
+end
+
+# class TestRenderer < ActionView::PartialRenderer
+#   attr_accessor :show_text
+#   def initialize(render_options = {})
+#     @show_text = render_options.delete(:show_text)
+#     super(render_options)
+#   end
+
+#   def normal_text(text)
+#     show_text ? "TEST #{text}" : "TEST"
+#   end
+# end
+
+class MjmlTest < ActiveSupport::TestCase
+
+  setup do
+    @original_renderer = Mjml.renderer
+    @original_processing_options = Mjml.processing_options
+  end
+
+  teardown do
+    Mjml.renderer = @original_renderer
+    Mjml.processing_options = @original_processing_options
+  end
+
+
+  test 'in a subdir with a block fails' do
+    assert_raises(ActionView::MissingTemplate) do
+      email = SubdirNotifier.simple_block(:mjml)
+      assert_equal "text/html", email.mime_type
+      assert_match(/alternate sub-directory/, email.body.encoded.strip)
+      assert_no_match(/mj-text/, email.body.encoded.strip)
+    end
+  end
+
+  test 'in a subdir with a block and template_path option fails' do
+    assert_raises(ActionView::MissingTemplate) do
+      email = SubdirNotifier.simple_block_and_path(:mjml)
+      assert_equal "text/html", email.mime_type
+      assert_match(/alternate sub-directory/, email.body.encoded.strip)
+      assert_no_match(/mj-text/, email.body.encoded.strip)
+    end
+  end
+
+  test 'in a subdir with path' do
+    email = SubdirNotifier.simple_with_path(:mjml)
+    assert_equal "text/html", email.mime_type
+    assert_match(/alternate sub-directory/, email.body.encoded.strip)
+    assert_no_match(/mj-text/, email.body.encoded.strip)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjml-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Simon Loffler
@@ -31,7 +31,7 @@ cert_chain:
   5hPZOkUdP3egZ1xAHeFIOhTIaOJezjUEDQVattPkgwl25+Q2EXJ+5ehDU86v+lxH
   E9hMwkxwQntg0fKVFbnVMOg2itaj8fJ7
   -----END CERTIFICATE-----
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Render MJML + ERb template views in Rails
 email: sighmon@sighmon.com
@@ -51,6 +51,7 @@ files:
 - lib/mjml/railtie.rb
 - lib/mjml/version.rb
 - test/generator_test.rb
+- test/mjml_subdir_test.rb
 - test/mjml_test.rb
 - test/template_test.rb
 - test/test_helper.rb
@@ -80,6 +81,7 @@ specification_version: 4
 summary: MJML + ERb templates
 test_files:
 - test/generator_test.rb
+- test/mjml_subdir_test.rb
 - test/mjml_test.rb
 - test/template_test.rb
 - test/test_helper.rb