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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff167ba86e6d966e96d13e01988af9c06a734b2f7bef9fd9c67dac20ba97d72
-  data.tar.gz: 3a9c52a5b39f2c6a18c0b4e646eedf24c3051eef56a168d3c8fb18ece7daa92a
+  metadata.gz: 759e1882e8d2e275343ff2d3b6c92a358f350f35319c14208c26b7641ef989de
+  data.tar.gz: 6fb098dd28e51f2c962aa0c774b4948e1ad0499282d66927755a18539c1aa00e
 SHA512:
-  metadata.gz: 8ce16ed9d76b94341b7ee39ac4633133d4dc70fa9d2a4952cdef848c61601006bee71452aff8fa9959e303c7970d3e96072459e1d7708bd6d259be2eb36aa6fa
-  data.tar.gz: 03b4b339a9c43b802b93e8d71dd8c5465ba0e085fc9a28063e09c75ed127adefa02b8f6f1e56b06b455c776cea23f74566e09706fac5333ba440defb5067cc94
+  metadata.gz: d5f19d06827848b6a1cdc3f47ed99e66f46d0465748ac7c46d49654f7815e274c3462028442518b0cf6bd6cfb58e21becbc85204eab5abd45445e1dfe962594b
+  data.tar.gz: 4b9716bca2ccc400c22b30e12a6c9b7a03be72d9e595c854d99e92ffdf8d78d4b3dd8061fe914a9e60e3d3868df0e23d7383196a10f75d24514b73ed6ccaef95

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha1.2
+1.0.0.alpha2

data/core/bootstrap-email.scss

@@ -16,6 +16,7 @@
 @import 'scss/components/image';
 @import 'scss/components/preview';
 @import 'scss/components/table';
+@import 'scss/components/stack';
 
 @import 'scss/utilities/background';
 @import 'scss/utilities/border';
@@ -26,3 +27,4 @@
 @import 'scss/utilities/spacing';
 @import 'scss/utilities/text-decoration';
 @import 'scss/utilities/typography';
+@import 'scss/utilities/valign';

data/core/bootstrap-head.scss

@@ -28,7 +28,7 @@ a {
   text-decoration: none;
 }
 
-// Inhere text color so color can be set on the body and inherited by children
+// Inherit text color so color can be set on the body and inherited by children
 * {
   color: inherit;
 }

data/core/scss/_selectors_for_utils.scss

@@ -98,3 +98,27 @@
     }
   }
 }
+
+//
+// Text align
+//
+@mixin text-align-util($class) {
+  #{$class} {
+    &,
+    & > tbody > tr > td {
+      @content
+    }
+  }
+}
+
+//
+// Vertical align
+//
+@mixin valign-util($class) {
+  #{$class} {
+    &,
+    & > tbody > tr > td {
+      @content
+    }
+  }
+}

data/core/scss/_utilities.scss

@@ -117,9 +117,29 @@ $border-widths: (
 ) !default;
 
 $border-radiuses: (
-  '-sm': 3px,
-  '': 6px,
-  '-lg': 9px,
+  '-none': 0px,
+  '-sm': 2px,
+  '': 4px,
+  '-md': 6px,
+  '-lg': 8px,
   '-xl': 12px,
-  '-0': 0px
+  '-2xl': 16px,
+  '-3xl': 24px,
+  '-full': 9999px
+) !default;
+
+$vertical-align: (
+  top,
+  middle,
+  bottom,
+  baseline,
+  text-top,
+  text-bottom
+) !default;
+
+$text-align: (
+  left,
+  right,
+  center,
+  justify
 ) !default;

data/core/scss/components/_grid.scss

@@ -1,10 +1,13 @@
 table.row {
   table-layout: fixed;
+  -premailer-width: 100%;
   width: 100%;
   & > tbody > tr > td {
     min-height: 1px;
     font-weight: normal;
     padding-right: 30px;
+    vertical-align: top;
+    text-align: left;
   }
 }
 

data/core/scss/components/_stack.scss

@@ -0,0 +1,33 @@
+@each $space, $value in $spacers {
+  table.stack-x.gap-#{$space} > tbody > tr > td {
+    padding-right: $value;
+    &:last-child {
+      padding-right: 0;
+    }
+  }
+  table.stack-y.gap-#{$space} > tbody > tr {
+    & > td {
+      padding-bottom: $value;
+    }
+    &:last-child > td {
+      padding-bottom: 0;
+    }
+  }
+}
+
+.stack-cell {
+  vertical-align: top;
+  text-align: left;
+}
+
+@each $align in $vertical-align {
+  table.stack-valign-#{$align} > tbody > tr > td {
+    vertical-align: $align;
+  }
+}
+
+@each $align in $text-align {
+  table.stack-align-#{$align} > tbody > tr > td {
+    text-align: $align;
+  }
+}

data/core/scss/utilities/_sizing.scss

@@ -1,12 +1,12 @@
 @each $prefix in $breakpoints {
   @each $name, $property in $sizing-types {
-    @include sizing-util('.#{$name}-#{$prefix}full') {
+    @include sizing-util('.max-#{$name}-#{$prefix}full') {
       max-#{$property}: 100%;
       -premailer-#{$property}: 100%;
       #{$property}: 100%;
     }
     @each $size, $value in $sizing {
-      @include sizing-util('.#{$name}-#{$prefix}#{$size}') {
+      @include sizing-util('.max-#{$name}-#{$prefix}#{$size}') {
         max-#{$property}: $value;
         -premailer-#{$property}: strip-unit($value);
         #{$property}: 100%;
@@ -14,3 +14,18 @@
     }
   }
 }
+
+@each $prefix in $breakpoints {
+  @each $name, $property in $sizing-types {
+    @include sizing-util('.#{$name}-#{$prefix}full') {
+      -premailer-#{$property}: 100%;
+      #{$property}: 100%;
+    }
+    @each $size, $value in $sizing {
+      @include sizing-util('.#{$name}-#{$prefix}#{$size}') {
+        -premailer-#{$property}: strip-unit($value);
+        #{$property}: $value;
+      }
+    }
+  }
+}

data/core/scss/utilities/_typography.scss

@@ -36,16 +36,10 @@ h1, h2, h3, h4, h5, h6,
   }
 }
 
-.text-left {
-  text-align: left !important;
-}
-
-.text-right {
-  text-align: right !important;
-}
-
-.text-center {
-  text-align: center !important;
+@each $align in $text-align {
+  @include text-align-util('.text-#{$align}') {
+    text-align: $align !important;
+  }
 }
 
 p {

data/core/scss/utilities/_valign.scss

@@ -0,0 +1,5 @@
+@each $align in $vertical-align {
+  @include valign-util('.valign-#{$align}') {
+    vertical-align: $align !important;
+  }
+}

data/core/templates/body.html.erb

@@ -1,4 +1,4 @@
-<table valign="top" class="<%= classes %>">
+<table class="<%= classes %>" valign="top" role="presentation">
   <tbody>
     <tr>
       <td valign="top">

data/core/templates/container.html.erb

@@ -1,14 +1,14 @@
-<table class="<%= classes %>">
+<table class="<%= classes %>" role="presentation">
   <tbody>
     <tr>
       <td align="center">
         <!--[if (gte mso 9)|(IE)]>
-          <table align="center">
+          <table align="center" role="presentation">
             <tbody>
               <tr>
                 <td width="600">
         <![endif]-->
-        <table align="center">
+        <table align="center" role="presentation">
           <tbody>
             <tr>
               <td>

data/core/templates/table-left.html.erb

@@ -1,4 +1,4 @@
-<table class="<%= classes %>" align="left">
+<table class="<%= classes %>" align="left" role="presentation">
   <tbody>
     <tr>
       <td>

data/core/templates/table-to-tbody.html.erb

@@ -0,0 +1,5 @@
+<table class="<%= classes %>" role="presentation">
+  <tbody>
+    <%= contents %>
+  </tbody>
+</table>

data/core/templates/{row.html.erb → table-to-tr.html.erb}

@@ -1,4 +1,4 @@
-<table class="<%= classes %>">
+<table class="<%= classes %>" role="presentation">
   <tbody>
     <tr>
       <%= contents %>

data/core/templates/table.html.erb

@@ -1,4 +1,4 @@
-<table class="<%= classes %>">
+<table class="<%= classes %>" role="presentation">
   <tbody>
     <tr>
       <td>

data/core/templates/td.html.erb

@@ -0,0 +1,3 @@
+<td class="<%= classes %>">
+  <%= contents %>
+</td>

data/core/templates/tr.html.erb

@@ -0,0 +1,5 @@
+<tr>
+  <td>
+    <%= contents %>
+  </td>
+</tr>

data/lib/{bootstrap_email.rb → bootstrap-email.rb}

@@ -15,6 +15,7 @@ if defined?(Rails)
 end
 
 require_relative 'bootstrap-email/initialize'
+require_relative 'bootstrap-email/erb'
 require_relative 'bootstrap-email/compiler'
 require_relative 'bootstrap-email/sass_cache'
 require_relative 'bootstrap-email/version'

data/lib/bootstrap-email/bootstrap_email_cli.rb

@@ -1,10 +1,10 @@
-require_relative '../bootstrap_email'
+require_relative '../bootstrap-email'
 require 'optparse'
 require 'fileutils'
 
 input = nil
 options = {
-  destination: 'output',
+  destination: 'compiled',
   type: :file
 }
 
@@ -17,7 +17,7 @@ parser = OptionParser.new do |opts|
   opts.separator '  bootstrap-email email.html > out.html'
   opts.separator '  bootstrap-email ./public/index.html'
   opts.separator '  bootstrap-email -s \'<a href="#" class="btn btn-primary">Some Button</a>\''
-  opts.separator '  bootstrap-email -p \'emails/*\' -d emails/output'
+  opts.separator '  bootstrap-email -p \'emails/*\' -d emails/compiled'
   opts.separator '  bootstrap-email -p \'views/emails/*\' -d \'views/compiled_emails\''
   opts.separator '  cat input.html | bootstrap-email'
   opts.separator ''

data/lib/bootstrap-email/compiler.rb

@@ -13,21 +13,30 @@ module BootstrapEmail
       when :file
         html = File.read(input)
       end
+      html = add_layout!(html)
       build_premailer_doc(html, options)
     end
 
     def perform_full_compile
       compile_html!
       inline_css!
-      inject_head!
-      inject_comment!
+      configure_html!
       finalize_document!
     end
 
     private
 
+    def add_layout!(html)
+      document = Nokogiri::HTML(html)
+      return html unless document.at_css('head').nil?
+
+      BootstrapEmail::Erb.template(
+        File.expand_path('../../core/layout.html.erb', __dir__),
+        contents: html
+      )
+    end
+
     def build_premailer_doc(html, options)
-      html = add_layout!(html)
       SassC.load_paths << File.expand_path('../../core', __dir__)
       css_string = BootstrapEmail::SassCache.compile('bootstrap-email', config_path: options[:config_path], style: :expanded)
       self.premailer = Premailer.new(
@@ -39,80 +48,51 @@ module BootstrapEmail
       self.doc = premailer.doc
     end
 
-    def add_layout!(html)
-      document = Nokogiri::HTML(html)
-      return document.to_html unless document.at_css('head').nil?
-
-      namespace = OpenStruct.new(contents: ERB.new(document.to_html).result)
-      template_html = File.read(File.expand_path('../../core/layout.html.erb', __dir__))
-      ERB.new(template_html).result(namespace.instance_eval { binding })
-    end
-
     def compile_html!
+      BootstrapEmail::Component::Block.build(doc)
+
       BootstrapEmail::Component::Button.build(doc)
       BootstrapEmail::Component::Badge.build(doc)
       BootstrapEmail::Component::Alert.build(doc)
       BootstrapEmail::Component::Card.build(doc)
-      BootstrapEmail::Component::Paragraph.build(doc)
+      # BootstrapEmail::Component::Paragraph.build(doc) this might be too much
       BootstrapEmail::Component::Hr.build(doc)
       BootstrapEmail::Component::Container.build(doc)
       BootstrapEmail::Component::Grid.build(doc)
-      BootstrapEmail::Component::Align.build(doc)
-      BootstrapEmail::Component::Color.build(doc)
+      BootstrapEmail::Component::Stack.build(doc)
+
+      BootstrapEmail::Component::Spacing.build(doc)
       BootstrapEmail::Component::Padding.build(doc)
       BootstrapEmail::Component::Margin.build(doc)
-      BootstrapEmail::Component::Spacing.build(doc)
       BootstrapEmail::Component::Spacer.build(doc)
+
       BootstrapEmail::Component::Table.build(doc)
       BootstrapEmail::Component::Body.build(doc)
+      BootstrapEmail::Component::Align.build(doc)
+      BootstrapEmail::Component::Color.build(doc)
+
+      BootstrapEmail::Component::PreviewText.build(doc)
     end
 
     def inline_css!
       premailer.to_inline_css
     end
 
-    def inject_head!
-      doc.at_css('head').add_child(bootstrap_email_head)
-    end
-
-    def inject_comment!
-      doc.at_css('head').prepend_child(bootstrap_email_comment)
+    def configure_html!
+      BootstrapEmail::Component::ForceEncoding.build(doc)
+      BootstrapEmail::Component::HeadStyle.build(doc)
+      BootstrapEmail::Component::VersionComment.build(doc)
     end
 
     def finalize_document!
+      html = BootstrapEmail::Component::ForceEncoding.replace(doc.to_html)
       case type
       when :rails
-        (@mail.html_part || @mail).body = doc.to_html
+        (@mail.html_part || @mail).body = html
         @mail
       when :string, :file
-        doc.to_html
-      end
-    end
-
-    def bootstrap_email_head
-      html_string = <<-INLINE
-        <style type="text/css">
-          #{purged_css_from_head}
-        </style>
-      INLINE
-      html_string
-    end
-
-    def bootstrap_email_comment
-      "\n    <!-- Compiled with Bootstrap Email version: #{BootstrapEmail::VERSION} -->"
-    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
+        html
       end
-      (default + custom).gsub(/\n\s*\n+/, "\n")
     end
   end
 end

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

@@ -3,16 +3,17 @@ module BootstrapEmail
     class Align < Base
       def build
        ['left', 'center', 'right'].each do |type|
-         each_node(".align-#{type}") do |node|
-           align_helper(node, type)
+        full_type = "align-#{type}"
+         each_node(".#{full_type}") do |node|
+           align_helper(node, full_type, type)
          end
        end
       end
 
-      def align_helper(node, type)
-        if node.name != 'table'
-          node['class'] = node['class'].sub("align-#{type}", '')
-          node = node.replace(template('table', classes: "align-#{type}", contents: node.to_html))[0]
+      def align_helper(node, full_type, type)
+        unless table?(node) || td?(node)
+          node['class'] = node['class'].sub(full_type, '')
+          node = node.replace(template('table', classes: full_type, contents: node.to_html))[0]
         end
         node['align'] = type
       end

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

@@ -10,17 +10,45 @@ module BootstrapEmail
         new(doc).build
       end
 
+      private
+
       def template(file, locals_hash = {})
         locals_hash[:classes] = locals_hash[:classes].split.join(' ') if locals_hash[:classes]
-        namespace = OpenStruct.new(locals_hash)
-        template_html = File.read(File.expand_path("../../../core/templates/#{file}.html.erb", __dir__))
-        ERB.new(template_html).result(namespace.instance_eval { binding })
+        BootstrapEmail::Erb.template(
+          File.expand_path("../../../core/templates/#{file}.html.erb", __dir__),
+          locals_hash
+        )
       end
 
       def each_node(css_lookup, &blk)
         # sort by youngest child and traverse backwards up the tree
         doc.css(css_lookup).sort_by { |n| n.ancestors.size }.reverse!.each(&blk)
       end
+
+      def add_class(node, class_name)
+        node['class'] ||= ''
+        node['class'] += class_name
+      end
+
+      def margin?(node)
+        margin_top?(node) || margin_bottom?(node)
+      end
+
+      def margin_top?(node)
+        node['class'].to_s.match?(/m[ty]{1}-(lg-)?\d+/)
+      end
+
+      def margin_bottom?(node)
+        node['class'].to_s.match?(/m[by]{1}-(lg-)?\d+/)
+      end
+
+      def table?(node)
+        node.name == 'table'
+      end
+
+      def td?(node)
+        node.name == 'td'
+      end
     end
   end
 end

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

@@ -0,0 +1,13 @@
+module BootstrapEmail
+  module Component
+    class Block < Base
+      def build
+        each_node('block, .to-table') do |node|
+          # add .to-table if it's not already there
+          class_name = node['class'].to_s.split << 'to-table'
+          node.replace(template('table', classes: class_name.uniq.join(' '), contents: node.inner_html))
+        end
+      end
+    end
+  end
+end

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

@@ -2,20 +2,8 @@ module BootstrapEmail
   module Component
     class Body < Base
       def build
-        each_node('body') do |node|
-          node.replace('<body>' + preview_text.to_s + template('body', classes: "#{node['class']} body", contents: node.inner_html) + '</body>')
-        end
-      end
-
-      def preview_text
-        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.content += '&nbsp;' * [(100 - preview_node.content.length.to_i), 0].max
-        node = template('div', classes: 'preview', contents: preview_node.content)
-        preview_node.remove
-        node
+        body = doc.at_css('body')
+        body.inner_html = template('body', classes: "#{body['class']} body", contents: body.inner_html)
       end
     end
   end

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

@@ -3,10 +3,10 @@ module BootstrapEmail
     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/force_encoding.rb

@@ -0,0 +1,16 @@
+module BootstrapEmail
+  module Component
+    class ForceEncoding < Base
+      def build
+        body = doc.at_css('body')
+        body.add_child('<force-encoding></force-encoding>')
+      end
+
+      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 string so it doesn't get converted
+        html.sub('<force-encoding></force-encoding>', '<div id="force-encoding-to-utf-8" style="display: none;">&#10175;</div>')
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,33 @@
+module BootstrapEmail
+  module Component
+    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/hr.rb

@@ -3,7 +3,7 @@ module BootstrapEmail
     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/paragraph.rb

@@ -3,22 +3,11 @@ module BootstrapEmail
     class Paragraph < Base
       def build
         each_node('p') do |node|
-          next if margin?(node) || space_y?(node)
+          next if margin?(node)
 
-          node['class'] ||= ''
-          node['class'] += 'mb-4'
+          add_class(node, 'mb-4')
         end
       end
-
-      private
-
-      def margin?(node)
-        node['class'].to_s.match?(/m[tby]{1}-(lg-)?\d+/)
-      end
-
-      def space_y?(node)
-        node.parent['class'].to_s.match?(/space-y-(lg-)?\d+/)
-      end
     end
   end
 end

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

@@ -0,0 +1,18 @@
+module BootstrapEmail
+  module Component
+    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/spacing.rb

@@ -5,11 +5,10 @@ module BootstrapEmail
         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/components/stack.rb

@@ -0,0 +1,30 @@
+module BootstrapEmail
+  module Component
+    class Stack < Base
+      def build
+        stack_x
+        stack_y
+      end
+
+      def stack_x
+        each_node('.stack-x') 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_y
+        each_node('.stack-y') 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/version_comment.rb

@@ -0,0 +1,15 @@
+module BootstrapEmail
+  module Component
+    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

@@ -5,6 +5,7 @@ ActiveSupport.on_load(:action_mailer, {yield: true}) do |action_mailer|
       bootstrap = BootstrapEmail::Compiler.new(mail(*args, &block), type: :rails)
       bootstrap.perform_full_compile
     end
+    alias bootstrap_email bootstrap_mail
     alias make_bootstrap_mail bootstrap_mail
   end
 end

data/lib/bootstrap-email/sass_cache.rb

@@ -3,36 +3,47 @@ module BootstrapEmail
     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, config_path: nil, style: :compressed)
+      new(type, config_path, 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
+
+    def initialize(type, config_path, style)
+      self.type = type
+      self.style = style
+      self.file_path = "#{SASS_DIR}/#{type}"
+      self.config_file = load_config(config_path)
+      self.checksum = checksum_files
+    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
 
+    private
+
+    def load_config(config_path)
+      lookup_locations = ["#{type}.config.scss", "app/assets/stylesheets/#{type}.config.scss"]
+      locations = lookup_locations.select { |location| File.exist?(File.expand_path(location, Dir.pwd)) }
       if config_path && File.exist?(config_path)
         # check if custom config was passed in
-        config_file = File.read(config_path)
+        replace_config(File.read(config_path))
       elsif locations.any?
-        config_file = File.read(File.expand_path(locations.first, Dir.pwd))
+        # look for common lookup locations of config
+        replace_config(File.read(File.expand_path(locations.first, Dir.pwd)))
       end
+    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
-      end
+    def replace_config(config_file)
+      config_file.gsub("//= @import #{type};", "@import '#{file_path}';")
     end
 
-    def self.checksum(config_file)
+    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 +51,17 @@ 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
+      Dir.mkdir(CACHE_DIR) unless File.directory?(CACHE_DIR)
+      Dir.mkdir("#{CACHE_DIR}/#{checksum}") unless File.directory?("#{CACHE_DIR}/#{checksum}")
+      File.write(cache_path, css)
+      puts "New css file cached for #{type}"
+    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.alpha2
 platform: ruby
 authors:
 - Stuart Yamartino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-03-13 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,48 @@ files:
 - core/scss/utilities/_spacing.scss
 - core/scss/utilities/_text-decoration.scss
 - core/scss/utilities/_typography.scss
+- core/scss/utilities/_valign.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-to-tbody.html.erb
+- core/templates/table-to-tr.html.erb
 - core/templates/table.html.erb
+- core/templates/td.html.erb
+- core/templates/tr.html.erb
+- 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/block.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/force_encoding.rb
 - lib/bootstrap-email/components/grid.rb
+- lib/bootstrap-email/components/head_style.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/preview_text.rb
 - lib/bootstrap-email/components/spacer.rb
 - lib/bootstrap-email/components/spacing.rb
+- lib/bootstrap-email/components/stack.rb
 - lib/bootstrap-email/components/table.rb
+- lib/bootstrap-email/components/version_comment.rb
+- lib/bootstrap-email/erb.rb
 - lib/bootstrap-email/initialize.rb
 - lib/bootstrap-email/rails/action_mailer.rb
 - lib/bootstrap-email/rails/engine.rb
 - lib/bootstrap-email/sass_cache.rb
 - lib/bootstrap-email/version.rb
-- lib/bootstrap_email.rb
 homepage: https://bootstrapemail.com
 licenses:
 - MIT

data/core/templates/col.html.erb

@@ -1,3 +0,0 @@
-<td class="<%= classes %>" align="left" valign="top">
-  <%= contents %>
-</td>