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

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

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

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

@@ -5,6 +5,7 @@ require 'premailer'
 require 'sassc'
 require 'digest/sha1'
 require 'css_parser'
+require 'fileutils'
 
 begin
   require 'rails'
@@ -14,12 +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'

data/lib/bootstrap-email/bootstrap_email_cli.rb

@@ -1,10 +1,9 @@
-require_relative '../bootstrap_email'
+require_relative '../bootstrap-email'
 require 'optparse'
-require 'fileutils'
 
 input = nil
 options = {
-  destination: 'output',
+  destination: 'compiled',
   type: :file
 }
 
@@ -17,7 +16,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 ''
@@ -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
@@ -13,106 +14,90 @@ module BootstrapEmail
       when :file
         html = File.read(input)
       end
-      build_premailer_doc(html, options)
+      html = add_layout!(html)
+      sass_load_paths
+      build_premailer_doc(html)
     end
 
     def perform_full_compile
       compile_html!
       inline_css!
-      inject_head!
-      inject_comment!
+      configure_html!
       finalize_document!
     end
 
     private
 
-    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)
+    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 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 add_layout!(html)
-      document = Nokogiri::HTML(html)
-      return document.to_html unless document.at_css('head').nil?
+    def compile_html!
+      BootstrapEmail::Converter::Body.build(doc)
+      BootstrapEmail::Converter::Block.build(doc)
 
-      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
+      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)
 
-    def compile_html!
-      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::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::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::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::Converter::PreviewText.build(doc)
+      BootstrapEmail::Converter::Table.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::Converter::HeadStyle.build(doc)
+      BootstrapEmail::Converter::VersionComment.build(doc)
     end
 
     def finalize_document!
+      html = doc.to_html(encoding: 'US-ASCII')
+      html = BootstrapEmail::Converter::ForceEncoding.replace(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/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/converters/align.rb

@@ -0,0 +1,22 @@
+module BootstrapEmail
+  module Converter
+    class Align < Base
+      def build
+       ['left', 'center', 'right'].each do |type|
+        full_type = "ax-#{type}"
+         each_node(".#{full_type}") do |node|
+           align_helper(node, full_type, type)
+         end
+       end
+      end
+
+      def align_helper(node, full_type, type)
+        unless table?(node) || td?(node)
+          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
+      end
+    end
+  end
+end

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/converters/base.rb

@@ -0,0 +1,63 @@
+module BootstrapEmail
+  module Converter
+    class Base
+      attr_reader :doc
+      def initialize(doc)
+        @doc = doc
+        @cached_templates = {}
+      end
+
+      def self.build(doc)
+        new(doc).build
+      end
+
+      private
+
+      def template(file, 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)
+        # 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'] += node['class'].length.zero? ? class_name : " #{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/converters/block.rb

@@ -0,0 +1,13 @@
+module BootstrapEmail
+  module Converter
+    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