awesomemailer 0.0.3 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.1.0
+  * Full test coverage and moved to Nokogiri from Hpricot. Also
+    added autoload so the gem is there when you need it but won't
+    bog down your app startup anymore. Yay!
 0.0.3
   * Added Sprockets-based loading for local files. Now your mailers
     work with local assets written with something other than CSS!

data/Gemfile

@@ -1,9 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'css_parser', '>= 1.2.5'#, :git => 'https://github.com/alexdunae/css_parser.git'
-gem 'hpricot', '>= 0.8'
+gem 'actionmailer', '>= 3.2'
+gem 'addressable'
+gem 'css_parser', '>= 1.2.5'
+gem 'nokogiri', '>= 1.5.6'
 
 group :test do
-  gem 'actionmailer', '>= 3.0'
-  gem 'jeweler'
+  gem 'guard-rspec', require: false
+  gem 'jeweler', require: false
+  gem 'rspec', require: false
+  gem 'simplecov', require: false
 end

data/Gemfile.lock

@@ -1,61 +1,95 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.2)
-      actionpack (= 3.0.2)
-      mail (~> 2.2.9)
-    actionpack (3.0.2)
-      activemodel (= 3.0.2)
-      activesupport (= 3.0.2)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.2)
-      activesupport (= 3.0.2)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.2)
-    addressable (2.2.6)
-    builder (2.1.2)
-    css_parser (1.2.5)
+    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)
+    css_parser (1.2.6)
       addressable
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+      rdoc
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
     git (1.2.5)
-    hpricot (0.8.5)
-    i18n (0.4.2)
-    jeweler (1.6.4)
+    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
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+      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)
-    mime-types (1.17.2)
+    mime-types (1.19)
+    multi_json (1.3.7)
+    nokogiri (1.5.6)
     polyglot (0.3.3)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rake (0.9.2.2)
-    treetop (1.4.10)
+    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)
+    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)
-    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (>= 3.0)
+  actionmailer (>= 3.2)
+  addressable
   css_parser (>= 1.2.5)
-  hpricot (>= 0.8)
+  guard-rspec
   jeweler
+  nokogiri (>= 1.5.6)
+  rspec
+  simplecov

data/Guardfile

@@ -0,0 +1,8 @@
+# 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,14 +1,15 @@
 begin
   require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "awesomemailer"
-    gemspec.summary = "An ActionMailer extension that embeds CSS inline in e-mails"
-    gemspec.description = %{
+  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
     }
-    gemspec.email = "flip@x451.com"
-    gemspec.homepage = "http://github.com/Plinq/awesome_mailer"
-    gemspec.authors = ["Flip Sasser"]
+    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

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/awesomemailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "awesomemailer"
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2012-08-27"
+  s.date = "2013-02-03"
   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 = [
@@ -19,18 +19,15 @@ Gem::Specification.new do |s|
     "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "README.md",
     "Rakefile",
     "VERSION",
     "awesomemailer.gemspec",
     "lib/awesome_mailer.rb",
     "lib/awesome_mailer/base.rb",
-    "lib/awesomemailer.rb",
-    "spec/lib/awesome_mailer_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "spec/support/test_mailer/test_email.html.erb",
-    "spec/support/test_mailer/test_email.text.erb"
+    "lib/awesome_mailer/renderer.rb",
+    "lib/awesomemailer.rb"
   ]
   s.homepage = "http://github.com/Plinq/awesome_mailer"
   s.require_paths = ["lib"]
@@ -41,15 +38,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<actionmailer>, [">= 3.2"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_runtime_dependency(%q<css_parser>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0.8"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.6"])
     else
+      s.add_dependency(%q<actionmailer>, [">= 3.2"])
+      s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<css_parser>, [">= 1.2.5"])
-      s.add_dependency(%q<hpricot>, [">= 0.8"])
+      s.add_dependency(%q<nokogiri>, [">= 1.5.6"])
     end
   else
+    s.add_dependency(%q<actionmailer>, [">= 3.2"])
+    s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<css_parser>, [">= 1.2.5"])
-    s.add_dependency(%q<hpricot>, [">= 0.8"])
+    s.add_dependency(%q<nokogiri>, [">= 1.5.6"])
   end
 end
 

data/lib/awesome_mailer/base.rb

@@ -1,6 +1,6 @@
-require 'rubygems'
+require 'abstract_controller'
 require 'action_mailer'
-require 'hpricot'
+require 'nokogiri'
 require 'css_parser'
 
 module AwesomeMailer
@@ -8,91 +8,11 @@ module AwesomeMailer
     abstract!
     include ActionView::Helpers::AssetTagHelper::StylesheetTagHelpers
     include ActionView::Helpers::AssetTagHelper::JavascriptTagHelpers
+    include AbstractController::UrlFor
 
     def render(*arguments)
-      html_string = super
-      document = Hpricot(html_string)
-      stylesheets = document.search('link[@rel=stylesheet]')
-      stylesheets.each do |stylesheet|
-        if stylesheet['media'] =~ /^(all|handheld|screen)$/ # Must be intended for digital screens!
-          apply_stylesheet!(document, stylesheet)
-        end
-      end
-      stylesheets.remove
-      document.to_html
-    end
-
-    private
-    def append_styles!(document, selector, declarations)
-      unless head = document.at('head')
-        head = Hpricot::Elem.new('head')
-        document.children.unshift(head)
-      end
-      unless style = head.at('style[@type=text/css]')
-        style = Hpricot::Elem.new('style')
-        style['type'] = 'text/css'
-        style.inner_html = "\n"
-        head.children.unshift(style)
-      end
-      style.inner_html += "#{selector} { #{declarations} }\n"
-    end
-
-    def apply_rules!(document, css_parser, url)
-      css_parser.each_selector do |selector, declarations, specificity|
-        if url
-          # Rewrite relative URLs to match their parent CSS's URL path
-          path_url = Addressable::URI.parse(url)
-          path_url.path = File.dirname(path_url.path)
-          declarations.scan(/(url\(?["']+(.[^'"]*)["']\))/i).each do |url_command, item|
-            next if item =~ /^(http(s){0,1}:\/\/|\/)/
-            item_url = path_url.dup
-            item_url.path = File.join(item_url.path, item)
-            new_url_command = url_command.gsub(item, item_url.to_s)
-            declarations[url_command] = new_url_command
-          end
-        end
-        if selector =~ /(^@)/
-          append_styles!(document, selector, declarations.to_s) if url
-        elsif selector !~ /:/
-          document.search(selector).each do |element|
-            element['style'] = [element['style'], *declarations].compact.join(';')
-          end
-        end
-      end
-    end
-
-    def apply_stylesheet!(document, stylesheet)
-      css_parser = CssParser::Parser.new
-      clean_href = stylesheet['href'].split('?').shift
-      if self.class.default_url_options[:host]
-        clean_href.gsub!(/^http:\/\/#{self.class.default_url_options[:host]}/, '')
-      end
-      url = nil
-      case clean_href
-      when /^\/assets/
-        if asset = Rails.application.assets[clean_href.gsub(/^\/assets\//, '')]
-          css_parser.add_block!(asset.to_s, :media_types => :all)
-        else
-          dirname = File.dirname(clean_href).split('/').reject(&:blank?)[1..-1]
-          local_file = File.join(Rails.root, 'app', 'assets', 'stylesheets', dirname, File.basename(clean_href))
-          if File.file?(local_file)
-            css_parser.load_file!(local_file)
-          end
-        end
-      when /^\//
-        css_parser.load_file!(File.join(Rails.root, 'public', clean_href))
-      when /^#{self.class.default_url_options[:host]}\/assets/
-        raise 'wugh oh'
-      else
-        raise stylesheet.inspect
-        css_parser.load_uri!(stylesheet['href'])
-        url = clean_href
-      end
-      apply_rules!(document, css_parser, url)
-    end
-
-    def sprockets?
-      Rails.application.respond_to?(:assets)
+      return super unless formats.include? :html
+      AwesomeMailer::Renderer.new(super).to_html
     end
   end
 end

data/lib/awesome_mailer/renderer.rb

@@ -0,0 +1,110 @@
+module AwesomeMailer
+  class Renderer
+    attr_accessor :document
+
+    def initialize(document_string)
+      self.document = Nokogiri::HTML.parse(document_string)
+      stylesheets = document.search('link[@rel=stylesheet]')
+      stylesheets.each do |stylesheet|
+        # Must be intended for digital screens!
+        load_stylesheet(stylesheet) if stylesheet['media'] =~ /^(all|handheld|screen)$/
+      end
+      apply_css!(document)
+    end
+
+    def to_html
+      document.to_html
+    end
+
+    private
+    def append_styles!(document, selector, declarations)
+      header_stylesheet.inner_html += "#{selector} { #{declarations} }\n"
+    end
+
+    def apply_css!(document)
+      css_parser.each_selector do |selector, declarations, specificity|
+        # Rewrite relative URLs to match their parent CSS's URL path
+        rewrite_relative_urls(declarations) if css_host
+        if selector =~ /(^@|:)/
+          # Include difficult styles in the head
+          append_styles!(document, selector, declarations.to_s)
+        else
+          # Include regular styles inline
+          document.search(selector).each do |element|
+            element['style'] = [element['style'], *declarations].compact.join(';')
+          end
+        end
+      end
+    end
+
+    def asset_pipeline_path
+      return false unless sprockets?
+      /^#{Regexp.escape(Rails.configuration.assets[:path])}\//
+    end
+
+    def css_host
+      if host = AwesomeMailer::Base.default_url_options[:host]
+        Addressable::URI.heuristic_parse(host, scheme: 'http')
+      end
+    end
+
+    def css_parser
+      @css_parser ||= CssParser::Parser.new
+    end
+
+    def head
+      @head ||= document.at('head') || Nokogiri::XML::Node.new('head', document.root).tap do |head|
+        document.root.children.first.add_previous_sibling(head)
+      end
+    end
+
+    def header_stylesheet
+      @header_stylesheet ||= head.at('style[@type="text/css"]') || Nokogiri::XML::Node.new('style', head).tap do |style|
+        style['type'] = 'text/css'
+        style.inner_html = "\n"
+        head.add_child(style)
+      end
+    end
+
+    def load_stylesheet(stylesheet)
+      stylesheet_path = stylesheet['href'].split('?').shift
+      stylesheet_path.gsub!(/^#{Regexp.escape(css_host)}/, '') if css_host
+      case stylesheet_path
+      when asset_pipeline_path
+        if asset = read_asset_pipeline_asset(stylesheet_path)
+          css_parser.add_block!(asset.to_s, :media_types => :all)
+        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)
+      else
+        dirname = File.dirname(stylesheet['href'])
+        css_parser.load_uri!(stylesheet['href'], base_uri: dirname)
+      end
+      stylesheet.remove
+    end
+
+    def rails?
+      defined? Rails
+    end
+
+    def read_asset_pipeline_asset(path)
+      path = path.gsub(asset_pipeline_path, '')
+      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 = css_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
+      end
+    end
+
+    def sprockets?
+      rails? && Rails.application.respond_to?(:assets)
+    end
+  end
+end

data/lib/awesome_mailer.rb

@@ -1,4 +1,4 @@
-require 'awesome_mailer/base'
-
 module AwesomeMailer
+  autoload :Base, 'awesome_mailer/base'
+  autoload :Renderer, 'awesome_mailer/renderer'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesomemailer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
@@ -28,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.5
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.5.6
 description: ! "\n      AwesomeMailer embeds your e-mail CSS inline, allowing you
   to write e-mail templates without worrying too much about stylesheets\n    "
 email: flip@x451.com
@@ -54,18 +86,15 @@ files:
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - README.md
 - Rakefile
 - VERSION
 - awesomemailer.gemspec
 - lib/awesome_mailer.rb
 - lib/awesome_mailer/base.rb
+- lib/awesome_mailer/renderer.rb
 - lib/awesomemailer.rb
-- spec/lib/awesome_mailer_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/test_mailer/test_email.html.erb
-- spec/support/test_mailer/test_email.text.erb
 homepage: http://github.com/Plinq/awesome_mailer
 licenses: []
 post_install_message: 
@@ -78,6 +107,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3813975484138673240
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/lib/awesome_mailer_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-require 'awesome_mailer'
-
-AwesomeMailer::Base.prepend_view_path 'spec/support'
-AwesomeMailer::Base.config.assets_dir = 'spec/support'
-
-class TestMailer < AwesomeMailer::Base
-  def test_email(subject = "Hello!")
-    mail(
-      :from => "flip@x451.com",
-      :to => "flip@x451.com",
-      :subject => subject
-    )
-  end
-
-  def test_multipart_email(subject = "Hello")
-     mail(
-       :from => "flip@x451.com",
-       :to => "flip@x451.com",
-       :subject => subject
-     ) do |format|
-      format.html { render :test_email }
-      format.text { render :test_email }
-    end
-  end
-end
-
-describe AwesomeMailer::Base do
-  it "should render messages like ActionMailer::Base" do
-    TestMailer.test_email("Howdy!").should be_instance_of Mail::Message
-  end
-
-  it "should automatically parse the body of HTML e-mails" do
-    raise TestMailer.test_email("Howdy!").html_part.body.inspect
-  end
-
-  it "should automatically parse the body of multipart e-mails" do
-    raise TestMailer.test_multipart_email("Howdy!").html_part.body.inspect
-  end
-end
-

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---backtrace

data/spec/spec_helper.rb

@@ -1 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/spec/support/test_mailer/test_email.html.erb

@@ -1,2 +0,0 @@
-<%= stylesheet_link_tag 'test.css' %>
-<div>welcome!</div>

data/spec/support/test_mailer/test_email.text.erb

@@ -1 +0,0 @@
-welcome!