mjml-rails 4.12.1 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01907552b34958af3e345325340d7c93d23fff1ab5510b8a0af948b2f58b66f1'
-  data.tar.gz: 7cf08f76b582345db1a6e445c88bdb347031fa090e4af5aaa155d4fe834b31ef
+  metadata.gz: 68bb806e44c750ca14964989514f2b308044adf537823747f066a2f2afd05321
+  data.tar.gz: 1c1201c5c5162e13e0d82c7c55da03489ba8e6be2a537f8d3fb714f168f206ab
 SHA512:
-  metadata.gz: 562b509f671c502a942e0ba76501441d0cad4670ca73514ae43ad82814f5e9e0bb853a89c8128617f3a7026cd0a7c591b43b999d3cc7bc2aed45b5e975f2ba63
-  data.tar.gz: e57778aadf44939220cce799f9b80eab9e517c6c3d69fecf00fb8f35ddf7ec1a7ef517060ac63804606a23a93c834b7a9a9ca0635cbc9fd994ea266f74c89590
+  metadata.gz: 18208eee18ce2e30bdb5c1672ca783ac6fb9ba0cc62a8e16f4791148957f252d39737e19c8a1dc638dbd51014e32a64de0ddc4a7668d8c1fc5c646bb0d76d94a
+  data.tar.gz: 0cb782e9ab1c9bd32c46de35bc8c53ef5c4c3417772939f12337bbce8719028c7e1fce664cf1102367af737fb0716e2083c98a3a9d083d5a6795dcf23404d94a

data/lib/mjml/version.rb

@@ -2,5 +2,5 @@
 
 module Mjml
   # Version number no longer matches MJML.io version
-  VERSION = '4.12.1'
+  VERSION = '4.14.0'
 end

data/lib/mjml.rb

@@ -45,9 +45,21 @@ module Mjml
     Open3.capture3("#{mjml_bin} #{args}")
   end
 
+  def self.which(command)
+    if Gem.win_platform?
+      stdout, _, status = Open3.capture3("where #{command}")
+    else
+      stdout, _, status = Open3.capture3("which #{command}")
+    end
+    status.success? ? stdout.chomp : nil
+  rescue Errno::ENOENT
+    nil
+  end
+
   def self.valid_mjml_binary
     self.valid_mjml_binary = @@valid_mjml_binary ||
                              check_for_custom_mjml_binary ||
+                             check_for_bun_mjml_binary ||
                              check_for_package_mjml_binary ||
                              check_for_global_mjml_binary ||
                              check_for_mrml_binary
@@ -74,10 +86,8 @@ module Mjml
   end
 
   def self.check_for_mjml_package(package_manager, bin_command, binary_path)
-    stdout, _, status = Open3.capture3("which #{package_manager}")
-    return unless status.success?
-
-    pm_bin = stdout.chomp
+    pm_bin = Mjml.which(package_manager)
+    return unless pm_bin
 
     stdout, _, status = Open3.capture3("#{pm_bin} #{bin_command}")
     return unless status.success?
@@ -88,17 +98,24 @@ module Mjml
     nil
   end
 
+  def self.check_for_bun_mjml_binary
+    return unless Mjml.which('bun')
+
+    # HINT: Bun always prioritizes local bins first and falls back to global installations
+    mjml_bin = 'bun run mjml'
+
+    return mjml_bin if check_version(mjml_bin)
+  end
+
   def self.check_for_package_mjml_binary
-    check_for_mjml_package('bun', 'pm bin', ['mjml']) ||
-      check_for_mjml_package('npm', 'root', ['.bin', 'mjml']) ||
+    check_for_mjml_package('npm', 'root', ['.bin', 'mjml']) ||
       check_for_mjml_package('yarn', 'bin mjml', [])
   end
 
   def self.check_for_global_mjml_binary
-    stdout, _, status = Open3.capture3('which mjml')
-    return unless status.success?
+    mjml_bin = Mjml.which('mjml')
+    return unless mjml_bin
 
-    mjml_bin = stdout.chomp
     return mjml_bin if mjml_bin.present? && check_version(mjml_bin)
   end
 

data/test/mjml_test.rb

@@ -162,6 +162,7 @@ describe Mjml do
     it 'can use MRML and check for a valid binary' do
       Mjml.use_mrml = true
       Mjml.stubs(:check_for_custom_mjml_binary).returns(false)
+      Mjml.stubs(:check_for_bun_mjml_binary).returns(false)
       Mjml.stubs(:check_for_package_mjml_binary).returns(false)
       Mjml.stubs(:check_for_global_mjml_binary).returns(false)
       expect(Mjml.valid_mjml_binary).must_equal(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjml-rails
 version: !ruby/object:Gem::Version
-  version: 4.12.1
+  version: 4.14.0
 platform: ruby
 authors:
 - Simon Loffler
@@ -36,7 +36,7 @@ cert_chain:
   Qqk2dn/fFE9vdcl9OaOw2Zizne/1VFL/jkzXLqnLgbKD/q129mVCBgw2CKYnQfMN
   4RwBjPyqnMxWnSq6Ycn7HdFEkgyf2cAxFfH5QtDsjEuca+/LAJMeAQ==
   -----END CERTIFICATE-----
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: MJML + ERb templates