mjml-rails 2.1.4.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e59e3e02f10d8a60bec4f24c6fbb0c54e17c97e
-  data.tar.gz: 2677fddd0a759e3e4ec3e4c2cb8bed1cf125d011
+  metadata.gz: 8d53faf3f214713c84ee67803ab0f39edff515e5
+  data.tar.gz: fc01ca63c96f2cc3e5213954f6f84ae6bd80c47f
 SHA512:
-  metadata.gz: abc6cfe1614a3e7fbdf7f24659d0230dcb1034594a7e45828c234e8ca859afe8f527eccc5b11f34fcc922a2d5754547a40abef34f77424f7f81b81959df06687
-  data.tar.gz: adf302aa4c460744935d39402734151980135f7bfc486df67f77269070f4c33be499b784e222226c6622c93184b23e49f614d69ca04a593b5bfb5b5b36d2ad41
+  metadata.gz: 829127c28ea524654f5fc3be70b923571843f675339a97ad21cd5b6bd6b746ae218b581c097bac61cb09e2db417fe85dab32594f2a507040d4e4749024e7feb0
+  data.tar.gz: 3bfd98687210b8185d6458ee40d578b4144414c0c33ebfcb616afff2944173c40bc7425e4800e9b23b0c10eee3461d591138be0ad54c46a55c7d1c12e024248a

data/README.md

@@ -59,10 +59,10 @@ Run the following command to install it:
 bundle install
 ```
 
-Install the MJML parser
+Install the MJML parser (optional -g to install it globally):
 
 ```console
-npm install -g mjml@2.1.4
+npm install -g mjml@^2.0
 ```
 
 ### How to guides
@@ -98,7 +98,7 @@ Next you'll need to setup a `package.json` file in the root, something like this
     "test": "test"
   },
   "dependencies": {
-    "mjml": "2.1.4"
+    "mjml": "^2.0"
   },
   "repository": {
     "type": "git",

data/lib/mjml.rb

@@ -2,8 +2,32 @@ require "action_view"
 require "action_view/template"
 require "mjml/mjmltemplate"
 require "mjml/railtie"
+require "rubygems"
 
 module Mjml
+
+  def self.check_version(bin)
+    begin
+      Gem::Dependency.new('','~> 2.0').match?('',`#{bin} --version`)
+    rescue
+      false
+    end
+  end
+
+  def self.discover_mjml_bin
+    # Check for a global install of MJML binary
+    mjml_bin = 'mjml'
+    return mjml_bin if check_version(mjml_bin)
+    
+    # Check for a local install of MJML binary
+    mjml_bin = File.join(`npm bin`.chomp, 'mjml')
+    return mjml_bin if check_version(mjml_bin)
+    
+    raise RuntimeError, "Couldn't find the MJML binary.. have you run $ npm install mjml?"
+  end
+
+  BIN = discover_mjml_bin
+
   class Handler
     def erb_handler
       @erb_handler ||= ActionView::Template.registered_template_handler(:erb)

data/lib/mjml/parser.rb

@@ -75,7 +75,7 @@ module Mjml
       #
       # @return [String]
       def mjml_bin
-        `/usr/bin/which mjml`.chomp
+        Mjml::BIN
       end
   end
 end

data/lib/mjml/railtie.rb

@@ -4,8 +4,8 @@ module Mjml
     config.app_generators.mailer :template_engine => :mjml
 
     initializer "mjml-rails.register_template_handler" do
-    	ActionView::Template.register_template_handler :mjml, Mjml::Handler.new
-    	Mime::Type.register "text/html", :mjml
+      ActionView::Template.register_template_handler :mjml, Mjml::Handler.new
+      Mime::Type.register "text/html", :mjml
     end
   end
 end

data/lib/mjml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjml-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.4.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Simon Loffler
@@ -30,7 +30,7 @@ cert_chain:
   5hPZOkUdP3egZ1xAHeFIOhTIaOJezjUEDQVattPkgwl25+Q2EXJ+5ehDU86v+lxH
   E9hMwkxwQntg0fKVFbnVMOg2itaj8fJ7
   -----END CERTIFICATE-----
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies: []
 description: Render MJML + ERb template views in Rails
 email: sighmon@sighmon.com