actionmailer-instyle 0.5.1 → 0.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. data/Gemfile +6 -0
  2. data/lib/action_mailer/in_style/premailer.rb +6 -2
  3. data/lib/action_mailer/in_style/version.rb +1 -1
  4. data/spec/internal/app/views/layouts/notification_mailer.html.erb +3 -1
  5. data/spec/lib/action_mailer/inline/premailer_spec.rb +7 -0
  6. data/spec/lib/action_mailer/inline/processor_spec.rb +2 -2
  7. metadata +26 -24
data/Gemfile CHANGED
@@ -1,3 +1,9 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
3
  gemspec
4
+
5
+
6
+ gem 'jruby-openssl', :platform => :jruby
7
+ gem 'jdbc-sqlite3', :platform => :jruby
8
+ gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
9
+
data/lib/action_mailer/in_style/premailer.rb CHANGED
@@ -20,8 +20,8 @@ module ActionMailer
20
20
  # to generate the css. In this case we should be able to retrieve the css directly
21
21
  # from sprockets
22
22
  if tag.attributes['href'].to_s =~ /\/assets\//
23
- link_uri = tag.attributes['href'].to_s
24
- asset = Rails.application.assets.find_asset(link_uri.sub(/\/assets\//, ''))
23
+ link_uri = process_stylesheet_url(tag.attributes['href'])
24
+ asset = Rails.application.assets.find_asset(link_uri)
25
25
  @css_parser.add_block!(asset.body) if asset
26
26
  end
27
27
  end
@@ -29,6 +29,10 @@ module ActionMailer
29
29
  end
30
30
  end
31
31
 
32
+ def process_stylesheet_url(href)
33
+ href.to_s.sub(/\?[0-9a-zA-Z]+$/, '').sub(/^\/assets\//, '')
34
+ end
35
+
32
36
  end
33
37
  end
34
38
  end
data/lib/action_mailer/in_style/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module ActionMailer
2
2
  module InStyle
3
- VERSION = "0.5.1"
3
+ VERSION = "0.5.2"
4
4
  end
5
5
  end
data/spec/internal/app/views/layouts/notification_mailer.html.erb CHANGED
@@ -3,10 +3,12 @@
3
3
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
4
4
 
5
5
  <title>Notification_mailer.html</title>
6
- <%= stylesheet_link_tag "notification_mailer" %>
6
+ <%#= stylesheet_link_tag "notification_mailer" %>
7
+ <link rel="stylesheet" href="/assets/notification_mailer.css?jHUy87ybhjs876" />
7
8
  </head>
8
9
 
9
10
  <body>
10
11
  <%= yield %>
11
12
  </body>
12
13
  </html>
14
+
data/spec/lib/action_mailer/inline/premailer_spec.rb ADDED
@@ -0,0 +1,7 @@
1
+ require "spec_helper"
2
+
3
+ describe ActionMailer::InStyle::Premailer do
4
+ it 'it should handle stylesheet links containing cache token' do
5
+ ActionMailer::InStyle::Premailer.new('', :with_html_string => true, :remove_classes => true).process_stylesheet_url('/assets/email.css?jf87kjJHj787JHJGH').should == 'email.css'
6
+ end
7
+ end
data/spec/lib/action_mailer/inline/processor_spec.rb CHANGED
@@ -57,11 +57,11 @@ describe ActionMailer::InStyle::Processor do
57
57
  end
58
58
 
59
59
  it 'should include asset path for stylesheet in header' do
60
- processor.html_part.body.should match /\<link(.+)href\=\"\/assets\/notification_mailer\.css\"(.+)\>/
60
+ processor.html_part.body.should match /\<link(.+)href\=\"\/assets\/notification_mailer\.css\?(\w+)\"(.+)\>/
61
61
  end
62
62
 
63
63
  it 'should have inlined css version without stylesheet links' do
64
- processor.premailer.to_inline_css.should_not match /\<link(.+)href\=\"\/assets\/notification_mailer\.css\"(.+)\>/
64
+ processor.premailer.to_inline_css.should_not match /\<link(.+)href\=\"\/assets\/notification_mailer\.css\?(\w+)\"(.+)\>/
65
65
  end
66
66
 
67
67
  it 'replaces html body with inlined css version' do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actionmailer-instyle
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1
4
+ version: 0.5.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-29 00:00:00.000000000 Z
12
+ date: 2012-02-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: premailer
16
- requirement: &70283329168060 !ruby/object:Gem::Requirement
16
+ requirement: &70127697585940 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '1.7'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70283329168060
24
+ version_requirements: *70127697585940
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionmailer
27
- requirement: &70283329167560 !ruby/object:Gem::Requirement
27
+ requirement: &70127697585440 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70283329167560
35
+ version_requirements: *70127697585440
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activesupport
38
- requirement: &70283329167100 !ruby/object:Gem::Requirement
38
+ requirement: &70127697584980 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.1'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70283329167100
46
+ version_requirements: *70127697584980
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: sprockets
49
- requirement: &70283329166640 !ruby/object:Gem::Requirement
49
+ requirement: &70127697584520 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '2.0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70283329166640
57
+ version_requirements: *70127697584520
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec-rails
60
- requirement: &70283329166180 !ruby/object:Gem::Requirement
60
+ requirement: &70127697584060 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 2.8.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70283329166180
68
+ version_requirements: *70127697584060
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: guard-rspec
71
- requirement: &70283329165800 !ruby/object:Gem::Requirement
71
+ requirement: &70127697583680 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70283329165800
79
+ version_requirements: *70127697583680
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: sass
82
- requirement: &70283329165260 !ruby/object:Gem::Requirement
82
+ requirement: &70127697583140 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '3.1'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70283329165260
90
+ version_requirements: *70127697583140
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: sqlite3
93
- requirement: &70283329164760 !ruby/object:Gem::Requirement
93
+ requirement: &70127697582640 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - =
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 1.3.5
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70283329164760
101
+ version_requirements: *70127697582640
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: mail
104
- requirement: &70283329164380 !ruby/object:Gem::Requirement
104
+ requirement: &70127697582260 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70283329164380
112
+ version_requirements: *70127697582260
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: nokogiri
115
- requirement: &70283329163920 !ruby/object:Gem::Requirement
115
+ requirement: &70127697581800 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70283329163920
123
+ version_requirements: *70127697581800
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: combustion
126
- requirement: &70283329163420 !ruby/object:Gem::Requirement
126
+ requirement: &70127697581300 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: 0.3.1
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70283329163420
134
+ version_requirements: *70127697581300
135
135
  description: Easily create HTML emails in Rails ~>3.1
136
136
  email:
137
137
  - ivanvanderbyl@me.com
@@ -169,6 +169,7 @@ files:
169
169
  - spec/internal/log/.gitignore
170
170
  - spec/internal/public/favicon.ico
171
171
  - spec/lib/action_mailer/inline/css_helper_spec.rb
172
+ - spec/lib/action_mailer/inline/premailer_spec.rb
172
173
  - spec/lib/action_mailer/inline/processor_spec.rb
173
174
  - spec/lib/action_mailer/inline_spec.rb
174
175
  - spec/spec_helper.rb
@@ -214,6 +215,7 @@ test_files:
214
215
  - spec/internal/log/.gitignore
215
216
  - spec/internal/public/favicon.ico
216
217
  - spec/lib/action_mailer/inline/css_helper_spec.rb
218
+ - spec/lib/action_mailer/inline/premailer_spec.rb
217
219
  - spec/lib/action_mailer/inline/processor_spec.rb
218
220
  - spec/lib/action_mailer/inline_spec.rb
219
221
  - spec/spec_helper.rb