mjml-ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0b60d0ad6a5d23205a3bbac3703a53806029f0
-  data.tar.gz: d5fb6c55c058866cb65e9d0d7d6f7e0aa9d7dd32
+  metadata.gz: 431c3699bbdba99d82ba599191008e1bddbf7b71
+  data.tar.gz: 07f94777bb07770d9d9da7b4c81ce5899c5da244
 SHA512:
-  metadata.gz: fc135252a72a4ffdd91dde91bed103f9aa8227083587d77a6bd7d122ce54a97e8c1cfcfa1b411af1b5219a5854f7c7fdba46dd88834520d4d76f23c79f0b1248
-  data.tar.gz: 118ef5bb3ed4172fbb0ff12b01ba6661bfddccaded7220918b28e9604a885c25071f82b74c9cccd436806158e44beea0b9eaf060c4a496b5a56f838ea0580a90
+  metadata.gz: e4132a15b2f3c54d3bfcfc37fbd16456f3f3fa2269f8ce5f85e9d65c80c4a8eebfce9fb322ec0b47c365198f88441cb87c0ef9f569dc94a180c831fc19060180
+  data.tar.gz: 0671779264d9699d6e3d4ff4e2e672cf4a8a6443c54c75f272bb6059f1da34436d668931b3f15332f94e802ffdf75fefb9e7f06e0ca3f9a915a0fe157bc39be2

data/lib/mjml.rb

@@ -5,6 +5,7 @@ module MJML
   # Constants
   MIME_TYPE = 'text/mjml'.freeze
   EXTENSION = '.mjml'.freeze
+  VERSION_REGEX = /^\d\.\d\.\d/i
 
   extend Dry::Configurable
   # Available settings
@@ -20,7 +21,12 @@ module MJML
   def self.find_executable
     local_path = File.expand_path('node_modules/.bin/mjml', Dir.pwd)
     return local_path if File.file?(local_path)
-    `/usr/bin/which mjml`.strip
+    `/usr/bin/env bash -c "which mjml"`.strip
+  end
+
+  def self.executable_version
+    ver, _status = Open3.capture2(find_executable, '-V')
+    (ver =~ VERSION_REGEX).nil? ? nil : ver
   end
 end
 

data/lib/mjml/parser.rb

@@ -7,10 +7,9 @@ module MJML
     class ExecutableNotFound < StandardError; end
 
     ROOT_TAGS_REGEX = %r{<mjml>.*<\/mjml>}im
-    VERSION_REGEX = /^\d\.\d\.\d/i
 
     def initialize
-      raise ExecutableNotFound if mjml_version.nil?
+      raise ExecutableNotFound if MJML.executable_version.nil?
     end
 
     def call(template)
@@ -29,7 +28,7 @@ module MJML
       raise InvalidTemplate if template.empty?
       return template if partial?(template)
 
-      out, err, _status = Open3.capture3("#{mjml_bin} -is <<< '#{template}'")
+      out, err, _status = Open3.capture3(build_cmd(template))
 
       raise InvalidTemplate unless err.empty?
       out
@@ -43,9 +42,8 @@ module MJML
       MJML.config.bin_path
     end
 
-    def mjml_version
-      ver, _status = Open3.capture2(mjml_bin, '-V')
-      (ver =~ VERSION_REGEX).nil? ? nil : ver
+    def build_cmd(template)
+      "/usr/bin/env bash -c \"echo '#{template}' | #{mjml_bin} -is\""
     end
   end
 end

data/lib/mjml/version.rb

@@ -1,3 +1,3 @@
 module MJML
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mjml-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mykola Basov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable