bootstrap-email 1.1.3 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5201c38394c11169354403e9efae089280c0c5e4a699abbed3f3771e8bb018a2
-  data.tar.gz: 15989059cc6bd25fb9bfe9bdef97c873bb865dcc9d9d254be854da610edc63f4
+  metadata.gz: 8874cd9676dffa70b594e1d0b19f94439a5b5a1d56d4c4625f70af5dfcbaf627
+  data.tar.gz: 314113fdcd77f3d7bf7ad4936dd710c804a89644997f4478dc7deb02455fef19
 SHA512:
-  metadata.gz: 4f5100a513793120048088a7c0134d48562fc0492cf05a7ac5c7a84d4b6cf8defda8c69944aac37f9a092ea35b60336ff5c2270565b9a10f4b1ff4bc6d7ca220
-  data.tar.gz: 0db10a26791365ca031f094cbb4ce1eeda3783fb01bcb11ca923461bdd6fc666ae189d6aeae1a24c748ca60c1ae1b6281da95ee6e8feea464bde07605860043b
+  metadata.gz: d09179eaa28c1091c59449c2a22368e9c877c23a11cc8682f949d72f0207c0f081e7d32955c070dbcdb69902cf54bc262c9fedcd907901b329f20d0354624e13
+  data.tar.gz: bf27de1b4a6d6965583f8f4112c25fccf12c07ca10473a5eed7595dd11bdff34741e81039d76c1b23874aff702b76f02d6ee52edd47de8254774db2240d21709

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.6

data/bin/bootstrap-email

@@ -1,2 +1,4 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative '../lib/bootstrap-email/bootstrap_email_cli'

data/lib/bootstrap-email/bootstrap_email_cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../bootstrap-email'
 require 'optparse'
 
@@ -57,9 +59,9 @@ if input
 elsif ARGV.any?
   # Executed via command line or shell script
   input = ARGV.shift
-elsif !STDIN.tty?
+elsif !$stdin.tty?
   # Called in piped command
-  input = STDIN.read
+  input = $stdin.read
   options[:type] = :string
 else
   # Running just the blank command to compile all files in directory containing .html
@@ -74,16 +76,16 @@ if input
       next unless File.file?(path)
 
       puts "Compiling file #{path}"
-      compiled = BootstrapEmail::Compiler.new(path, type: :file, options: {config_path: options[:config]}).perform_full_compile
+      compiled = BootstrapEmail::Compiler.new(path, type: :file, options: { config_path: options[:config] }).perform_full_compile
       destination = options[:destination].chomp('/*')
       FileUtils.mkdir_p("#{Dir.pwd}/#{destination}")
       File.write(File.expand_path("#{destination}/#{path.split('/').last}", Dir.pwd), compiled)
     end
   when :file
     path = File.expand_path(input, Dir.pwd)
-    puts BootstrapEmail::Compiler.new(path, type: :file, options: {config_path: options[:config], sass_log_enabled: false}).perform_full_compile
+    puts BootstrapEmail::Compiler.new(path, type: :file, options: { config_path: options[:config], sass_log_enabled: false }).perform_full_compile
   when :string
-    puts BootstrapEmail::Compiler.new(input, options: {config_path: options[:config], sass_log_enabled: false}).perform_full_compile
+    puts BootstrapEmail::Compiler.new(input, options: { config_path: options[:config], sass_log_enabled: false }).perform_full_compile
   end
 else
   puts opts

data/lib/bootstrap-email/compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   class Compiler
     attr_accessor :type, :doc, :premailer
@@ -92,6 +94,7 @@ module BootstrapEmail
     def finalize_document!
       html = doc.to_html(encoding: 'US-ASCII')
       BootstrapEmail::Converter::SupportUrlTokens.replace(html)
+      BootstrapEmail::Converter::EnsureDoctype.replace(html)
       BootstrapEmail::Converter::ForceEncoding.replace(html)
       BootstrapEmail::Converter::BeautifyHTML.replace(html)
       case type

data/lib/bootstrap-email/config.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   class Config
-    attr_writer :sass_email_location # path to main sass file
-    attr_writer :sass_head_location  # path to head sass file
-    attr_writer :sass_load_paths     # array of directories for loading sass imports
-    attr_writer :sass_cache_location # path to tmp folder for sass cache
-    attr_writer :sass_log_enabled    # turn on or off sass log when caching new sass
+    attr_writer :sass_email_location, # path to main sass file
+                :sass_head_location,  # path to head sass file
+                :sass_load_paths,     # array of directories for loading sass imports
+                :sass_cache_location, # path to tmp folder for sass cache
+                :sass_log_enabled     # turn on or off sass log when caching new sass
 
     def load_options(options)
       file = File.expand_path('bootstrap-email.config.rb', Dir.pwd)

data/lib/bootstrap-email/converters/add_missing_meta_tags.rb

@@ -1,19 +1,24 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class AddMissingMetaTags < Base
       META_TAGS = [
-        {query: 'meta[http-equiv="Content-Type"]'   ,                code: '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'},
-        {query: 'meta[http-equiv="x-ua-compatible"]',                code: '<meta http-equiv="x-ua-compatible" content="ie=edge">'},
-        {query: 'meta[name="x-apple-disable-message-reformatting"]', code: '<meta name="x-apple-disable-message-reformatting">'},
-        {query: 'meta[name="viewport"]',                             code: '<meta name="viewport" content="width=device-width, initial-scale=1">'},
-        {query: 'meta[name="format-detection"]',                     code: '<meta name="format-detection" content="telephone=no, date=no, address=no, email=no">'}
+        { query: 'meta[http-equiv="Content-Type"]',
+          code: '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">' },
+        { query: 'meta[http-equiv="x-ua-compatible"]',
+          code: '<meta http-equiv="x-ua-compatible" content="ie=edge">' },
+        { query: 'meta[name="x-apple-disable-message-reformatting"]',
+          code: '<meta name="x-apple-disable-message-reformatting">' },
+        { query: 'meta[name="viewport"]',
+          code: '<meta name="viewport" content="width=device-width, initial-scale=1">' },
+        { query: 'meta[name="format-detection"]',
+          code: '<meta name="format-detection" content="telephone=no, date=no, address=no, email=no">' }
       ].reverse.freeze
 
       def build
         META_TAGS.each do |tag_hash|
-          unless doc.at_css(tag_hash[:query])
-            doc.at_css('head').prepend_child(tag_hash[:code])
-          end
+          doc.at_css('head').prepend_child(tag_hash[:code]) unless doc.at_css(tag_hash[:query])
         end
       end
     end

data/lib/bootstrap-email/converters/alert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Alert < Base

data/lib/bootstrap-email/converters/align.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Align < Base
       def build
-       ['left', 'center', 'right'].each do |type|
-        full_type = "ax-#{type}"
-         each_node(".#{full_type}") do |node|
-           align_helper(node, full_type, type)
-         end
-       end
+        %w[left center right].each do |type|
+          full_type = "ax-#{type}"
+          each_node(".#{full_type}") do |node|
+            align_helper(node, full_type, type)
+          end
+        end
       end
 
       def align_helper(node, full_type, type)

data/lib/bootstrap-email/converters/badge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Badge < Base

data/lib/bootstrap-email/converters/base.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Base
       attr_reader :doc
+
       def initialize(doc)
         @doc = doc
         @cached_templates = {}

data/lib/bootstrap-email/converters/beautify_html.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class BeautifyHTML < Base
       def self.replace(html)
         # Pretty print format the HTML string and add a trailing newline
-        html.replace(HtmlBeautifier.beautify(html) + "\n")
+        html.replace("#{HtmlBeautifier.beautify(html)}\n")
       end
     end
   end

data/lib/bootstrap-email/converters/block.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Block < Base

data/lib/bootstrap-email/converters/body.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Body < Base

data/lib/bootstrap-email/converters/button.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Button < Base

data/lib/bootstrap-email/converters/card.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Card < Base

data/lib/bootstrap-email/converters/color.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Color < Base

data/lib/bootstrap-email/converters/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Container < Base

data/lib/bootstrap-email/converters/ensure_doctype.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module BootstrapEmail
+  module Converter
+    class EnsureDoctype < Base
+      def self.replace(html)
+        # ensure the proper XHTML doctype which ensures best compatibility in email clients
+        # https://github.com/bootstrap-email/bootstrap-email/discussions/168
+        html.gsub!(
+          /<!DOCTYPE.*(\[[\s\S]*?\])?>/,
+          '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+        )
+      end
+    end
+  end
+end

data/lib/bootstrap-email/converters/force_encoding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class ForceEncoding < Base

data/lib/bootstrap-email/converters/grid.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Grid < Base
       def build
         each_node('.row') do |node|
-          if node.at("./*[contains(@class, 'col-lg-')]")
-            add_class(node, 'row-responsive')
-          end
+          add_class(node, 'row-responsive') if node.at("./*[contains(@class, 'col-lg-')]")
           node.replace(template('div', classes: node['class'], contents: template('table-to-tr', contents: node.inner_html)))
         end
         each_node('*[class*=col]') do |node|

data/lib/bootstrap-email/converters/head_style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class HeadStyle < Base
@@ -8,12 +10,11 @@ module BootstrapEmail
       private
 
       def bootstrap_email_head
-        html_string = <<-INLINE
+        <<-HTML
           <style type="text/css">
             #{purged_css_from_head}
           </style>
-        INLINE
-        html_string
+        HTML
       end
 
       def purged_css_from_head

data/lib/bootstrap-email/converters/hr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Hr < Base

data/lib/bootstrap-email/converters/margin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Margin < Base
@@ -7,13 +9,9 @@ module BootstrapEmail
           bottom_class = node['class'][/m[by]{1}-(lg-)?(\d+)/]
           node['class'] = node['class'].gsub(/(m[tby]{1}-(lg-)?\d+)/, '').strip
           html = ''
-          if top_class
-            html += template('div', classes: "s-#{top_class.gsub(/m[ty]{1}-/, '')}", contents: nil)
-          end
+          html += template('div', classes: "s-#{top_class.gsub(/m[ty]{1}-/, '')}", contents: nil) if top_class
           html += node.to_html
-          if bottom_class
-            html += template('div', classes: "s-#{bottom_class.gsub(/m[by]{1}-/, '')}", contents: nil)
-          end
+          html += template('div', classes: "s-#{bottom_class.gsub(/m[by]{1}-/, '')}", contents: nil) if bottom_class
           node.replace(html)
         end
       end

data/lib/bootstrap-email/converters/padding.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Padding < Base
       def build
         each_node("*[class^=p-], *[class^=pt-], *[class^=pr-], *[class^=pb-], *[class^=pl-], *[class^=px-], *[class^=py-], *[class*=' p-'], *[class*=' pt-'], *[class*=' pr-'], *[class*=' pb-'], *[class*=' pl-'], *[class*=' px-'], *[class*=' py-']") do |node|
-          next if ['table', 'td', 'a'].include?(node.name)
+          next if %w[table td a].include?(node.name)
 
           padding_regex = /(p[trblxy]?-(lg-)?\d+)/
           classes = node['class'].gsub(padding_regex).to_a.join(' ')

data/lib/bootstrap-email/converters/paragraph.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Paragraph < Base

data/lib/bootstrap-email/converters/preview_text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class PreviewText < Base

data/lib/bootstrap-email/converters/spacer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Spacer < Base

data/lib/bootstrap-email/converters/spacing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Spacing < Base

data/lib/bootstrap-email/converters/stack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Stack < Base

data/lib/bootstrap-email/converters/support_url_tokens.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class SupportUrlTokens < Base
@@ -5,11 +7,11 @@ module BootstrapEmail
       CLOSE_BRACKETS = CGI.escape('}}').freeze
 
       def self.replace(html)
-        regex = /((href|src)=(\"|\').*?)((#{Regexp.quote(OPEN_BRACKETS)}).*?(#{Regexp.quote(CLOSE_BRACKETS)}))(.*?(\"|\'))/
-        if regex.match?(html)
-          html.gsub!(regex) do |match|
-            "#{$1}#{CGI.unescape($4)}#{$7}"
-          end
+        regex = /((href|src)=("|').*?)((#{Regexp.quote(OPEN_BRACKETS)}).*?(#{Regexp.quote(CLOSE_BRACKETS)}))(.*?("|'))/
+        return unless regex.match?(html)
+
+        html.gsub!(regex) do |_match|
+          "#{Regexp.last_match(1)}#{CGI.unescape(Regexp.last_match(4))}#{Regexp.last_match(7)}"
         end
       end
     end

data/lib/bootstrap-email/converters/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class Table < Base

data/lib/bootstrap-email/converters/version_comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Converter
     class VersionComment < Base

data/lib/bootstrap-email/erb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   class Erb
     def self.template(path, locals_hash = {})

data/lib/bootstrap-email/rails/action_mailer.rb

@@ -1,4 +1,6 @@
-ActiveSupport.on_load(:action_mailer, {yield: true}) do |action_mailer|
+# frozen_string_literal: true
+
+ActiveSupport.on_load(:action_mailer, { yield: true }) do |action_mailer|
   action_mailer.class_eval do # To support Rails less than 6
     # sit in the middle and compile the html
     def bootstrap_mail(*args, &block)
@@ -10,7 +12,7 @@ ActiveSupport.on_load(:action_mailer, {yield: true}) do |action_mailer|
       end
       mail_message
     end
-    alias bootstrap_email bootstrap_mail
-    alias make_bootstrap_mail bootstrap_mail
+    alias_method :bootstrap_email, :bootstrap_mail
+    alias_method :make_bootstrap_mail, :bootstrap_mail
   end
 end

data/lib/bootstrap-email/rails/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   module Rails
     class Engine < ::Rails::Engine

data/lib/bootstrap-email/sass_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   class SassCache
     SASS_DIR = File.expand_path('../../core', __dir__)
@@ -22,9 +24,7 @@ module BootstrapEmail
 
     def compile
       cache_path = "#{cache_dir}/#{checksum}/#{type}.css"
-      unless cached?(cache_path)
-        compile_and_cache_scss(cache_path)
-      end
+      compile_and_cache_scss(cache_path) unless cached?(cache_path)
       File.read(cache_path)
     end
 
@@ -41,9 +41,12 @@ module BootstrapEmail
 
     def checksum_files
       checksums = config_file.nil? ? [] : [Digest::SHA1.hexdigest(config_file)]
-      Dir.glob('../../core/**/*.scss', base: __dir__).each do |path|
-        checksums << Digest::SHA1.file(File.expand_path(path, __dir__)).hexdigest
+      BootstrapEmail.config.sass_load_paths.each do |load_path|
+        Dir.glob(File.join(load_path, '**', '*.scss'), base: __dir__).each do |path|
+          checksums << Digest::SHA1.file(File.expand_path(path, __dir__)).hexdigest
+        end
       end
+
       Digest::SHA1.hexdigest(checksums.join)
     end
 
@@ -56,9 +59,7 @@ module BootstrapEmail
       css = SassC::Engine.new(file, style: style).render
       FileUtils.mkdir_p("#{cache_dir}/#{checksum}") unless File.directory?("#{cache_dir}/#{checksum}")
       File.write(cache_path, css)
-      if BootstrapEmail.config.sass_log_enabled?
-        puts "New css file cached for #{type}"
-      end
+      puts "New css file cached for #{type}" if BootstrapEmail.config.sass_log_enabled?
     end
   end
 end

data/lib/bootstrap-email/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   class << self
     def config
@@ -11,7 +13,7 @@ module BootstrapEmail
       @config
     end
 
-    def configure(&proc)
+    def configure
       @config ||= BootstrapEmail::Config.new
       yield @config
     end

data/lib/bootstrap-email/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BootstrapEmail
   VERSION = File.read(
     File.expand_path('../../VERSION', __dir__)

data/lib/bootstrap-email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'erb'
 require 'ostruct'
@@ -12,9 +14,7 @@ begin
   require 'rails'
 rescue LoadError; end
 
-if defined?(Rails)
-  require 'action_mailer'
-end
+require 'action_mailer' if defined?(Rails)
 
 require_relative 'bootstrap-email/config'
 require_relative 'bootstrap-email/setup'

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.6
 platform: ruby
 authors:
 - Stuart Yamartino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: htmlbeautifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: premailer
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: premailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: htmlbeautifier
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 description: 
 email: stu@stuyam.com
 executables:
@@ -131,6 +131,7 @@ files:
 - lib/bootstrap-email/converters/card.rb
 - lib/bootstrap-email/converters/color.rb
 - lib/bootstrap-email/converters/container.rb
+- lib/bootstrap-email/converters/ensure_doctype.rb
 - lib/bootstrap-email/converters/force_encoding.rb
 - lib/bootstrap-email/converters/grid.rb
 - lib/bootstrap-email/converters/head_style.rb
@@ -154,7 +155,8 @@ files:
 homepage: https://bootstrapemail.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -170,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: 'Bootstrap 5+ stylesheet, compiler, and inliner for responsive and consistent