awesomemailer 0.1.2 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.1.3
+  * Added support for matching against multiple asset hosts
+
 0.1.2
   * Added support for @media queries and vendor prefixes
     in the header. Should solve most issues w/CSS3 in

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/awesomemailer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "awesomemailer"
-  s.version = "0.1.2"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]

data/lib/awesome_mailer/base.rb

@@ -1,7 +1,5 @@
 require 'abstract_controller'
 require 'action_mailer'
-require 'nokogiri'
-require 'css_parser'
 
 module AwesomeMailer
   class Base < ActionMailer::Base

data/lib/awesome_mailer/renderer.rb

@@ -1,3 +1,6 @@
+require 'css_parser'
+require 'nokogiri'
+
 module AwesomeMailer
   class Renderer
     attr_accessor :document
@@ -49,7 +52,6 @@ module AwesomeMailer
                 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
@@ -58,6 +60,13 @@ module AwesomeMailer
       end
     end
 
+    def asset_host
+      rails? && (
+        Rails.configuration.action_mailer.try(:asset_host) ||
+        Rails.configuration.action_controller.try(:asset_host)
+      )
+    end
+
     def asset_pipeline_path
       return false unless sprockets?
       /^#{Regexp.escape(Rails.configuration.assets[:prefix])}\//
@@ -67,6 +76,12 @@ module AwesomeMailer
       @css_parser ||= CssParser::Parser.new
     end
 
+    def default_host
+      if host = AwesomeMailer::Base.default_url_options[:host]
+        "#{AwesomeMailer::Base.default_url_options[:scheme] || 'http'}://#{host}"
+      end
+    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)
@@ -82,7 +97,7 @@ module AwesomeMailer
     end
 
     def host
-      if host = AwesomeMailer::Base.default_url_options[:host]
+      if host = asset_host || default_host
         Addressable::URI.heuristic_parse(host, scheme: 'http')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesomemailer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: