Replaced premailer initializer with my actionmailer_inline_css gem.

Nathan Broadbent
1 parent 9b9fba4e
Showing 4 changed files with 7 additions and 21 deletions Show diff stats
Gemfile
Gemfile.lock
app/views/layouts/mailer.html.haml
config/initializers/actionmailer_inline_css.rb
@@ -16,7 +16,7 @@ gem &#39;octokit&#39;
 gem 'inherited_resources'
 gem 'SystemTimer', :platform => :ruby_18
 gem 'hoptoad_notifier', "~> 2.4"
-gem 'premailer'
+gem 'actionmailer_inline_css', ">= 1.0.0"
  
 platform :ruby do
   gem 'bson_ext', '~> 1.3.1'
@@ -13,6 +13,10 @@ GEM
     actionmailer (3.0.5)
       actionpack (= 3.0.5)
       mail (~> 2.2.15)
+    actionmailer_inline_css (1.0.0)
+      actionmailer (>= 3.0.0)
+      nokogiri (>= 1.4.4)
+      premailer (>= 1.7.1)
     actionpack (3.0.5)
       activemodel (= 3.0.5)
       activesupport (= 3.0.5)
@@ -206,6 +210,7 @@ PLATFORMS
  
 DEPENDENCIES
   SystemTimer
+  actionmailer_inline_css (>= 1.0.0)
   bson_ext (~> 1.3.1)
   database_cleaner (~> 0.6.0)
   devise (~> 1.4.0)
@@ -220,7 +225,6 @@ DEPENDENCIES
   nokogiri
   octokit
   pivotal-tracker
-  premailer
   rails (= 3.0.5)
   redmine_client!
   rspec (~> 2.5)
 %html
   %head
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
+    = embedded_style_tag
   %body(leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0")
     %center
       %table(cellpadding="0" cellspacing="0" border="0" width="100%")
@@ -1,18 +0,0 @@
-#
-# ActionMailer module for inline css in html emails
-#
-module ActionMailer::InlineCss
-  def render(*args)
-    if (template = args.first[:template]) && template.mime_type.html?
-      premailer = Premailer.new(super, :with_html_string => true,
-                                          :css => default_params[:css] ||
-                                                  ["#{Rails.root}/public/stylesheets/mailers/#{mailer_name}.css"])
-      premailer.to_inline_css
-    else
-      super
-    end
-  end
-end
-
-ActionMailer::Base.send :include, ActionMailer::InlineCss
-
...	...	@@ -16,7 +16,7 @@ gem 'octokit'
16	16	gem 'inherited_resources'
17	17	gem 'SystemTimer', :platform => :ruby_18
18	18	gem 'hoptoad_notifier', "~> 2.4"
19		-gem 'premailer'
	19	+gem 'actionmailer_inline_css', ">= 1.0.0"
20	20
21	21	platform :ruby do
22	22	gem 'bson_ext', '~> 1.3.1'
...	...
...	...	@@ -13,6 +13,10 @@ GEM
13	13	actionmailer (3.0.5)
14	14	actionpack (= 3.0.5)
15	15	mail (~> 2.2.15)
	16	+ actionmailer_inline_css (1.0.0)
	17	+ actionmailer (>= 3.0.0)
	18	+ nokogiri (>= 1.4.4)
	19	+ premailer (>= 1.7.1)
16	20	actionpack (3.0.5)
17	21	activemodel (= 3.0.5)
18	22	activesupport (= 3.0.5)
...	...	@@ -206,6 +210,7 @@ PLATFORMS
206	210
207	211	DEPENDENCIES
208	212	SystemTimer
	213	+ actionmailer_inline_css (>= 1.0.0)
209	214	bson_ext (~> 1.3.1)
210	215	database_cleaner (~> 0.6.0)
211	216	devise (~> 1.4.0)
...	...	@@ -220,7 +225,6 @@ DEPENDENCIES
220	225	nokogiri
221	226	octokit
222	227	pivotal-tracker
223		- premailer
224	228	rails (= 3.0.5)
225	229	redmine_client!
226	230	rspec (~> 2.5)
...	...
1	1	%html
2	2	%head
3	3	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
4		-
	4	+ = embedded_style_tag
5	5	%body(leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0")
6	6	%center
7	7	%table(cellpadding="0" cellspacing="0" border="0" width="100%")
...	...
...	...	@@ -1,18 +0,0 @@
1		-#
2		-# ActionMailer module for inline css in html emails
3		-#
4		-module ActionMailer::InlineCss
5		- def render(*args)
6		- if (template = args.first[:template]) && template.mime_type.html?
7		- premailer = Premailer.new(super, :with_html_string => true,
8		- :css => default_params[:css] \|\|
9		- ["#{Rails.root}/public/stylesheets/mailers/#{mailer_name}.css"])
10		- premailer.to_inline_css
11		- else
12		- super
13		- end
14		- end
15		-end
16		-
17		-ActionMailer::Base.send :include, ActionMailer::InlineCss
18		-