mjml-rails 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d64fc573617f97b917a44845edb779ac1030e1
-  data.tar.gz: a60ab96d56360fe8879d95bcc0eb8a2f6d8d24fa
+  metadata.gz: 43e20e43c1008a376c9f8bc2f2656223d1b81a48
+  data.tar.gz: '0912c1df5e3e95760e823d836a54ea7c130a3966'
 SHA512:
-  metadata.gz: 61baeae1c6d18fead584e198f16c98da37461b0bcb67ad484808d53ce9097eeeacc4deedd1839b19ef757668887d51310652bba03a2a740b4a53fb762186ba78
-  data.tar.gz: cc269072ac345f354d788011a8223002bbb9fac2f86192051951861d8123c2564c8665755ae51bae1a3de51ab3a86acba7e3b31ca345ef9d3fcf61d9a58a56ea
+  metadata.gz: 3fd8af4d8a513fa306a6ee49da43f5c4b4b5c8b23a7e7b816057a3180f104e916a638c5d9e3532ae957de8d84c2475be5b5abb7386850d62b7f18316bb4e81ce
+  data.tar.gz: 7b0e44992a87b75ab1a33e9ce3fc35246d92fb81e406da5496e46a93f616214d5404a16c7ada7f5f7b48edbf930beae8d06358b793377cab8018e24f4b77cec5

data/README.md

@@ -273,6 +273,11 @@ If you discover any bugs, feel free to create an issue on GitHub. Please add as
 * Simon Loffler [github.com/sighmon](https://github.com/sighmon)
 * Steven Pickles [github.com/thatpixguy](https://github.com/thatpixguy)
 
+## Other similar gems
+
+* [srghma/mjml-premailer](https://github.com/srghma/mjml-premailer) - supports `/app/views/layouts`
+* [kolybasov/mjml-ruby/](https://github.com/kolybasov/mjml-ruby/)
+
 ## License
 
 MIT License. Copyright 2016 Simon Loffler. [sighmon.com](http://sighmon.com)

data/lib/mjml.rb

@@ -5,13 +5,15 @@ require "mjml/railtie"
 require "rubygems"
 
 module Mjml
-  mattr_accessor :template_language, :raise_render_exception
+  mattr_accessor :template_language, :raise_render_exception, :mjml_binary_version_supported, :mjml_binary_error_string
 
   @@template_language = :erb
   @@raise_render_exception = false
+  @@mjml_binary_version_supported = "4.0."
+  @@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)
-    IO.popen("#{bin} --version") { |io| io.read.include?('mjml-core: 4.0.') }
+    IO.popen("#{bin} --version") { |io| io.read.include?("mjml-core: #{Mjml.mjml_binary_version_supported}") }
   rescue
     false
   end
@@ -26,7 +28,7 @@ module Mjml
     mjml_bin = File.join(installer_path, 'mjml')
     return mjml_bin if check_version(mjml_bin)
 
-    puts "Couldn't find the MJML binary.. have you run $ npm install mjml?"
+    puts Mjml.mjml_binary_error_string
     nil
   end
 

data/lib/mjml/parser.rb

@@ -1,11 +1,14 @@
+require 'open3'
+
 module Mjml
   class Parser
+    class ParseError < StandardError; end
 
     # Create new parser
     #
     # @param input [String] The string to transform in html
     def initialize input
-      raise "Couldn't find the MJML binary.. have you run $ npm install mjml?" unless mjml_bin
+      raise Mjml.mjml_binary_error_string unless mjml_bin
       file = File.open(in_tmp_file, 'w')
       file.write(input)
       file.close
@@ -28,8 +31,9 @@ module Mjml
     # @return [String] The result as string
     def run
       command = "#{mjml_bin} -r #{in_tmp_file} -o #{out_tmp_file}"
-      # puts command
-      `#{command}`
+      _, _, 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

data/lib/mjml/version.rb

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

data/test/parser_test.rb

@@ -38,4 +38,17 @@ describe Mjml::Parser do
       end
     end
   end
+
+  describe '#run' do
+    describe 'when shell command is failed' do
+      let(:error) { 'shell error' }
+      let(:stderr) { mock('stderr', eof?: false, read: error) }
+
+      before { Open3.stubs(popen3: [nil, nil, stderr, nil]) }
+
+      it 'raises exception' do
+        -> { parser.run }.must_raise(Mjml::Parser::ParseError, error)
+      end
+    end
+  end
 end

metadata

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