mjml-rails 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e20e43c1008a376c9f8bc2f2656223d1b81a48
-  data.tar.gz: '0912c1df5e3e95760e823d836a54ea7c130a3966'
+  metadata.gz: bf24f6bc544ed49f738f3afb6dd288be522a8eac
+  data.tar.gz: 0e4f7e9b607039a2619c12f34202e3c63be9ec91
 SHA512:
-  metadata.gz: 3fd8af4d8a513fa306a6ee49da43f5c4b4b5c8b23a7e7b816057a3180f104e916a638c5d9e3532ae957de8d84c2475be5b5abb7386850d62b7f18316bb4e81ce
-  data.tar.gz: 7b0e44992a87b75ab1a33e9ce3fc35246d92fb81e406da5496e46a93f616214d5404a16c7ada7f5f7b48edbf930beae8d06358b793377cab8018e24f4b77cec5
+  metadata.gz: 169a7f232e534cbcb29a660ea166b0b7c54eee8f2c327b611131996ae9747f2a6c2617be96d02b62bb8d7e5181c5307f50c7bc933015c02eb8d343822bb53e7c
+  data.tar.gz: 7e679743fb0053909d30237d31ca300258b4114679eb39cf107b778f2477b272d077cfb65e3b8ff77ff6797a27f2bfa8499e87c873abc8b3e5c3c5d20d1d3467

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-s����uaR���U�/ٸ�+"�D��%'z�d����Q��)'[��>��4	��+�A&���Z>�����*k�Ɵ.@Brٳ���-}e��
-�\� ;OI�aǍ|,Qt����E���oJ:}7~'��r�r2Љ龉b��d5�����g���C���V�_���/jEp���6K�a�=:�/1dH�����@/%nF�G� ��grw�F���r�|��L�L
+���‘y�l��ga�.���~p�v���2�xR#�t6����0<ۏi���_���;�����

data/README.md

@@ -13,14 +13,12 @@ An example template might look like:
     <mj-preview>Hello World</mj-preview>
   </mj-head>
   <mj-body>
-    <mj-container>
-      <mj-section>
-        <mj-column>
-          <mj-text>Hello World</mj-text>
-          <%= render :partial => 'info', :formats => [:html] %>
-        </mj-column>
-      </mj-section>
-    </mj-container>
+    <mj-section>
+      <mj-column>
+        <mj-text>Hello World</mj-text>
+        <%= render :partial => 'info', :formats => [:html] %>
+      </mj-column>
+    </mj-section>
   </mj-body>
 </mjml>
 ```
@@ -151,9 +149,7 @@ Email layout:
 <!-- views/layouts/default.mjml -->
 <mjml>
 	<mj-body>
-		<mj-container>
-			<%= yield %>
-		</mj-container>
+		<%= yield %>
 	</mj-body>
 </mjml>
 ```

data/lib/mjml.rb

@@ -9,7 +9,7 @@ module Mjml
 
   @@template_language = :erb
   @@raise_render_exception = false
-  @@mjml_binary_version_supported = "4.0."
+  @@mjml_binary_version_supported = "4.1."
   @@mjml_binary_error_string = "Couldn't find the MJML #{Mjml.mjml_binary_version_supported} binary.. have you run $ npm install mjml?"
 
   def self.check_version(bin)

data/lib/mjml/parser.rb

@@ -4,78 +4,46 @@ module Mjml
   class Parser
     class ParseError < StandardError; end
 
+    attr_reader :input
+
     # Create new parser
     #
     # @param input [String] The string to transform in html
     def initialize input
       raise Mjml.mjml_binary_error_string unless mjml_bin
-      file = File.open(in_tmp_file, 'w')
-      file.write(input)
-      file.close
+      @input = input
     end
 
     # Render mjml template
     #
     # @return [String]
     def render
-      result = run
-      remove_tmp_files
-      result
+      in_tmp_file = Tempfile.open(["in", ".mjml"]) do |file|
+        file.write(input)
+        file # return tempfile from block so #unlink works later
+      end
+      run in_tmp_file.path
     rescue
       raise if Mjml.raise_render_exception
       ""
+    ensure
+      in_tmp_file.unlink
     end
 
     # Exec mjml command
     #
     # @return [String] The result as string
-    def run
-      command = "#{mjml_bin} -r #{in_tmp_file} -o #{out_tmp_file}"
-      _, _, stderr, _ = Open3.popen3(command)
-      raise ParseError.new(stderr.read.chomp) unless stderr.eof?
-
-      file = File.open(out_tmp_file, 'r')
-      str  = file.read
-      file.close
-      str
+    def run(in_tmp_file)
+      Tempfile.create(["out", ".html"]) do |out_tmp_file|
+        command = "#{mjml_bin} -r #{in_tmp_file} -o #{out_tmp_file.path}"
+        _, _, stderr, _ = Open3.popen3(command)
+        raise ParseError.new(stderr.read.chomp) unless stderr.eof?
+        out_tmp_file.read
+      end
     end
 
     private
 
-      # Remove tmp files
-      #
-      # @return nil
-      def remove_tmp_files
-        FileUtils.rm(in_tmp_file)
-        FileUtils.rm(out_tmp_file)
-        nil
-      end
-
-      # Return tmp dir
-      #
-      # @return [String]
-      def tmp_dir
-        "/tmp"
-      end
-
-      # Get parser tpm file to store result
-      #
-      # @return [String]
-      def out_tmp_file
-
-        @_out_tmp_file ||= "#{tmp_dir}/out_#{(0...8).map { (65 + rand(26)).chr }.join}.html"
-      end
-
-      # Get parser tpm file to get result
-      #
-      # @return [String]
-      def in_tmp_file
-
-        @_in_tmp_file ||= "#{tmp_dir}/in_#{(0...8).map { (65 + rand(26)).chr }.join}.mjml"
-        # puts @_in_tmp_file
-        return @_in_tmp_file
-      end
-
       # Get mjml bin path
       #
       # @return [String]

data/lib/mjml/version.rb

@@ -1,4 +1,4 @@
 module Mjml
 	# Version number no longer matches MJML.io version
-  VERSION = "4.0.3"
+  VERSION = "4.1.0"
 end

data/test/parser_test.rb

@@ -47,7 +47,7 @@ describe Mjml::Parser do
       before { Open3.stubs(popen3: [nil, nil, stderr, nil]) }
 
       it 'raises exception' do
-        -> { parser.run }.must_raise(Mjml::Parser::ParseError, error)
+        -> { parser.run "/tmp/input_file.mjml" }.must_raise(Mjml::Parser::ParseError, error)
       end
     end
   end

data/test/template_test.rb

@@ -1,9 +1,9 @@
 require "test_helper"
 
 class MjmlTest < ActiveSupport::TestCase
-  
+
   test 'with Mjmltemplate processor' do
-    assert_not_equal "<mj-body></mj-body>", Mjml::Mjmltemplate.to_html("<mjml><mj-body><mj-container><mj-section><mj-column></mj-column></mj-section></mj-container></mj-body></mjml>").strip
+    assert_not_equal "<mj-body></mj-body>", Mjml::Mjmltemplate.to_html("<mjml><mj-body><mj-section><mj-column></mj-column></mj-section></mj-body></mjml>").strip
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjml-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Simon Loffler
@@ -31,7 +31,7 @@ cert_chain:
   IUdCp7zF7QpeLz6cgerOpdG0NLHQOEPcWqHpt4yM++TieNrYOuJlkkSd11Ypvgsc
   RRE0kJj2aO7haTBQ7uQl3cTv2c1s4bLu
   -----END CERTIFICATE-----
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies: []
 description: Render MJML + ERb template views in Rails
 email: sighmon@sighmon.com