awesomemailer 0.1.4 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/awesomemailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "awesomemailer"
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2013-04-12"
+  s.date = "2013-06-13"
   s.description = "\n      AwesomeMailer embeds your e-mail CSS inline, allowing you to write e-mail templates without worrying too much about stylesheets\n    "
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -17,11 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "CHANGELOG",
-    "Gemfile",
-    "Gemfile.lock",
-    "Guardfile",
     "README.md",
-    "Rakefile",
     "VERSION",
     "awesomemailer.gemspec",
     "lib/awesome_mailer.rb",

data/lib/awesome_mailer/renderer.rb

@@ -12,7 +12,12 @@ module AwesomeMailer
         # Must be intended for digital screens!
         load_stylesheet(stylesheet) if stylesheet['media'] =~ /^(all|handheld|screen)$/
       end
-      apply_css!(document)
+      inline_stylesheets = document.search('style')
+      inline_stylesheets.each do |styles|
+        css_parser.add_block!(styles.inner_html)
+        styles.remove
+      end
+      apply_css!
     end
 
     def to_html
@@ -20,41 +25,51 @@ module AwesomeMailer
     end
 
     private
-    def append_styles_to_body!(document, selector, declarations)
-      declarations = "#{declarations.join('; ')};"
-      document.search(selector).each do |element|
-        element['style'] = [element['style'], declarations].compact.join(';')
+    def apply_styles_to_body!(selector, properties)
+      rewrite_relative_urls(properties) if host
+      search_selector = selector =~ /^body/ ? selector : "body #{selector}"
+      document.search(search_selector).each do |element|
+        element['style'] = [element['style'], properties].flatten.compact.join('; ')
       end
     end
 
-    def append_styles_to_head!(document, selector, declarations, media = nil)
-      selector_and_declarations = "#{selector} { #{declarations.join('; ')}; }"
-      if media != :all
-        selector_and_declarations = "@media #{media} { #{selector_and_declarations} }"
-      end
-      header_stylesheet.inner_html += "#{selector_and_declarations}\n"
+    def apply_styles_to_head!(selector, properties, indent = 0)
+      rewrite_relative_urls(properties) if host
+      header_stylesheet.inner_html += "#{" " * indent}#{selector} { #{properties.join('; ')} }\n"
     end
 
-    def apply_css!(document)
+    def apply_css!
+      css_parser.compact!
+      applied_rules = []
+
+      # Apply @media queries to the document head
       css_parser.rules_by_media_query.each do |media_query, rules|
+        next if media_query == :all
+        header_stylesheet.inner_html += "@media #{media_query} {\n"
         rules.each do |rule|
-          rule.each_selector do |selector, declarations, specificity|
-            # Rewrite relative URLs to match their parent CSS's URL path
-            rewrite_relative_urls(declarations) if host
-            declarations = declarations.split(';').map(&:strip)
-            if media_query != :all || selector =~ /(^@|:|moz)/
-              # Include difficult styles in the head
-              append_styles_to_head!(document, selector, declarations, media_query)
-            else
-              # Strip vendor prefix styles and append them to the header
-              vendor_specific_declarations = declarations.select {|declaration| declaration =~ /^-/ }
-              if vendor_specific_declarations.any?
-                declarations -= vendor_specific_declarations
-                append_styles_to_head!(document, selector, vendor_specific_declarations, media_query)
-              end
-              # Include regular styles inline
-               append_styles_to_body!(document, selector, declarations)
-            end
+          rule.each_selector do |selector, properties, specificity|
+            properties = properties.split(';').map(&:strip)
+            apply_styles_to_head!(selector, properties, 2)
+          end
+        end
+        header_stylesheet.inner_html += "}\n"
+        applied_rules.push(*rules)
+      end
+
+      # Apply all other styles
+      css_parser.each_rule_set do |rule|
+        next if applied_rules.include? rule
+        rule.each_selector do |selector, properties, specificity|
+          properties = properties.split(';').map(&:strip)
+          if selector =~ /(^@|:(active|checked|disabled|enabled|focus|hover|lang|link|target|visited|:)|moz|webkit)/
+            # Special selectors get sent to the <head> tag
+            apply_styles_to_head!(selector, properties)
+          else
+            vendor_specific_properties = properties.select {|property| property =~ /^-/ }
+            # Special properties get sent to the <head> tag
+            apply_styles_to_head!(selector, vendor_specific_properties) unless vendor_specific_properties.empty?
+            # Everything else winds up inline on the body
+            apply_styles_to_body!(selector, properties - vendor_specific_properties)
           end
         end
       end
@@ -69,11 +84,12 @@ module AwesomeMailer
 
     def asset_pipeline_path
       return false unless sprockets?
-      /^#{Regexp.escape(Rails.configuration.assets[:prefix])}\//
+      path = File.join('', Rails.configuration.assets[:prefix], '').gsub('//', '/')
+      /^#{Regexp.escape(path)}/
     end
 
     def css_parser
-      @css_parser ||= CssParser::Parser.new
+      @css_parser ||= CssParser::Parser.new(absolute_paths: true)
     end
 
     def default_host
@@ -109,13 +125,15 @@ module AwesomeMailer
       when asset_pipeline_path
         if asset = read_asset_pipeline_asset(stylesheet_path)
           css_parser.add_block!(asset.to_s)
+        else
+          Rails.logger.error 'AwesomeMailer error. Could not find: ' + stylesheet_path if rails?
         end
       when /^\//
         local_path = rails? && Rails.root.join('public', stylesheet_path.gsub(/^\//, '')).to_s
-        css_parser.load_file!(local_path) if local_path && File.file?(local_path)
+        css_parser.load_file!(local_path, nil, []) if local_path && File.file?(local_path)
       else
         dirname = File.dirname(stylesheet['href'])
-        css_parser.load_uri!(stylesheet['href'], base_uri: dirname)
+        css_parser.load_uri!(stylesheet['href'], base_uri: dirname, media_types: [])
       end
       stylesheet.remove
     end
@@ -125,17 +143,19 @@ module AwesomeMailer
     end
 
     def read_asset_pipeline_asset(path)
-      path = path.gsub(asset_pipeline_path, '')
+      path = path.gsub(asset_pipeline_path, '').gsub(/-[A-Fa-f0-9]{32}/, '')
       Rails.application.assets[path]
     end
 
-    def rewrite_relative_urls(css_declarations)
-      css_declarations.scan(/(url\s*\(?["']+(.[^'"]*)["']\))/i).each do |url_command, item|
-        next if item =~ /^http(s){0,1}:\/\//
-        item_url = host.dup
-        item_url.path = File.join(item_url.path, item)
-        new_url_command = url_command.gsub(item, item_url.to_s)
-        css_declarations[url_command] = new_url_command
+    def rewrite_relative_urls(properties)
+      properties.each do |property|
+        property.scan(/(url\s*\(?["']+(.[^'"]*)["']\))/i).each do |url_command, item|
+          next if item =~ /^http(s){0,1}:\/\//
+          item_url = host.dup
+          item_url.path = File.join(item_url.path, item)
+          new_url_command = url_command.gsub(item, item_url.to_s)
+          property[url_command] = new_url_command
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesomemailer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -84,11 +84,7 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG
-- Gemfile
-- Gemfile.lock
-- Guardfile
 - README.md
-- Rakefile
 - VERSION
 - awesomemailer.gemspec
 - lib/awesome_mailer.rb

data/Gemfile

@@ -1,14 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'actionmailer', '>= 3.2'
-gem 'addressable'
-gem 'css_parser', '>= 1.2.5'
-gem 'nokogiri', '>= 1.5.6'
-
-group :test do
-  gem 'guard-rspec', require: false
-  gem 'jeweler', require: false
-  gem 'pry'
-  gem 'rspec', require: false
-  gem 'simplecov', require: false
-end

data/Gemfile.lock

@@ -1,103 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.3.2)
-    builder (3.0.4)
-    coderay (1.0.9)
-    css_parser (1.2.6)
-      addressable
-      rdoc
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    git (1.2.5)
-    guard (1.4.0)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
-    hike (1.2.1)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    journey (1.0.4)
-    json (1.7.5)
-    listen (0.5.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.19)
-    multi_json (1.3.7)
-    nokogiri (1.5.6)
-    polyglot (0.3.3)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.4)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionmailer (>= 3.2)
-  addressable
-  css_parser (>= 1.2.5)
-  guard-rspec
-  jeweler
-  nokogiri (>= 1.5.6)
-  pry
-  rspec
-  simplecov

data/Guardfile

@@ -1,8 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 2 do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { "spec" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end

data/Rakefile

@@ -1,15 +0,0 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "awesomemailer"
-    gem.summary = "An ActionMailer extension that embeds CSS inline in e-mails"
-    gem.description = %{
-      AwesomeMailer embeds your e-mail CSS inline, allowing you to write e-mail templates without worrying too much about stylesheets
-    }
-    gem.email = "flip@x451.com"
-    gem.homepage = "http://github.com/Plinq/awesome_mailer"
-    gem.authors = ["Flip Sasser"]
-    gem.files.exclude '.rspec', '.rvmrc', 'spec/**/*'
-  end
-rescue LoadError
-end