mjml-ruby 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 289d3187de44cd0795351d5f91ad37c1226de1ca3b0e83b527b08ea8b5bb2dda
-  data.tar.gz: d9f923220196f7ad9ebc23d75fcde098d745e1c638e04d20472b7776d07e547d
+  metadata.gz: cdd00c3aaf67c0ea113af29c2c006303f093e73e7ccd71c6ba5d7350dd118c86
+  data.tar.gz: 247f6acb9629a449a070f6c36dfb53ca02a62af0f888e635f45599ce8865a5ef
 SHA512:
-  metadata.gz: 6668eb66b9297ec2284cd307fb3d91796fc52bec8b5867cf6224723ea74c776651baec101f16e709c6c2bcac559a9714e8983abefda99683ac06e51481404fcf
-  data.tar.gz: 1c64c329942cb37e9db99a0560d38c9f028041aef6adf8bd36199bfaab46ad8c93ac4655c95cd24d701f2e3a03dd1ffa909609946cbe7bc5155eef399244e767
+  metadata.gz: 6c92212ba3864acb3eba46ff920217a45ad2aa3ea218e3b07c44df2b6cffa0acc1d950419415e67e1f17306911c0eafc666507c12cf13a4b0925968b9ddddaa1
+  data.tar.gz: 91cec12b92e26a73e2b136d44e1c2212bc3ff2c3fa05f2bfa05eeaf7ff891aeeac8464af8ec75a7ca516110db8d77558f6621665f8aef854f6c8dce6b2df287e

data/lib/mjml.rb

@@ -1,4 +1,3 @@
-require 'dry-configurable'
 require 'mjml/logger'
 require 'mjml/feature'
 require 'mjml/parser'
@@ -10,32 +9,35 @@ module MJML
   # 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
 
-  extend Dry::Configurable
   # Available settings
-  setting :bin_path
-  setting :debug
-  setting :logger
-  setting :minify_output
-  setting :validation_level
+  module Config
+    class << self
+      attr_accessor(
+        :bin_path,
+        :debug,
+        :logger,
+        :minify_output,
+        :validation_level
+      )
+    end
+  end
 
   def self.setup!
     # Init config
-    configure do |config|
-      config.bin_path = find_executable
-      config.debug = nil
-      config.logger = Logger.setup!(STDOUT)
-      config.minify_output = false
-      config.validation_level = :skip
-    end
+    Config.bin_path = find_executable
+    Config.debug = nil
+    Config.logger = Logger.setup!(STDOUT)
+    Config.minify_output = false
+    Config.validation_level = :skip
   end
 
   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/env bash -c "which mjml"`.strip
+    `/usr/bin/env which mjml`.strip
   end
 
   def self.executable_version
@@ -43,7 +45,7 @@ module MJML
   end
 
   def self.extract_executable_version
-    ver, _status = Open3.capture2(config.bin_path, '-V')
+    ver, _status = Open3.capture2(Config.bin_path, '--version')
 
     # mjml 3.x outputs version directly:
     #   3.3.5
@@ -65,15 +67,16 @@ module MJML
 
     match.nil? ? nil : match[1]
   rescue Errno::ENOENT => _e
-    raise BinaryNotFound, "mjml binary not found for path '#{config.bin_path}'"
+    raise BinaryNotFound, "mjml binary not found for path '#{Config.bin_path}'"
   end
 
   def self.logger
-    config.logger
+    Config.logger
   end
 end
 
-MJML.setup!
+# Let Rails take care of the initialization...
+MJML.setup! unless defined?(Rails)
 
 require 'tilt/mjml' if defined?(Tilt)
 require 'sprockets/mjml' if defined?(Sprockets)

data/lib/mjml/parser.rb

@@ -6,17 +6,14 @@ module MJML
     class InvalidTemplate < StandardError; end
     class ExecutableNotFound < StandardError; end
 
-    ROOT_TAGS_REGEX = %r{<mjml>.*<\/mjml>}im
+    ROOT_TAGS_REGEX = %r{<mjml.*>.*<\/mjml>}im
 
     def initialize
-      MJML.logger.debug("Path: #{mjml_bin};" \
-                        "Version: #{MJML.executable_version}")
       raise ExecutableNotFound if MJML.executable_version.nil?
     end
 
     def call(template)
-      @template = template
-      exec!
+      call!(template)
     rescue InvalidTemplate
       nil
     end
@@ -29,20 +26,21 @@ module MJML
     private
 
     def exec!
-      MJML.logger.debug("Template:\n #{@template}")
       raise InvalidTemplate if @template.empty?
 
-      MJML.logger.debug("Partial: #{partial?}")
       return @template if partial?
 
       out, err = should_get_outpout_from_file? ? output_from_file : output_from_memory
       parsed = parse_output(out)
 
-      MJML.logger.debug("Output:\n #{parsed[:output]}")
       MJML.logger.error(err) unless err.empty?
       MJML.logger.warn(parsed[:warnings]) unless parsed[:warnings].empty?
 
-      raise InvalidTemplate unless err.empty?
+      unless err.empty?
+        message = [err, parsed[:warnings]].reject(&:empty?).join("\n")
+        raise InvalidTemplate.new(message)
+      end
+
       parsed[:output]
     end
 
@@ -51,7 +49,7 @@ module MJML
     end
 
     def mjml_bin
-      MJML.config.bin_path
+      MJML::Config.bin_path
     end
 
     def cmd(file_path = nil)
@@ -67,11 +65,11 @@ module MJML
     end
 
     def minify_output
-      '--min' if MJML.config.minify_output
+      '--min' if MJML::Config.minify_output
     end
 
     def validation_level
-      "--level=#{MJML.config.validation_level}" if MJML::Feature.available?(:validation_level)
+      "--level=#{MJML::Config.validation_level}" if MJML::Feature.available?(:validation_level)
     end
 
     def output_from_file
@@ -103,7 +101,7 @@ module MJML
         end
       end
 
-      { warnings: warnings.join, output: output.join }
+      { warnings: warnings.join("\n"), output: output.join }
     end
   end
 end

data/lib/mjml/rails/template_handler.rb

@@ -9,8 +9,8 @@ module MJML
         @base_handler = base_handler
       end
 
-      def call(template)
-        compiled = get_handler(@base_handler).call(template)
+      def call(template, source=nil)
+        compiled = get_handler(@base_handler).call(template, source)
         "::MJML::Parser.new.call!(begin;#{compiled};end).html_safe"
       end
 

data/lib/mjml/railtie.rb

@@ -7,10 +7,12 @@ module MJML
   # Rails plugin for MJML ruby
   class Railtie < ::Rails::Railtie
     # Config
-    config.mjml = MJML.config
+    config.mjml = MJML::Config
 
     # Initializers
     initializer 'mjml.register_extension' do
+      MJML.setup!
+
       unless Mime::Type.lookup ::MJML::MIME_TYPE
         Mime::Type.register ::MJML::MIME_TYPE, :mjml
       end

data/lib/mjml/version.rb

@@ -1,3 +1,3 @@
 module MJML
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,37 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: mjml-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Mykola Basov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -48,83 +70,83 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '9.0'
-description: 
+description:
 email:
 - kolybasov@gmail.com
 executables: []
@@ -144,7 +166,7 @@ homepage: https://github.com/kolybasov/mjml-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: Don't forget to run $ npm install -g mjml@^3.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: MJML parser and template engine for Ruby
 test_files: []