mjml-ruby 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cb952b58eadf7f0a4ba87bbb063b8bfef896169
-  data.tar.gz: bc28f55db1682e4f6f2e2cd2c7b0744d605e5e27
+  metadata.gz: 9553ab9e944060cd775079a86da250cc18f98bd3
+  data.tar.gz: 96f986df41ab14afeaeff452735977e11bc98322
 SHA512:
-  metadata.gz: 2cbcb4fbcddc99665544578481856a6a333676237e8d0b0fd9392d92cda36f0ebe85efced87449dfe17e68ef1c6513c683a1cbbe23cd3224abe2aa31d69ded03
-  data.tar.gz: a1f19cf75ac9e4bd620fdb94fe624cef1ddcbcba27cfb260d55fe32a09d5048dba061751d80eaeaded055f62e806f8853af68199d1a3816ec5b630feb23e1d0a
+  metadata.gz: 86bfb367a7237eb0487aa14abdde30564af54c4ff320d15c5b1b27b98f5414f9976ce7ec46b3e20a0c4d8e07ad40d0b067309f9df099c338ce7e782c5ca9aee9
+  data.tar.gz: 2077acd4e9ec468ee1367e9e17f7dc73f4a4342bcf8bbce8621796873b80b34b49dd6d69de640099da6fee69c7a40fe4da512678ef8c00ecccded2090e0648c4

data/lib/mjml.rb

@@ -1,5 +1,6 @@
 require 'dry-configurable'
 require 'mjml/logger'
+require 'mjml/feature'
 require 'mjml/parser'
 
 # MJML library for ruby
@@ -14,13 +15,17 @@ module MJML
   setting :bin_path
   setting :debug
   setting :logger
+  setting :minify_output
+  setting :validation_level
 
   def self.setup!
     # Init config
     configure do |config|
       config.bin_path = find_executable
+      config.debug = nil
       config.logger = Logger.setup!(STDOUT)
-      config.debug = false
+      config.minify_output = false
+      config.validation_level = :skip
     end
   end
 
@@ -35,7 +40,7 @@ module MJML
   end
 
   def self.extract_executable_version
-    ver, _status = Open3.capture2(find_executable, '-V')
+    ver, _status = Open3.capture2(config.bin_path, '-V')
     (ver =~ VERSION_REGEX).nil? ? nil : ver
   end
 

data/lib/mjml/feature.rb

@@ -0,0 +1,26 @@
+module MJML
+  # Allows to check if feature is availalbe in current mjml version
+  class Feature
+    def self.version
+      semver = MJML.executable_version.split('.')
+      @version ||= Hash[
+        major: semver[0].to_i,
+        minor: semver[1].to_i,
+        patch: semver[2].to_i
+      ]
+    end
+
+    def self.available?(feature_name)
+      case feature_name
+      when :validation_level
+        version[:major] >= 3
+      else
+        false
+      end
+    end
+
+    def self.missing?(feature_name)
+      !available?(feature_name)
+    end
+  end
+end

data/lib/mjml/logger.rb

@@ -5,10 +5,10 @@ module MJML
   class Logger < ::Logger
     def self.setup!(destination)
       logger = new(destination)
-      logger.level = ::Logger::DEBUG
+      logger.level = ::Logger::ERROR
 
       logger.formatter = proc do |severity, datetime, _progname, msg|
-        "[#{datetime}] #{severity} -- MJML: #{msg}" if MJML.config.debug
+        "[#{datetime}] #{severity} -- MJML: #{msg}\n\n"
       end
 
       logger

data/lib/mjml/parser.rb

@@ -33,11 +33,15 @@ module MJML
       MJML.logger.debug("Partial: #{partial?(template)}")
       return template if partial?(template)
 
-      out, err, _sts = Open3.capture3("#{mjml_bin} -is", stdin_data: template)
-      MJML.logger.debug("Output:\n #{out};\n\n Errors:\n #{err}")
+      out, err, _sts = Open3.capture3(cmd, stdin_data: template)
+      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?
-      out
+      parsed[:output]
     end
 
     def partial?(template)
@@ -47,5 +51,32 @@ module MJML
     def mjml_bin
       MJML.config.bin_path
     end
+
+    def cmd
+      "#{mjml_bin} #{minify_output} #{validation_level} -is"
+    end
+
+    def minify_output
+      '--min' if MJML.config.minify_output
+    end
+
+    def validation_level
+      "--level=#{MJML.config.validation_level}" if MJML::Feature.available?(:validation_level)
+    end
+
+    def parse_output(out)
+      warnings = []
+      output = []
+
+      out.lines.each do |l| 
+        if l.strip.start_with?('Line')
+          warnings << l
+        else
+          output << l
+        end
+      end
+
+      { warnings: warnings.join, output: output.join }
+    end
   end
 end

data/lib/mjml/rails/template_handler.rb

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

data/lib/mjml/version.rb

@@ -1,3 +1,3 @@
 module MJML
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mjml-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Mykola Basov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mjml.rb
+- lib/mjml/feature.rb
 - lib/mjml/logger.rb
 - lib/mjml/parser.rb
 - lib/mjml/rails/template_handler.rb
@@ -137,7 +138,7 @@ homepage: https://github.com/kolybasov/mjml-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: Don't forget to run $ npm install -g mjml@^2.0
+post_install_message: Don't forget to run $ npm install -g mjml@^3.0
 rdoc_options: []
 require_paths:
 - lib
@@ -153,9 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: MJML parser and template engine for Ruby
 test_files: []
-has_rdoc: