bootstrap-email 1.0.0.alpha1.2 → 1.0.0.alpha4

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

@@ -0,0 +1,10 @@
+module BootstrapEmail
+  module Converter
+    class Body < Base
+      def build
+        body = doc.at_css('body')
+        body.inner_html = template('body', classes: "#{body['class']} body", contents: body.inner_html)
+      end
+    end
+  end
+end

data/lib/bootstrap-email/{components → converters}/button.rb

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Button < Base
       def build
         each_node('.btn') do |node|

data/lib/bootstrap-email/{components → converters}/card.rb

@@ -1,12 +1,12 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Card < Base
       def build
         each_node('.card') do |node|
-          node.replace(template('table', classes: node['class'], contents: node.delete('class') && node.inner_html))
+          node.replace(template('table', classes: node['class'], contents: node.inner_html))
         end
         each_node('.card-body') do |node|
-          node.replace(template('table', classes: node['class'], contents: node.delete('class') && node.inner_html))
+          node.replace(template('table', classes: node['class'], contents: node.inner_html))
         end
       end
     end

data/lib/bootstrap-email/{components → converters}/color.rb

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Color < Base
       def build
         each_node('*[class*=bg-]') do |node|

data/lib/bootstrap-email/{components → converters}/container.rb

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Container < Base
       def build
         each_node('.container') do |node|

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

@@ -0,0 +1,14 @@
+module BootstrapEmail
+  module Converter
+    class ForceEncoding < Base
+      def self.replace(html)
+        # force utf-8 character encoded in iOS Mail: https://github.com/bootstrap-email/bootstrap-email/issues/50
+        # this needs to be done after the document has been outputted to a ascii string so it doesn't get converted
+        html.sub(
+          '<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">',
+          '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module BootstrapEmail
+  module Converter
+    class Grid < Base
+      def build
+        each_node('.row') do |node|
+          node.replace(template('div', classes: node['class'], contents: template('table-to-tr', contents: node.inner_html)))
+        end
+        each_node('*[class*=col]') do |node|
+          node.replace(template('td', classes: node['class'], contents: node.inner_html))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module BootstrapEmail
+  module Converter
+    class HeadStyle < Base
+      def build
+        doc.at_css('head').add_child(bootstrap_email_head)
+      end
+
+      private
+
+      def bootstrap_email_head
+        html_string = <<-INLINE
+          <style type="text/css">
+            #{purged_css_from_head}
+          </style>
+        INLINE
+        html_string
+      end
+
+      def purged_css_from_head
+        default, custom = BootstrapEmail::SassCache.compile('bootstrap-head').split('/*! allow_purge_after */')
+        # get each CSS declaration
+        custom.scan(/\w*\.[\w\-]*[\s\S\n]+?(?=})}{1}/).each do |group|
+          # get the first class for each comma separated CSS declaration
+          exist = group.scan(/(\.[\w\-]*).*?((,+?)|{+?)/).map(&:first).uniq.any? do |selector|
+            !doc.at_css(selector).nil?
+          end
+          custom.sub!(group, '') unless exist
+        end
+        (default + custom).gsub(/\n\s*\n+/, "\n")
+      end
+    end
+  end
+end

data/lib/bootstrap-email/{components → converters}/hr.rb

@@ -1,9 +1,9 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Hr < Base
       def build
         each_node('hr') do |node|
-          default_margin = node['class'].to_s.match?(/m[tby]{1}-(lg-)?\d+/) ? '' : 'my-5'
+          default_margin = margin?(node) ? '' : 'my-5'
           node.replace(template('table', classes: "#{default_margin} hr #{node['class']}", contents: ''))
         end
       end

data/lib/bootstrap-email/{components → converters}/margin.rb

@@ -1,11 +1,11 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Margin < Base
       def build
-        each_node('*[class*=my-], *[class*=mt-], *[class*=mb-]') do |node|
+        each_node("*[class^='my-'], *[class^='mt-'], *[class^='mb-'], *[class*=' my-'], *[class*=' mt-'], *[class*=' mb-']") do |node|
           top_class = node['class'][/m[ty]{1}-(lg-)?(\d+)/]
           bottom_class = node['class'][/m[by]{1}-(lg-)?(\d+)/]
-          node['class'] = node['class'].gsub(/(m[tby]{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)

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

@@ -0,0 +1,16 @@
+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)
+
+          padding_regex = /(p[trblxy]?-(lg-)?\d+)/
+          classes = node['class'].gsub(padding_regex).to_a.join(' ')
+          node['class'] = node['class'].gsub(padding_regex, '').strip
+          node.replace(template('table', classes: classes, contents: node.to_html))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module BootstrapEmail
+  module Converter
+    class Paragraph < Base
+      def build
+        each_node('p') do |node|
+          next if margin?(node)
+
+          add_class(node, 'mb-4')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module BootstrapEmail
+  module Converter
+    class PreviewText < Base
+      def build
+        preview_node = doc.at_css('preview')
+        return if preview_node.nil?
+
+        # apply spacing after the text max of 100 characters so it doesn't show body text
+        preview_node.inner_html += '&nbsp;' * [(100 - preview_node.content.length.to_i), 0].max
+        node = template('div', classes: 'preview', contents: preview_node.content)
+        preview_node.remove
+
+        body = doc.at_css('body')
+        body.prepend_child(node)
+      end
+    end
+  end
+end

data/lib/bootstrap-email/{components → converters}/spacer.rb

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Spacer < Base
       def build
         each_node('*[class*=s-]') do |node|

data/lib/bootstrap-email/{components → converters}/spacing.rb

@@ -1,15 +1,14 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Spacing < Base
       def build
         each_node('*[class*=space-y-]') do |node|
           spacer = node['class'].scan(/space-y-((lg-)?\d+)/)[0][0]
           # get all direct children except the first
-          node.xpath('./*[position()>1] | ./tbody/tr/td/*[position()>1]').each do |child|
-            html = ''
-            html += template('div', classes: "s-#{spacer}", contents: nil)
-            html += child.to_html
-            child.replace(html)
+          node.xpath('./*[position() < last()] | ./tbody/tr/td/*[position() < last()]').each do |child|
+            next if margin_bottom?(child)
+
+            add_class(child, "mb-#{spacer}")
           end
         end
       end

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

@@ -0,0 +1,30 @@
+module BootstrapEmail
+  module Converter
+    class Stack < Base
+      def build
+        stack_row
+        stack_col
+      end
+
+      def stack_row
+        each_node('.stack-row') do |node|
+          html = ''
+          node.xpath('./*').each do |child|
+            html += template('td', classes: 'stack-cell', contents: child.to_html)
+          end
+          node.replace(template('table-to-tr', classes: node['class'], contents: html))
+        end
+      end
+
+      def stack_col
+        each_node('.stack-col') do |node|
+          html = ''
+          node.xpath('./*').each do |child|
+            html += template('tr', classes: 'stack-cell', contents: child.to_html)
+          end
+          node.replace(template('table-to-tbody', classes: node['class'], contents: html))
+        end
+      end
+    end
+  end
+end

data/lib/bootstrap-email/{components → converters}/table.rb

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Table < Base
       def build
         each_node('table') do |node|

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

@@ -0,0 +1,15 @@
+module BootstrapEmail
+  module Converter
+    class VersionComment < Base
+      def build
+        doc.at_css('head').prepend_child(bootstrap_email_comment)
+      end
+
+      private
+
+      def bootstrap_email_comment
+        "\n    <!-- Compiled with Bootstrap Email version: #{BootstrapEmail::VERSION} -->"
+      end
+    end
+  end
+end

data/lib/bootstrap-email/erb.rb

@@ -0,0 +1,9 @@
+module BootstrapEmail
+  class Erb
+    def self.template(path, locals_hash = {})
+      namespace = OpenStruct.new(locals_hash)
+      template_html = File.read(path)
+      ERB.new(template_html).result(namespace.instance_eval { binding })
+    end
+  end
+end

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

@@ -2,9 +2,14 @@ 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)
-      bootstrap = BootstrapEmail::Compiler.new(mail(*args, &block), type: :rails)
-      bootstrap.perform_full_compile
+      mail_message = mail(*args, &block)
+      # if you override the #mail method in you ApplicationMailer you may intentionally return something other than a mail message
+      if mail_message
+        bootstrap = BootstrapEmail::Compiler.new(mail_message, type: :rails)
+        bootstrap.perform_full_compile
+      end
     end
+    alias bootstrap_email bootstrap_mail
     alias make_bootstrap_mail bootstrap_mail
   end
 end

data/lib/bootstrap-email/sass_cache.rb

@@ -1,38 +1,45 @@
 module BootstrapEmail
   class SassCache
-    CACHE_DIR = File.expand_path('../../.sass-cache', __dir__)
     SASS_DIR = File.expand_path('../../core', __dir__)
 
-    def self.compile(name, config_path: nil, style: :compressed)
-      path = "#{SASS_DIR}/#{name}"
-      config_file = nil
+    def self.compile(type, style: :compressed)
+      new(type, style).compile
+    end
 
-      lookup_locations = ["#{name}.config.scss", "app/assets/stylesheets/#{name}.config.scss"]
-      locations = lookup_locations.select { |location| File.exist?(File.expand_path(location, Dir.pwd)) }
+    attr_accessor :type, :style, :file_path, :config_file, :checksum
 
-      if config_path && File.exist?(config_path)
-        # check if custom config was passed in
-        config_file = File.read(config_path)
-      elsif locations.any?
-        config_file = File.read(File.expand_path(locations.first, Dir.pwd))
-      end
+    def initialize(type, style)
+      self.type = type
+      self.style = style
+      self.file_path = "#{SASS_DIR}/#{type}"
+      self.config_file = load_config
+      self.checksum = checksum_files
+    end
 
-      check = checksum(config_file&.gsub("//= @import #{name};", "@import '#{path}';"))
-      cache_path = "#{CACHE_DIR}/#{check}/#{name}.css"
-      if cached?(cache_path)
-        File.read(cache_path)
-      else
-        file = config_file.nil? ? File.read("#{path}.scss") : config_file
-        SassC::Engine.new(file, style: style).render.tap do |css|
-          Dir.mkdir(CACHE_DIR) unless File.directory?(CACHE_DIR)
-          Dir.mkdir("#{CACHE_DIR}/#{check}") unless File.directory?("#{CACHE_DIR}/#{check}")
-          File.write(cache_path, css)
-          puts "New css file cached for #{name}"
-        end
+    def cache_dir
+      BootstrapEmail.config.sass_cache_location
+    end
+
+    def compile
+      cache_path = "#{cache_dir}/#{checksum}/#{type}.css"
+      unless cached?(cache_path)
+        compile_and_cache_scss(cache_path)
       end
+      File.read(cache_path)
     end
 
-    def self.checksum(config_file)
+    private
+
+    def load_config
+      path = BootstrapEmail.config.sass_location_for(type: type)
+      replace_config(File.read(path)) if path
+    end
+
+    def replace_config(config_file)
+      config_file.gsub("//= @import #{type};", "@import '#{file_path}';")
+    end
+
+    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
@@ -40,8 +47,18 @@ module BootstrapEmail
       Digest::SHA1.hexdigest(checksums.join)
     end
 
-    def self.cached?(cache_path)
+    def cached?(cache_path)
       File.file?(cache_path)
     end
+
+    def compile_and_cache_scss(cache_path)
+      file = config_file || File.read("#{file_path}.scss")
+      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
+    end
   end
 end

data/lib/bootstrap-email/setup.rb

@@ -0,0 +1,27 @@
+module BootstrapEmail
+  class << self
+    def config
+      @config ||= BootstrapEmail::Config.new
+      @config
+    end
+
+    def load_options(options)
+      @config ||= BootstrapEmail::Config.new
+      @config.load_options(options)
+      @config
+    end
+
+    def configure(&proc)
+      @config ||= BootstrapEmail::Config.new
+      yield @config
+    end
+
+    def reset_config!
+      remove_instance_variable :@config if defined?(@config)
+    end
+
+    def clear_sass_cache!
+      FileUtils.rm_rf(BootstrapEmail.config.sass_cache_location)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1.2
+  version: 1.0.0.alpha4
 platform: ruby
 authors:
 - Stuart Yamartino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.0'
 description:
 email: stu@stuyam.com
 executables:
@@ -80,6 +80,7 @@ files:
 - core/scss/components/_hr.scss
 - core/scss/components/_image.scss
 - core/scss/components/_preview.scss
+- core/scss/components/_stack.scss
 - core/scss/components/_table.scss
 - core/scss/utilities/_background.scss
 - core/scss/utilities/_border-radius.scss
@@ -90,38 +91,49 @@ files:
 - core/scss/utilities/_spacing.scss
 - core/scss/utilities/_text-decoration.scss
 - core/scss/utilities/_typography.scss
-- core/templates/body.html.erb
-- core/templates/col.html.erb
-- core/templates/container.html.erb
-- core/templates/div.html.erb
-- core/templates/row.html.erb
-- core/templates/table-left.html.erb
-- core/templates/table.html.erb
+- core/scss/utilities/_valign.scss
+- core/templates/body.html
+- core/templates/container.html
+- core/templates/div.html
+- core/templates/table-left.html
+- core/templates/table-to-tbody.html
+- core/templates/table-to-tr.html
+- core/templates/table.html
+- core/templates/td.html
+- core/templates/tr.html
+- lib/bootstrap-email.rb
 - lib/bootstrap-email/bootstrap_email_cli.rb
 - lib/bootstrap-email/compiler.rb
-- lib/bootstrap-email/components/alert.rb
-- lib/bootstrap-email/components/align.rb
-- lib/bootstrap-email/components/badge.rb
-- lib/bootstrap-email/components/base.rb
-- lib/bootstrap-email/components/body.rb
-- lib/bootstrap-email/components/button.rb
-- lib/bootstrap-email/components/card.rb
-- lib/bootstrap-email/components/color.rb
-- lib/bootstrap-email/components/container.rb
-- lib/bootstrap-email/components/grid.rb
-- lib/bootstrap-email/components/hr.rb
-- lib/bootstrap-email/components/margin.rb
-- lib/bootstrap-email/components/padding.rb
-- lib/bootstrap-email/components/paragraph.rb
-- lib/bootstrap-email/components/spacer.rb
-- lib/bootstrap-email/components/spacing.rb
-- lib/bootstrap-email/components/table.rb
-- lib/bootstrap-email/initialize.rb
+- lib/bootstrap-email/config.rb
+- lib/bootstrap-email/converters/alert.rb
+- lib/bootstrap-email/converters/align.rb
+- lib/bootstrap-email/converters/badge.rb
+- lib/bootstrap-email/converters/base.rb
+- lib/bootstrap-email/converters/block.rb
+- lib/bootstrap-email/converters/body.rb
+- lib/bootstrap-email/converters/button.rb
+- lib/bootstrap-email/converters/card.rb
+- lib/bootstrap-email/converters/color.rb
+- lib/bootstrap-email/converters/container.rb
+- lib/bootstrap-email/converters/force_encoding.rb
+- lib/bootstrap-email/converters/grid.rb
+- lib/bootstrap-email/converters/head_style.rb
+- lib/bootstrap-email/converters/hr.rb
+- lib/bootstrap-email/converters/margin.rb
+- lib/bootstrap-email/converters/padding.rb
+- lib/bootstrap-email/converters/paragraph.rb
+- lib/bootstrap-email/converters/preview_text.rb
+- lib/bootstrap-email/converters/spacer.rb
+- lib/bootstrap-email/converters/spacing.rb
+- lib/bootstrap-email/converters/stack.rb
+- lib/bootstrap-email/converters/table.rb
+- lib/bootstrap-email/converters/version_comment.rb
+- lib/bootstrap-email/erb.rb
 - lib/bootstrap-email/rails/action_mailer.rb
 - lib/bootstrap-email/rails/engine.rb
 - lib/bootstrap-email/sass_cache.rb
+- lib/bootstrap-email/setup.rb
 - lib/bootstrap-email/version.rb
-- lib/bootstrap_email.rb
 homepage: https://bootstrapemail.com
 licenses:
 - MIT