bootstrap-email 1.0.0.alpha2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 754525440d7ea29f8ca2fbd07a4c54af48abf49bb3a08e6be127c4b287cbb94b
-  data.tar.gz: e6164558bc455056434601be51978b0cae979bb4581238a4325c53da493cbb4b
+  metadata.gz: f0363b6b03e3d4fbca8e0e52c55c2a3120671c720807fb970f96c2a711bedc60
+  data.tar.gz: 8462e35921bcfe274abed980d895e1ca57fc06f30d91e8c70ff15f9355175ef5
 SHA512:
-  metadata.gz: 436b384bb50dc14c83b4d2903af0c5caeeecc3ef99e618383fb7aa05bac1ca43e0bde09619c229806ae7926adc762296ae7c70f3dfa7c7c10a79c2702a2d40e4
-  data.tar.gz: bb4e1834510e3a833a518a559d460972637012f6e3b1771fc46238af972b8df0fcd2a1ebfbd2c5d76eedb8eaa532600e4fc9746856de670ddab4645977da8d95
+  metadata.gz: 50e8c9a0967f48e016b24cb8f46f92e5ff4fb3b8682b23131bea81cd73d6aec5334c6098c77ce2ecf1a811acc0f459c8feae122bfb997815fc955c2a29a4525d
+  data.tar.gz: 68650d469df9644d5c1c9f2ad990ee33697f297382c9f81111f5553d01a14c7071de409a82ab5353178a961397d9e496dd30aaf42b5d99b1c9e2bcb86450bbcb

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha2.1
+1.0.0

data/core/bootstrap-head.scss

@@ -8,6 +8,11 @@
 @import 'scss/selectors_for_utils';
 @import 'scss/helper_groups';
 
+// Force base font in Outlook
+body, table, td {
+  font-family: $font-family-base !important;
+}
+
 // Forces Outlook.com to display emails at full width
 .ExternalClass {
   width: 100%;
@@ -66,18 +71,57 @@ table:not([class^=s-]) {
 /*! allow_purge_after */
 
 @media screen and (max-width: 600px) {
+  // Row Gap
+  @each $space, $value in $spacers {
+    .gap-#{$space}.row,
+    .gap-x-#{$space}.row {
+      margin-right: -1 * $value !important;
+      & > table > tbody > tr > td {
+        padding-right: $value !important;
+      }
+    }
+    .gap-#{$space}.row,
+    .gap-y-#{$space}.row {
+      margin-bottom: -1 * $value !important;
+      & > table > tbody > tr > td {
+        padding-bottom: $value !important;
+      }
+    }
+  }
+
+  // Stack Gap
+  @each $space, $value in $spacers {
+    table.gap-lg-#{$space}.stack-x > tbody > tr > td {
+      padding-right: 0 !important;
+    }
+    table.gap-lg-#{$space}.stack-y > tbody > tr > td {
+      padding-bottom: 0 !important;
+    }
+  }
+  @each $space, $value in $spacers {
+    table.gap-#{$space}.stack-x > tbody > tr > td {
+      padding-right: $value !important;
+    }
+    table.gap-#{$space}.stack-y > tbody > tr > td {
+      padding-bottom: $value !important;
+    }
+  }
+
   //  Grid
   @each $key, $value in $grid-cols {
-    table.row > tbody > tr {
-      & > td.col-lg-#{$key},
-      & > td.col-lg {
-        display: block;
-        width: 100% !important;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-      }
+    td.col-lg-#{$key} {
+      display: block;
+      width: 100% !important;
+      padding-left: 0 !important;
+      padding-right: 0 !important;
     }
   }
+  td.col-lg {
+    display: block;
+    width: 100% !important;
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+  }
 
   // Display
   @each $display in $display-type {
@@ -91,26 +135,56 @@ table:not([class^=s-]) {
     }
   }
 
-  // Sizing
+  // Sizing Max Width / Height
+  @each $name, $property in $sizing-types {
+    @include sizing-util('.max-#{$name}-lg-full') {
+      max-#{$property}: unset !important;
+      #{$property}: auto !important;
+    }
+    @each $size, $value in $sizing {
+      @include sizing-util('.max-#{$name}-lg-#{$size}') {
+        max-#{$property}: unset !important;
+        #{$property}: auto !important;
+      }
+    }
+  }
+  @each $name, $property in $sizing-types {
+    @include sizing-util('.max-#{$name}-full') {
+      max-#{$property}: 100% !important;
+      #{$property}: 100% !important;
+    }
+    @each $size, $value in $sizing {
+      @include sizing-util('.max-#{$name}-#{$size}') {
+        max-#{$property}: $value !important;
+        #{$property}: 100% !important;
+      }
+    }
+  }
+
+  // Sizing Width / Height
   @each $name, $property in $sizing-types {
     @include sizing-util('.#{$name}-lg-full') {
-      max-#{$property}: auto !important;
+      #{$property}: auto !important;
+    }
+    @include sizing-util('.#{$name}-lg-auto') {
       #{$property}: auto !important;
     }
     @each $size, $value in $sizing {
       @include sizing-util('.#{$name}-lg-#{$size}') {
-        max-#{$property}: auto !important;
         #{$property}: auto !important;
       }
     }
+  }
+  @each $name, $property in $sizing-types {
     @include sizing-util('.#{$name}-full') {
-      max-#{$property}: 100% !important;
       #{$property}: 100% !important;
     }
+    @include sizing-util('.#{$name}-auto') {
+      #{$property}: auto !important;
+    }
     @each $size, $value in $sizing {
       @include sizing-util('.#{$name}-#{$size}') {
-        max-#{$property}: $value !important;
-        #{$property}: 100% !important;
+        #{$property}: $value !important;
       }
     }
   }
@@ -132,7 +206,6 @@ table:not([class^=s-]) {
     line-height: 0 !important;
     height: 0 !important;
   }
-
   @each $size, $value in $spacers {
     @include spacer-util('.s-#{$size}') {
       font-size: $value !important;

data/core/scss/_utilities.scss

@@ -117,9 +117,9 @@ $border-widths: (
 ) !default;
 
 $border-radiuses: (
+  '': 4px,
   '-none': 0px,
   '-sm': 2px,
-  '': 4px,
   '-md': 6px,
   '-lg': 8px,
   '-xl': 12px,

data/core/scss/components/_grid.scss

@@ -1,13 +1,16 @@
-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;
+.row {
+  margin-right: -24px;
+  & > table {
+    table-layout: fixed;
+    -premailer-width: 100%;
+    width: 100%;
+    & > tbody > tr > td {
+      min-height: 1px;
+      font-weight: normal;
+      padding-right: 24px;
+      vertical-align: top;
+      text-align: left;
+    }
   }
 }
 
@@ -19,19 +22,21 @@ table.row {
 }
 
 @each $space, $value in $spacers {
-  table.row.g-#{$space},
-  table.row.gx-#{$space},
-  table.row.g-lg-#{$space},
-  table.row.gx-lg-#{$space} {
-    & > tbody > tr > td {
+  .row.gap-#{$space},
+  .row.gap-x-#{$space},
+  .row.gap-lg-#{$space},
+  .row.gap-x-lg-#{$space} {
+    margin-right: -1 * $value;
+    & > table > tbody > tr > td {
       padding-right: $value;
     }
   }
-  table.row.g-#{$space},
-  table.row.gy-#{$space},
-  table.row.g-lg-#{$space},
-  table.row.gy-lg-#{$space} {
-    & > tbody > tr > td {
+  .row.gap-#{$space},
+  .row.gap-y-#{$space},
+  .row.gap-lg-#{$space},
+  .row.gap-y-lg-#{$space} {
+    margin-bottom: -1 * $value;
+    & > table > tbody > tr > td {
       padding-bottom: $value;
     }
   }

data/core/scss/components/_stack.scss

@@ -1,16 +1,22 @@
 @each $space, $value in $spacers {
-  table.stack-x.gap-#{$space} > tbody > tr > td {
-    padding-right: $value;
-    &:last-child {
-      padding-right: 0;
+  table.stack-row.gap-#{$space},
+  table.stack-row.gap-lg-#{$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;
+  table.stack-col.gap-#{$space},
+  table.stack-col.gap-lg-#{$space} {
+    & > tbody > tr {
+      & > td {
+        padding-bottom: $value;
+      }
+      &:last-child > td {
+        padding-bottom: 0;
+      }
     }
   }
 }
@@ -21,13 +27,13 @@
 }
 
 @each $align in $vertical-align {
-  table.stack-valign-#{$align} > tbody > tr > td {
+  table.stack-ay-#{$align} > tbody > tr > td {
     vertical-align: $align;
   }
 }
 
 @each $align in $text-align {
-  table.stack-align-#{$align} > tbody > tr > td {
+  table.stack-ax-#{$align} > tbody > tr > td {
     text-align: $align;
   }
 }

data/core/scss/utilities/_sizing.scss

@@ -21,6 +21,10 @@
       -premailer-#{$property}: 100%;
       #{$property}: 100%;
     }
+    @include sizing-util('.#{$name}-#{$prefix}auto') {
+      -premailer-#{$property}: auto;
+      #{$property}: auto;
+    }
     @each $size, $value in $sizing {
       @include sizing-util('.#{$name}-#{$prefix}#{$size}') {
         -premailer-#{$property}: strip-unit($value);

data/core/scss/utilities/_valign.scss

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

data/core/templates/body.html

@@ -0,0 +1,9 @@
+<table class="{{ classes }}" valign="top" role="presentation">
+  <tbody>
+    <tr>
+      <td valign="top">
+        {{ contents }}
+      </td>
+    </tr>
+  </tbody>
+</table>

data/core/templates/{container.html.erb → container.html}

@@ -1,4 +1,4 @@
-<table class="<%= classes %>" role="presentation">
+<table class="{{ classes }}" role="presentation">
   <tbody>
     <tr>
       <td align="center">
@@ -12,7 +12,7 @@
           <tbody>
             <tr>
               <td>
-                <%= contents %>
+                {{ contents }}
               </td>
             </tr>
           </tbody>

data/core/templates/div.html

@@ -0,0 +1,3 @@
+<div class="{{ classes }}">
+  {{ contents }}
+</div>

data/core/templates/table-left.html

@@ -0,0 +1,9 @@
+<table class="{{ classes }}" align="left" role="presentation">
+  <tbody>
+    <tr>
+      <td>
+        {{ contents }}
+      </td>
+    </tr>
+  </tbody>
+</table>

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

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

data/core/templates/table-to-tr.html

@@ -0,0 +1,7 @@
+<table class="{{ classes }}" role="presentation">
+  <tbody>
+    <tr>
+      {{ contents }}
+    </tr>
+  </tbody>
+</table>

data/core/templates/table.html

@@ -0,0 +1,9 @@
+<table class="{{ classes }}" role="presentation">
+  <tbody>
+    <tr>
+      <td>
+        {{ contents }}
+      </td>
+    </tr>
+  </tbody>
+</table>

data/core/templates/td.html

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

data/core/templates/{tr.html.erb → tr.html}

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

data/lib/bootstrap-email/bootstrap_email_cli.rb

@@ -1,6 +1,5 @@
 require_relative '../bootstrap-email'
 require 'optparse'
-require 'fileutils'
 
 input = nil
 options = {
@@ -37,7 +36,7 @@ parser = OptionParser.new do |opts|
     options[:destination] = v
   end
 
-  opts.on('-c', '--config STRING', String, 'Relative path to SCSS config config file to customize Bootstrap Email.') do |v|
+  opts.on('-c', '--config STRING', String, 'Relative path to ruby config file to customize Bootstrap Email.') do |v|
     options[:config] = File.expand_path(v, Dir.pwd)
   end
 
@@ -82,9 +81,9 @@ if input
     end
   when :file
     path = File.expand_path(input, Dir.pwd)
-    puts BootstrapEmail::Compiler.new(path, type: :file, options: {config_path: options[:config]}).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]}).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

@@ -3,6 +3,7 @@ module BootstrapEmail
     attr_accessor :type, :doc, :premailer
 
     def initialize(input, type: :string, options: {})
+      BootstrapEmail.load_options(options)
       self.type = type
       case type
       when :rails
@@ -14,7 +15,8 @@ module BootstrapEmail
         html = File.read(input)
       end
       html = add_layout!(html)
-      build_premailer_doc(html, options)
+      sass_load_paths
+      build_premailer_doc(html)
     end
 
     def perform_full_compile
@@ -36,42 +38,45 @@ module BootstrapEmail
       )
     end
 
-    def build_premailer_doc(html, options)
-      SassC.load_paths << File.expand_path('../../core', __dir__)
-      css_string = BootstrapEmail::SassCache.compile('bootstrap-email', config_path: options[:config_path], style: :expanded)
+    def sass_load_paths
+      SassC.load_paths << BootstrapEmail.config.sass_load_paths
+    end
+
+    def build_premailer_doc(html)
+      css_string = BootstrapEmail::SassCache.compile('bootstrap-email', style: :expanded)
       self.premailer = Premailer.new(
         html,
         with_html_string: true,
         preserve_reset: false,
+        adapter: :nokogiri_fast,
+        output_encoding: 'US-ASCII',
         css_string: css_string
       )
       self.doc = premailer.doc
     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) this might be too much
-      BootstrapEmail::Component::Hr.build(doc)
-      BootstrapEmail::Component::Container.build(doc)
-      BootstrapEmail::Component::Grid.build(doc)
-      BootstrapEmail::Component::Stack.build(doc)
+      BootstrapEmail::Converter::Body.build(doc)
+      BootstrapEmail::Converter::Block.build(doc)
 
-      BootstrapEmail::Component::Spacing.build(doc)
-      BootstrapEmail::Component::Padding.build(doc)
-      BootstrapEmail::Component::Margin.build(doc)
-      BootstrapEmail::Component::Spacer.build(doc)
+      BootstrapEmail::Converter::Button.build(doc)
+      BootstrapEmail::Converter::Badge.build(doc)
+      BootstrapEmail::Converter::Alert.build(doc)
+      BootstrapEmail::Converter::Card.build(doc)
+      BootstrapEmail::Converter::Hr.build(doc)
+      BootstrapEmail::Converter::Container.build(doc)
+      BootstrapEmail::Converter::Grid.build(doc)
+      BootstrapEmail::Converter::Stack.build(doc)
 
-      BootstrapEmail::Component::Table.build(doc)
-      BootstrapEmail::Component::Body.build(doc)
-      BootstrapEmail::Component::Align.build(doc)
-      BootstrapEmail::Component::Color.build(doc)
+      BootstrapEmail::Converter::Color.build(doc)
+      BootstrapEmail::Converter::Spacing.build(doc)
+      BootstrapEmail::Converter::Margin.build(doc)
+      BootstrapEmail::Converter::Spacer.build(doc)
+      BootstrapEmail::Converter::Align.build(doc)
+      BootstrapEmail::Converter::Padding.build(doc)
 
-      BootstrapEmail::Component::PreviewText.build(doc)
+      BootstrapEmail::Converter::PreviewText.build(doc)
+      BootstrapEmail::Converter::Table.build(doc)
     end
 
     def inline_css!
@@ -79,13 +84,13 @@ module BootstrapEmail
     end
 
     def configure_html!
-      BootstrapEmail::Component::ForceEncoding.build(doc)
-      BootstrapEmail::Component::HeadStyle.build(doc)
-      BootstrapEmail::Component::VersionComment.build(doc)
+      BootstrapEmail::Converter::HeadStyle.build(doc)
+      BootstrapEmail::Converter::VersionComment.build(doc)
     end
 
     def finalize_document!
-      html = BootstrapEmail::Component::ForceEncoding.replace(doc.to_html)
+      html = doc.to_html(encoding: 'US-ASCII')
+      html = BootstrapEmail::Converter::ForceEncoding.replace(html)
       case type
       when :rails
         (@mail.html_part || @mail).body = html

data/lib/bootstrap-email/config.rb

@@ -0,0 +1,50 @@
+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
+
+    def load_options(options)
+      file = File.expand_path('bootstrap-email.config.rb', Dir.pwd)
+      if options[:config_path]
+        require_relative options[:config_path]
+      elsif File.exist?(file)
+        require_relative file
+      end
+      options.each { |name, value| instance_variable_set("@#{name}", value) }
+    end
+
+    def sass_location_for(type:)
+      ivar = instance_variable_get("@sass_#{type.sub('bootstrap-', '')}_location")
+      return ivar if ivar
+
+      lookup_locations = ["#{type}.scss", "app/assets/stylesheets/#{type}.scss"]
+      locations = lookup_locations.map { |location| File.expand_path(location, Dir.pwd) }.select { |location| File.exist?(location) }
+      locations.first if locations.any?
+    end
+
+    def sass_load_paths
+      paths_array = [SassCache::SASS_DIR]
+      @sass_load_paths ||= []
+      paths_array.concat(@sass_load_paths)
+    end
+
+    def sass_cache_location
+      @sass_cache_location ||= begin
+        if defined?(::Rails) && ::Rails.root
+          ::Rails.root.join('tmp', 'cache', 'bootstrap-email', '.sass-cache')
+        elsif File.writable?(Dir.pwd)
+          File.join(Dir.pwd, '.sass-cache', 'bootstrap-email')
+        else
+          File.join(Dir.tmpdir, '.sass-cache', 'bootstrap-email')
+        end
+      end
+    end
+
+    def sass_log_enabled?
+      defined?(@sass_log_enabled) ? @sass_log_enabled : true
+    end
+  end
+end

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

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

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

@@ -1,9 +1,9 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Align < Base
       def build
        ['left', 'center', 'right'].each do |type|
-        full_type = "align-#{type}"
+        full_type = "ax-#{type}"
          each_node(".#{full_type}") do |node|
            align_helper(node, full_type, type)
          end
@@ -12,7 +12,7 @@ module BootstrapEmail
 
       def align_helper(node, full_type, type)
         unless table?(node) || td?(node)
-          node['class'] = node['class'].sub(full_type, '')
+          node['class'] = node['class'].sub(full_type, '').strip
           node = node.replace(template('table', classes: full_type, contents: node.to_html))[0]
         end
         node['align'] = type

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

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

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

@@ -1,9 +1,10 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Base
       attr_reader :doc
       def initialize(doc)
         @doc = doc
+        @cached_templates = {}
       end
 
       def self.build(doc)
@@ -13,11 +14,19 @@ module BootstrapEmail
       private
 
       def template(file, locals_hash = {})
-        locals_hash[:classes] = locals_hash[:classes].split.join(' ') if locals_hash[:classes]
-        BootstrapEmail::Erb.template(
-          File.expand_path("../../../core/templates/#{file}.html.erb", __dir__),
-          locals_hash
-        )
+        locals_hash[:classes] = locals_hash[:classes].to_s.split.join(' ')
+        locals_hash[:content] ||= nil
+        if @cached_templates[file]
+          string = @cached_templates[file]
+        else
+          path = File.expand_path("../../../core/templates/#{file}.html", __dir__)
+          string = File.read(path).chop # read and remove trailing newline
+          @cached_templates[file] = string
+        end
+        locals_hash.each do |key, value|
+          string = string.sub("{{ #{key} }}", value.to_s)
+        end
+        string
       end
 
       def each_node(css_lookup, &blk)
@@ -27,7 +36,7 @@ module BootstrapEmail
 
       def add_class(node, class_name)
         node['class'] ||= ''
-        node['class'] += class_name
+        node['class'] += node['class'].length.zero? ? class_name : " #{class_name}"
       end
 
       def margin?(node)

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

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

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

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Body < Base
       def build
         body = doc.at_css('body')

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,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Card < Base
       def build
         each_node('.card') do |node|

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/{components → converters}/grid.rb

@@ -1,9 +1,9 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Grid < Base
       def build
         each_node('.row') do |node|
-          node.replace(template('table-to-tr', classes: node['class'], contents: node.inner_html))
+          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))

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

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class HeadStyle < Base
       def build
         doc.at_css('head').add_child(bootstrap_email_head)

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

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

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/{components → converters}/paragraph.rb

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

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

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class PreviewText < Base
       def build
         preview_node = doc.at_css('preview')

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,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Spacing < Base
       def build
         each_node('*[class*=space-y-]') do |node|

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

@@ -1,13 +1,13 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class Stack < Base
       def build
-        stack_x
-        stack_y
+        stack_row
+        stack_col
       end
 
-      def stack_x
-        each_node('.stack-x') do |node|
+      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)
@@ -16,8 +16,8 @@ module BootstrapEmail
         end
       end
 
-      def stack_y
-        each_node('.stack-y') do |node|
+      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)

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/{components → converters}/version_comment.rb

@@ -1,5 +1,5 @@
 module BootstrapEmail
-  module Component
+  module Converter
     class VersionComment < Base
       def build
         doc.at_css('head').prepend_child(bootstrap_email_comment)

data/lib/bootstrap-email/sass_cache.rb

@@ -1,24 +1,27 @@
 module BootstrapEmail
   class SassCache
-    CACHE_DIR = File.expand_path('../../.sass-cache', __dir__)
     SASS_DIR = File.expand_path('../../core', __dir__)
 
-    def self.compile(type, config_path: nil, style: :compressed)
-      new(type, config_path, style).compile
+    def self.compile(type, style: :compressed)
+      new(type, style).compile
     end
 
     attr_accessor :type, :style, :file_path, :config_file, :checksum
 
-    def initialize(type, config_path, style)
+    def initialize(type, style)
       self.type = type
       self.style = style
       self.file_path = "#{SASS_DIR}/#{type}"
-      self.config_file = load_config(config_path)
+      self.config_file = load_config
       self.checksum = checksum_files
     end
 
+    def cache_dir
+      BootstrapEmail.config.sass_cache_location
+    end
+
     def compile
-      cache_path = "#{CACHE_DIR}/#{checksum}/#{type}.css"
+      cache_path = "#{cache_dir}/#{checksum}/#{type}.css"
       unless cached?(cache_path)
         compile_and_cache_scss(cache_path)
       end
@@ -27,16 +30,9 @@ module BootstrapEmail
 
     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
-        replace_config(File.read(config_path))
-      elsif locations.any?
-        # look for common lookup locations of config
-        replace_config(File.read(File.expand_path(locations.first, Dir.pwd)))
-      end
+    def load_config
+      path = BootstrapEmail.config.sass_location_for(type: type)
+      replace_config(File.read(path)) if path
     end
 
     def replace_config(config_file)
@@ -58,10 +54,11 @@ module BootstrapEmail
     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}")
+      FileUtils.mkdir_p("#{cache_dir}/#{checksum}") unless File.directory?("#{cache_dir}/#{checksum}")
       File.write(cache_path, css)
-      puts "New css file cached for #{type}"
+      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

data/lib/bootstrap-email.rb

@@ -5,6 +5,7 @@ require 'premailer'
 require 'sassc'
 require 'digest/sha1'
 require 'css_parser'
+require 'fileutils'
 
 begin
   require 'rails'
@@ -14,13 +15,14 @@ if defined?(Rails)
   require 'action_mailer'
 end
 
-require_relative 'bootstrap-email/initialize'
+require_relative 'bootstrap-email/config'
+require_relative 'bootstrap-email/setup'
 require_relative 'bootstrap-email/erb'
 require_relative 'bootstrap-email/compiler'
 require_relative 'bootstrap-email/sass_cache'
 require_relative 'bootstrap-email/version'
-require_relative 'bootstrap-email/components/base'
-Dir[File.join(__dir__, 'bootstrap-email/components', '*.rb')].each { |file| require_relative file }
+require_relative 'bootstrap-email/converters/base'
+Dir[File.join(__dir__, 'bootstrap-email/converters', '*.rb')].each { |file| require_relative file }
 
 if defined?(Rails)
   require_relative 'bootstrap-email/rails/action_mailer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Stuart Yamartino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -92,46 +92,47 @@ files:
 - core/scss/utilities/_text-decoration.scss
 - core/scss/utilities/_typography.scss
 - core/scss/utilities/_valign.scss
-- core/templates/body.html.erb
-- core/templates/container.html.erb
-- core/templates/div.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
+- 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/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/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/initialize.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
 homepage: https://bootstrapemail.com
 licenses:
@@ -148,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key:

data/core/templates/body.html.erb

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

data/core/templates/div.html.erb

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

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

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

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

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

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

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

data/core/templates/table.html.erb

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

data/core/templates/td.html.erb

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

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

@@ -1,16 +0,0 @@
-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/padding.rb

@@ -1,16 +0,0 @@
-module BootstrapEmail
-  module Component
-    class Padding < Base
-      def build
-        each_node('*[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]?-\d+)/
-          classes = node['class'].scan(padding_regex).join(' ')
-          node['class'] = node['class'].gsub(padding_regex, '')
-          node.replace(template('table', classes: classes, contents: node.to_html))
-        end
-      end
-    end
-  end
-end

data/lib/bootstrap-email/initialize.rb

@@ -1 +0,0 @@
-Premailer::Adapter.use = :nokogiri_fast