bootstrap-email 0.0.0.alpha.3 → 0.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6626edeccebaeb79cf3379e238248b0008555129
-  data.tar.gz: 7d3a30dc676d0e966edb6d14e53fc5566c28ff21
+  metadata.gz: 808b3a7f074ff5e6618293422bd4fdb6cf9a54f0
+  data.tar.gz: e6d2760ed957397c371550ff1c616b942c3fd12f
 SHA512:
-  metadata.gz: c5f4908da0bacacadd52579445da402dfc77c7b33bf5110275a46f2e9e894ef5ebf206f0e82ed234c1c73e12533a4d90d2f9b707c545b5df83d340348b6519ba
-  data.tar.gz: ae9e907d9bd67181cac294e60f1f45500c6402b589ac70ec1a08fd4526bc0fb48f72f2f31b4c8a71c2b31df8f122d46317c14ab87e710e06f95e3567a9f719f5
+  metadata.gz: e504c6b90af4481d174dcb7dc03a93770c97d24c55a26e7098a07e3c4404e29c587b8161d680a33439e0349a4abfdb5b7095c61a78ed4445e88f878875d00046
+  data.tar.gz: 80f5077166f1bb933237391e42b0153750f88b8a82a9d20f2c7793fe443269ef799cb17874fbb923e12c0b2269fbaae9d9ea6fcd3beb35c123cb521f5c83babd

data/lib/bootstrap-email.rb

@@ -11,7 +11,18 @@ module BootstrapEmail
 
     def initialize mail
       @mail = mail
-      @doc = Nokogiri::HTML(@mail.body.raw_source)
+      self.update_doc(@mail.body.raw_source)
+    end
+
+    def update_doc source
+      @doc = Nokogiri::HTML(source)
+    end
+
+    def perform_full_compile
+      compile_html!
+      inline_css!
+      inject_head!
+      update_mailer!
     end
 
     def compile_html!
@@ -27,19 +38,40 @@ module BootstrapEmail
       margin
       spacer
       table
+      body
     end
 
-    def update_mailer!
+    def inline_css!
       @mail.body = @doc.to_html
+      @mail = Premailer::Rails::Hook.perform(@mail)
+      @mail.header[:skip_premailer] = true
+      self.update_doc(@mail.html_part.body.raw_source)
+    end
+
+    def inject_head!
+      @doc.at_css('head').add_child(bootstrap_email_head)
+    end
+
+    def update_mailer!
+      @mail.html_part.body = @doc.to_html
       @mail
     end
 
     private
 
-    def build_from_template template, locals_hash = {}
+    def bootstrap_email_head
+      html_string = <<-HEREDOC
+        <style type="text/css">
+          #{Sass::Engine.new(File.open(File.expand_path('../core/head.scss', __dir__)).read, {syntax: :scss, style: :compressed, cache: false, read_cache: false}).render}
+        </style>
+      HEREDOC
+      html_string
+    end
+
+    def template file, locals_hash = {}
       namespace = OpenStruct.new(locals_hash)
-      template = File.open(File.expand_path("../core/templates/#{template}.html.erb", __dir__)).read
-      ERB.new(template).result(namespace.instance_eval { binding })
+      template_html = File.open(File.expand_path("../core/templates/#{file}.html.erb", __dir__)).read
+      ERB.new(template_html).result(namespace.instance_eval { binding })
     end
 
     def each_node css_lookup, &blk
@@ -49,67 +81,73 @@ module BootstrapEmail
 
     def button
       each_node('.btn') do |node| # move all classes up and remove all classes from the element
-        node.replace(build_from_template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
+        node.replace(template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
       end
     end
 
     def badge
       each_node('.badge') do |node| # move all classes up and remove all classes from the element
-        node.replace(build_from_template('table-left', {classes: node['class'], contents: node.delete('class') && node.to_html}))
+        node.replace(template('table-left', {classes: node['class'], contents: node.delete('class') && node.to_html}))
       end
     end
 
     def alert
       each_node('.alert') do |node| # move all classes up and remove all classes from the element
-        node.replace(build_from_template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
+        node.replace(template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
       end
     end
 
     def align
-      each_node('.align-left') do |node| # align table and move contents
-        node['class'] = node['class'].sub(/align-left/, '')
-        node.replace(build_from_template('align-left', {contents: node.to_html}))
+      each_node('.float-left') do |node|
+        align_helper(node, /float-left/, 'left')
       end
-      each_node('.align-center') do |node| # align table and move contents
-        node['class'] = node['class'].sub(/align-center/, '')
-        node.replace(build_from_template('align-center', {contents: node.to_html}))
+      each_node('.mx-auto') do |node|
+        align_helper(node, /mx-auto/, 'center')
       end
-      each_node('.align-right') do |node| # align table and move contents
-        node['class'] = node['class'].sub(/align-right/, '')
-        node.replace(build_from_template('align-right', {contents: node.to_html}))
+      each_node('.float-right') do |node|
+        align_helper(node, /float-right/, 'right')
+      end
+    end
+
+    def align_helper node, klass, template
+      if node.name != 'table' # if it is already on a table, set the proprieties on the current table
+        node['class'] = node['class'].sub(klass, '')
+        node.replace(template("align-#{template}", {contents: node.to_html}))
+      else
+        node['align'] = template
       end
     end
 
     def card
       each_node('.card') do |node| # move all classes up and remove all classes from element
-        node.replace(build_from_template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
+        node.replace(template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
       end
       each_node('.card-body') do |node| # move all classes up and remove all classes from element
-        node.replace(build_from_template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
+        node.replace(template('table', {classes: node['class'], contents: node.delete('class') && node.to_html}))
       end
     end
 
     def hr
       each_node('hr') do |node| # drop hr in place of current
-        node.replace(build_from_template('hr', {classes: "hr #{node['class']}"}))
+        node.replace(template('hr', {classes: "hr #{node['class']}"}))
       end
     end
 
     def container
       each_node('.container') do |node|
-        node.replace(build_from_template('container', {classes: node['class'], contents: node.inner_html}))
+        node.replace(template('container', {classes: node['class'], contents: node.inner_html}))
       end
       each_node('.container-fluid') do |node|
-        node.replace(build_from_template('table', {classes: node['class'], contents: node.inner_html}))
+        node.replace(template('table', {classes: node['class'], contents: node.inner_html}))
       end
     end
 
     def grid
       each_node('.row') do |node|
-        node.replace(build_from_template('row', {classes: node['class'], contents: node.inner_html}))
+        node.replace(template('row', {classes: node['class'], contents: node.inner_html}))
       end
       each_node('*[class*=col]') do |node|
-        node.replace(build_from_template('col', {classes: node['class'], contents: node.inner_html}))
+        node.replace(template('col', {classes: node['class'], contents: node.inner_html}))
       end
     end
 
@@ -119,23 +157,23 @@ module BootstrapEmail
           padding_regex = /(p[trblxy]?-\d)/
           classes = node['class'].scan(padding_regex).join(' ')
           node['class'] = node['class'].gsub(padding_regex, '')
-          node.replace(build_from_template('table', {classes: classes, contents: node.to_html}))
+          node.replace(template('table', {classes: classes, contents: node.to_html}))
         end
       end
     end
 
     def margin
       each_node('*[class*=m-], *[class*=mt-], *[class*=mb-]') do |node|
-        top_class = node['class'][/m[t]?-(\d)/]
-        bottom_class = node['class'][/m[b]?-(\d)/]
-        node['class'] = node['class'].gsub(/(m[trblxy]?-\d)/, '')
+        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)/, '')
         html = ''
         if top_class
-          html += build_from_template('div', {classes: "s-#{top_class.gsub(/m[t]?-/, '')}", contents: nil})
+          html += template('div', {classes: "s-#{top_class.gsub(/m[ty]?-/, '')}", contents: nil})
         end
         html += node.to_html
         if bottom_class
-          html += build_from_template('div', {classes: "s-#{bottom_class.gsub(/m[b]?-/, '')}", contents: nil})
+          html += template('div', {classes: "s-#{bottom_class.gsub(/m[by]?-/, '')}", contents: nil})
         end
         node.replace(html)
       end
@@ -143,7 +181,7 @@ module BootstrapEmail
 
     def spacer
       each_node('*[class*=s-]') do |node|
-        node.replace(build_from_template('table', {classes: node['class'] + ' w-100', contents: "&#xA0;"}))
+        node.replace(template('table', {classes: node['class'] + ' w-100', contents: "&#xA0;"}))
       end
     end
 
@@ -156,6 +194,23 @@ module BootstrapEmail
       end
     end
 
+    def body
+      @doc.css('body').each do |node|
+        node.replace( '<body>' + preview_text.to_s + template('table', {classes: "#{node['class']} body", contents: "#{node.inner_html}"}) + '</body>' )
+      end
+    end
+
+    def preview_text
+      preview_node = @doc.at_css('preview')
+      if preview_node.present?
+        # 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)
+        node = template('div', {classes: 'preview', contents: preview_node.content})
+        preview_node.remove
+        return node
+      end
+    end
+
   end
 end
 

data/lib/bootstrap-email/action_mailer.rb

@@ -2,21 +2,9 @@ class ActionMailer::Base
 
   # sit in the middle and compile the html
   def bootstrap_mail *args
-    bootstrap = BootstrapEmail::Compiler.new(mail(*args))
-    bootstrap.compile_html!
-    bootstrap.update_mailer!
+    bootstrap = BootstrapEmail::Compiler.new(mail(*args) { |format| format.html { render layout: 'layouts/bootstrap-mailer.html.erb' } } )
+    bootstrap.perform_full_compile
   end
 
-  # helper to inject style tags into head of the email template
-  module BootstrapEmailHelper
-    def bootstrap_email_head
-      html_string = <<-HEREDOC
-        <style type="text/css" data-premailer="ignore">
-          #{File.open(File.expand_path('../../core/head.css', __dir__)).read}
-        </style>
-      HEREDOC
-      html_string.html_safe
-    end
-  end
-  helper BootstrapEmailHelper
+
 end

data/lib/bootstrap-email/version.rb

@@ -1,5 +1,7 @@
 module BootstrapEmail
   module Rails
-    VERSION = '0.0.0.alpha.3'
+    VERSION = File.read(
+      File.expand_path('../../VERSION', __dir__)
+    ).strip
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 0.0.0.alpha.3
+  version: 0.0.0.alpha.4
 platform: ruby
 authors:
 - Stuart Yamartino