Merge pull request #26 from m-basov/fix-mjml-regex

Fix semver regex
m-basov · Jul 4, 2021 · 6ae18dc · 6ae18dc
2 parents b6998b8 + 939b135
commit 6ae18dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/mjml.rb b/lib/mjml.rb
@@ -9,8 +9,8 @@ class BinaryNotFound < StandardError; end
   # Constants
   MIME_TYPE = 'text/mjml'.freeze
   EXTENSION = '.mjml'.freeze
-  VERSION_3_REGEX = /^(\d\.\d\.\d)/i
-  VERSION_4_REGEX = /^mjml-cli: (\d\.\d\.\d)/i
+  VERSION_3_REGEX = /^(\d+\.\d+\.\d+)/i
+  VERSION_4_REGEX = /^mjml-cli: (\d+\.\d+\.\d+)/i
 
   # Available settings
   module Config

diff --git a/lib/mjml/version.rb b/lib/mjml/version.rb
@@ -1,3 +1,3 @@
 module MJML
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end
diff --git a/spec/mjml_spec.rb b/spec/mjml_spec.rb
@@ -16,5 +16,13 @@
 
       MJML::Config.bin_path = bin_path
     end
+
+    it 'should work with multi-digit versions' do
+      version = '3.10.235'.match(MJML::VERSION_3_REGEX)
+      _(version[1]).must_equal('3.10.235')
+
+      version = "mjml-core: 4.10.235\nmjml-cli: 4.10.235".match(MJML::VERSION_4_REGEX)
+      _(version[1]).must_equal('4.10.235')
+    end
   end
 end