bootstrap-email 1.0.0.alpha3.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75655e6d12a24abed3f9cf4fee65bc198210d1e9289196b8df80bd53791c21b2
-  data.tar.gz: 365aedf89fa3f0818ecb6808762d75045855e542172d5ad3440cb5c69dbdc748
+  metadata.gz: 3fd77db91c7a64e16baf699225f9187894bd92bd87a8c23584c8435e520e8042
+  data.tar.gz: 00f9c70ad47a3cafbd4c9663e2932e9efa8b1fc8706e3971a8bf27bc80f0ee93
 SHA512:
-  metadata.gz: 80c34ce66af8e2024fa3547a08c1ec4330ddf77c7e25297753edd164b54586f811c19b2722df572f296fa006227b950c0803e7769fc7a523ed4cba0c1bc451d1
-  data.tar.gz: 38b53f2516bbd1f46fea866b06170174d89333f7d8b44a42bb36d7220af717ae97ab0e9967898ded0544584d120b59bde6d22c78023e562c1254460db6c7c9f0
+  metadata.gz: ccc640cbc412e925b1dbf37925ad09b3c6f8e9633dd091fc73e2daa578536401f98938743bb25dbfb21999f5d14e5a63056d23d9fad3f981fc44a25a5b1214d2
+  data.tar.gz: 10e8d04cbc16099c20b1193f52cd17b704bcddda74b15e78dabb0ebcd36ebf059b89dd8cc97021a7a451e89b90f6ae80aaaa1f5d018bc33be86c4b0c65ac25f8

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha3.1
+1.0.2

data/core/bootstrap-head.scss

@@ -88,6 +88,9 @@ table:not([class^=s-]) {
       }
     }
   }
+  .row.row-responsive {
+    margin-right: 0 !important;
+  }
 
   // Stack Gap
   @each $space, $value in $spacers {

data/core/scss/components/_stack.scss

@@ -1,6 +1,6 @@
 @each $space, $value in $spacers {
-  table.stack-x.gap-#{$space},
-  table.stack-x.gap-lg-#{$space} {
+  table.stack-row.gap-#{$space},
+  table.stack-row.gap-lg-#{$space} {
     & > tbody > tr > td {
       padding-right: $value;
       &:last-child {
@@ -8,8 +8,8 @@
       }
     }
   }
-  table.stack-y.gap-#{$space},
-  table.stack-y.gap-lg-#{$space} {
+  table.stack-col.gap-#{$space},
+  table.stack-col.gap-lg-#{$space} {
     & > tbody > tr {
       & > td {
         padding-bottom: $value;
@@ -27,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/_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/lib/bootstrap-email/compiler.rb

@@ -48,6 +48,8 @@ module BootstrapEmail
         html,
         with_html_string: true,
         preserve_reset: false,
+        adapter: :nokogiri_fast,
+        output_encoding: 'US-ASCII',
         css_string: css_string
       )
       self.doc = premailer.doc
@@ -82,13 +84,14 @@ module BootstrapEmail
     end
 
     def configure_html!
-      BootstrapEmail::Converter::ForceEncoding.build(doc)
       BootstrapEmail::Converter::HeadStyle.build(doc)
       BootstrapEmail::Converter::VersionComment.build(doc)
     end
 
     def finalize_document!
-      html = BootstrapEmail::Converter::ForceEncoding.replace(doc.to_html)
+      html = doc.to_html(encoding: 'US-ASCII')
+      BootstrapEmail::Converter::SupportUrlTokens.replace(html)
+      BootstrapEmail::Converter::ForceEncoding.replace(html)
       case type
       when :rails
         (@mail.html_part || @mail).body = html

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

@@ -3,7 +3,7 @@ module BootstrapEmail
     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

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

@@ -36,7 +36,7 @@ module BootstrapEmail
 
       def add_class(node, class_name)
         node['class'] ||= ''
-        node['class'] += node['class'].length.zero? ? class_name : " #{class_name}"
+        node['class'] = "#{node['class'].strip} #{class_name}".strip
       end
 
       def margin?(node)

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

@@ -1,15 +1,13 @@
 module BootstrapEmail
   module Converter
     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>')
+        # 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

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

@@ -3,6 +3,9 @@ module BootstrapEmail
     class Grid < Base
       def build
         each_node('.row') do |node|
+          if node.at("./*[contains(@class, 'col-lg-')]")
+            add_class(node, 'row-responsive')
+          end
           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/stack.rb

@@ -2,12 +2,12 @@ module BootstrapEmail
   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/converters/support_url_tokens.rb

@@ -0,0 +1,17 @@
+module BootstrapEmail
+  module Converter
+    class SupportUrlTokens < Base
+      OPEN_BRACKETS = CGI.escape('{{').freeze
+      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
+        end
+      end
+    end
+  end
+end

data/lib/bootstrap-email.rb

@@ -15,7 +15,6 @@ 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha3.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stuart Yamartino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -126,10 +126,10 @@ files:
 - lib/bootstrap-email/converters/spacer.rb
 - lib/bootstrap-email/converters/spacing.rb
 - lib/bootstrap-email/converters/stack.rb
+- lib/bootstrap-email/converters/support_url_tokens.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
@@ -150,14 +150,14 @@ 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:
 specification_version: 4
-summary: 'Bootstrap 5 stylesheet, compiler, and inliner for responsive and consistent
+summary: 'Bootstrap 5+ stylesheet, compiler, and inliner for responsive and consistent
   emails with the Bootstrap syntax you know and love. Support: command line, ruby,
   rails'
 test_files: []

data/lib/bootstrap-email/initialize.rb

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