mjml-rails 4.12.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b6b7aed097a59ac30303aaf45d11b7f736e521d80f861b93fbf1886be6a15a0
-  data.tar.gz: 3d894ce65b6ba9c6f5818acfaf4d34dd57a85b29ed4a071870ff2c4cdc65c9ad
+  metadata.gz: 5a38b98e1971fed4a869a93244e2c8f1ad40d101e84722e8edffd8f2fed929a1
+  data.tar.gz: e75512c3a3897b8b56216d209d0b815685ccedb1a6826caaed61d85a9bd9b26a
 SHA512:
-  metadata.gz: d3dd354857e11c5a8864365a1e19c591eaec48a1349d3f675522f6835e5c830d9dd0328957866cbb5e085f1fab6679dec1588f8233841a33626469e9d5eb17a1
-  data.tar.gz: be4f6c9bf8192a20bba52cf2f196e33e96b9d6d7546efccb5c7efec9fb8295fd8caebff39f4131b4e9444dfc254b9c8814e039e529c43bb18fe7714ff0e2acd2
+  metadata.gz: 33c8776a5b4d5e54d12df6bccf63135947576b93d5fa37814f7617c3345730fb6d997ae90a273f12bc8030c6055632f17a6017b03bbed567a678a292e812f536
+  data.tar.gz: 4c8af93e7581f187e8d27df1347e638ea357ccdcb8308f16666b7b6581244e1eb0f4f356c2b4d26fabfa556271ff2a56f1cd59b75664bd89db4485a240a47ecc

data/lib/mjml/version.rb

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

data/lib/mjml.rb

@@ -48,6 +48,7 @@ module Mjml
   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,8 +75,10 @@ module Mjml
   end
 
   def self.check_for_mjml_package(package_manager, bin_command, binary_path)
-    pm_bin = `which #{package_manager}`.chomp
-    return if pm_bin.blank?
+    stdout, _, status = Open3.capture3("which #{package_manager}")
+    return unless status.success?
+
+    pm_bin = stdout.chomp
 
     stdout, _, status = Open3.capture3("#{pm_bin} #{bin_command}")
     return unless status.success?
@@ -86,18 +89,32 @@ module Mjml
     nil
   end
 
+  def self.check_for_bun_mjml_binary
+    _, _, status = Open3.capture3('which bun')
+    return unless status.success?
+
+    # 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
-    mjml_bin = `which mjml`.chomp
+    stdout, _, status = Open3.capture3('which mjml')
+    return unless status.success?
+
+    mjml_bin = stdout.chomp
     return mjml_bin if mjml_bin.present? && check_version(mjml_bin)
   end
 
   def self.check_for_mrml_binary
+    return unless Mjml.use_mrml
+
     MRML.present?
   rescue NameError
     Mjml.mjml_binary_error_string = 'Couldn\'t find MRML - did you add \'mrml\' to your Gemfile?'

data/test/mjml_test.rb

@@ -162,14 +162,26 @@ 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)
 
       Mjml.valid_mjml_binary = nil
       MRML.stubs(:present?).raises(NameError)
+      Mjml.stubs(:puts) # silence printed error message from test output
       assert_nil(Mjml.valid_mjml_binary)
       expect(Mjml.mjml_binary_error_string).must_equal 'Couldn\'t find MRML - did you add \'mrml\' to your Gemfile?'
     end
+
+    it 'with nothing on the path, sets valid_mjml_binary to nil' do
+      old_path = ENV['PATH']
+      ENV['PATH'] = './test/fixtures/valid-mjml-binary/empty-path/'
+
+      Mjml.stubs(:puts) # silence printed error message from test output
+      assert_nil(Mjml.valid_mjml_binary)
+    ensure
+      ENV['PATH'] = old_path
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjml-rails
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Simon Loffler
@@ -36,7 +36,7 @@ cert_chain:
   Qqk2dn/fFE9vdcl9OaOw2Zizne/1VFL/jkzXLqnLgbKD/q129mVCBgw2CKYnQfMN
   4RwBjPyqnMxWnSq6Ycn7HdFEkgyf2cAxFfH5QtDsjEuca+/LAJMeAQ==
   -----END CERTIFICATE-----
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2025-01-03 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