channel_research_stationery 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be8fcc51204385c46925f081845b58c219b823c2
-  data.tar.gz: 5db73a74956902fdb88e7c5c703d2e029b323ece
+  metadata.gz: 150977a0f49b4808ab1cdfe96c888dd38e588db0
+  data.tar.gz: 7ec3a658cd2a7886b1387550d89795d7b45a0459
 SHA512:
-  metadata.gz: 3f5f9ddaa172edfa781ed39bbb394fc4aa312860c876259994fb203248ac7752f097e3b09f41db64e002b52b13d7e9bf7dcc036c23667415609ebecb87f58a88
-  data.tar.gz: 902cdec642b2f97fe80e160c7cae6d5880445e58ff6d3ce951314c1837e79ab94d1bb2deab3ccfc46a0074c5d959c0a6df94034a3463a1000001270ffa163e1a
+  metadata.gz: 9f3cb0d100f5fa519a881e7ab195b4308b3675c8a2dfc4756714a0860a82bac7064528ad8f620d574ca9009697817b65ddca72df220cd87403702b1954a0ae53
+  data.tar.gz: 93fadde69def9e9cd2e5ea25558f682777b2acce53b0f3096f9c62aa5c6c8e963544cc466f345e9d5fd2c85d7d442d22f00b05cad6655cbfc8d6ea0593f07a32

data/lib/channel_research_stationery.rb

@@ -19,31 +19,36 @@ class ChannelResearchStationery
   end
 
   def to_html
-    @body_with_inline_css = body_with_inline_css
-    layout_path = File.join( __dir__, "./generators/templates/layout.html.erb" )
-    contents = File.open(layout_path, "rb").read
-    ERB.new(contents).result( binding )
+    template_and_content
   end
 
-  def body_with_inline_css
-    doc_with_placeholder_content.at('body').to_html
-  end
-
-  def doc_with_placeholder_content
-    doc = Nokogiri::HTML(template_with_inline_css)
-    doc.at('div#main_content') << @content
+  def template_and_content
+    template = Nokogiri::HTML(template_with_inline_css)    
+    content =  Nokogiri::HTML(content_with_inline_css)
+    template.at('style').remove
+    template.at('div#content') << content.at('body')
     # Add content-editable bits
-    doc.xpath('//*[@class="contenteditable"]').each do |node|
+    template.xpath('//*[@class="contenteditable"]').each do |node|
       node['contenteditable'] = 'true'
     end
-    return doc
+    return template
   end
 
   def template_with_inline_css
     Premailer.new(template,
       {
         warn_level: Premailer::Warnings::SAFE,
-        css_string: css_string,
+        css_string: template_css_string,
+        with_html_string: true
+      }
+    ).to_inline_css
+  end
+
+  def content_with_inline_css
+    Premailer.new(@content,
+      {
+        warn_level: Premailer::Warnings::SAFE,
+        css_string: content_css_string,
         with_html_string: true
       }
     ).to_inline_css
@@ -61,8 +66,12 @@ class ChannelResearchStationery
     engine.render(Object.new, { options: @options })
   end
 
-  def css_string
-    reset_css + styles_css
+  def template_css_string
+    reset_css + template_styles_css
+  end
+
+  def content_css_string
+    reset_css + content_styles_css + @options[:extra_css]
   end
 
   def reset_css
@@ -71,20 +80,28 @@ class ChannelResearchStationery
   end
 
   def sass_options
-    @options.select {|k,v| [:background_color,:header_background_color,:width].include?(k)}
+    @options.select {|k,v| [:background_color,:header_background_color,:width,:cta_background_color,:cta_color,:bold_color,:link_color].include?(k)}
   end
 
   def sass_variables
     sass_options.map {|k,v| "$#{k}: #{v};"}.join("\n")
   end
 
-  def styles_css
-    css_path = File.join( __dir__, "./generators/templates/styles.sass" )
+  def template_styles_css
+    css_path = File.join( __dir__, "./generators/templates/template_styles.sass" )
+    sass_styles = File.open(css_path, "rb").read
+    sass = sass_variables + "\n" + sass_styles
+    SassC::Engine.new(sass, style: :compressed).render
+  end
+
+  def content_styles_css
+    css_path = File.join( __dir__, "./generators/templates/content_styles.sass" )
     sass_styles = File.open(css_path, "rb").read
     sass = sass_variables + "\n" + sass_styles
     SassC::Engine.new(sass, style: :compressed).render
   end
 
+
   def default_options
     {
       header_background_color: @primary_color,
@@ -97,7 +114,8 @@ class ChannelResearchStationery
       badge_left: false,
       badge_right: false,
       title: false,
-      subtitle: false
+      subtitle: false,
+      extra_css: ''
     }
   end
 end

data/lib/generators/templates/content_styles.sass

@@ -0,0 +1,18 @@
+* {
+  font-size:13px;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", Arial, sans-serif;
+  letter-spacing: -1px;
+  color: #666666;
+  line-height: 19px;
+  -webkit-text-size-adjust: none;
+  -webkit-font-smoothing: antialiased;
+}
+a {color:$link_color;}
+strong, b {color:$bold_color;}
+img {max-width:100%;}
+p.call_to_action a {color: $cta_color; background-color: $cta_background_color;}
+table {width:100%;}
+table tr {vertical-align: top;}
+table td,th {font-size:13px; padding:5px; color:#666666;}
+table th {text-align: center; font-weight:bold;}      
+//<%= @options[:extra_css] %>

data/lib/generators/templates/template.html.haml

@@ -16,7 +16,7 @@
               %h1= options[:title]
             - if options[:subtitle]
               %h2= options[:subtitle]
-            %div#main_content
+            %div#content
         %tr#footer
           %td
             %p TM and copyright ©#{DateTime.now.year} Apple Inc. All rights reserved.

data/lib/generators/templates/{styles.sass → template_styles.sass}

@@ -56,15 +56,6 @@ table.email-body-wrap {
       padding-bottom:36px;
       color: #666666;
     }
-    #main_content {
-      font-size:13px;
-      font-family: "Lucida Grande", "Lucida Sans Unicode", Arial, sans-serif;
-      letter-spacing: -1px;
-      color: #666666;
-      line-height: 19px;
-      -webkit-text-size-adjust: none;
-      -webkit-font-smoothing: antialiased;
-    }
   }
   tr#footer td {
     color: #666666;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: channel_research_stationery
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Channel Research Team
@@ -73,10 +73,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/channel_research_stationery.rb
-- lib/generators/templates/layout.html.erb
+- lib/generators/templates/content_styles.sass
 - lib/generators/templates/reset.css
-- lib/generators/templates/styles.sass
 - lib/generators/templates/template.html.haml
+- lib/generators/templates/template_styles.sass
 homepage: https://www.brandnewbox.com
 licenses:
 - MIT

data/lib/generators/templates/layout.html.erb

@@ -1,13 +0,0 @@
-<html>
-  <head>
-    <title>Channel Research Team</title>
-    <link href='https://wwcci-email-assets.s3.amazonaws.com/bnb/css/myriad-set-pro.css' rel='stylesheet' type='text/css' />
-    <style>
-      #main_content a {color:<%= @options[:link_color] %>;}
-      #main_content strong, #main_content b {color:<%= @options[:bold_color] %>;}
-      #main_content img {max-width:100%;}
-      #main_content p.call_to_action a {color: <%= @options[:cta_color] %>;background-color: <%= @options[:cta_background_color] %>;}
-    </style>
-  </head>
-  <%= @body_with_inline_css %>
-</html>