roadie 2.4.1 → 2.4.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 (11) hide show
  1. data/Changelog.md +12 -1
  2. data/gemfiles/rails_3.0.gemfile.lock +20 -20
  3. data/gemfiles/rails_3.1.gemfile.lock +19 -19
  4. data/gemfiles/rails_3.2.gemfile.lock +19 -19
  5. data/gemfiles/rails_4.0.gemfile.lock +16 -16
  6. data/lib/roadie/inliner.rb +1 -1
  7. data/lib/roadie/selector.rb +3 -1
  8. data/lib/roadie/version.rb +1 -1
  9. data/roadie.gemspec +1 -1
  10. data/spec/lib/roadie/selector_spec.rb +4 -0
  11. metadata +4 -10
data/Changelog.md CHANGED
@@ -1,6 +1,17 @@
1
1
  ### dev
2
2
 
3
- [full changelog](https://github.com/Mange/roadie/compare/v2.4.1...master)
3
+ [full changelog](https://github.com/Mange/roadie/compare/v2.4.2...master)
4
+
5
+ * Nothing yet
6
+
7
+ ### 2.4.2
8
+
9
+ [full changelog](https://github.com/Mange/roadie/compare/v2.4.1...v2.4.2)
10
+
11
+ * Bug fixes:
12
+ * Fix Nokogiri version to allow only 1.5.x on ruby 1.8.7
13
+ * Blacklist :before, :after, :-ms-input-placeholder, :-moz-placeholder selectors – [Brian Bauer (bbauer)][https://github.com/bbauer].
14
+ * Build failed on 1.8.7 due to a change in `css_parser`
4
15
 
5
16
  ### 2.4.1
6
17
 
data/gemfiles/rails_3.0.gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
- remote: /home/mange/Projects/roadie
2
+ remote: /Users/mange/Projects/roadie
3
3
  specs:
4
- roadie (2.4.0)
4
+ roadie (2.4.2)
5
5
  actionmailer (> 3.0.0, < 5.0.0)
6
6
  css_parser (~> 1.3.4)
7
- nokogiri (> 1.5.0, < 1.7.0)
7
+ nokogiri (> 1.5.0)
8
8
  sprockets
9
9
 
10
10
  GEM
@@ -38,14 +38,14 @@ GEM
38
38
  activesupport (= 3.0.17)
39
39
  activesupport (3.0.17)
40
40
  addressable (2.3.5)
41
- appraisal (0.5.1)
41
+ appraisal (0.5.2)
42
42
  bundler
43
43
  rake
44
44
  arel (2.0.10)
45
45
  builder (2.1.2)
46
- css_parser (1.3.4)
46
+ css_parser (1.3.5)
47
47
  addressable
48
- diff-lcs (1.1.3)
48
+ diff-lcs (1.2.4)
49
49
  erubis (2.6.6)
50
50
  abstract (>= 1.0.0)
51
51
  hike (1.2.3)
@@ -57,8 +57,8 @@ GEM
57
57
  mime-types (~> 1.16)
58
58
  treetop (~> 1.4.8)
59
59
  mime-types (1.19)
60
- mini_portile (0.5.0)
61
- multi_json (1.7.7)
60
+ mini_portile (0.5.1)
61
+ multi_json (1.8.0)
62
62
  nokogiri (1.6.0)
63
63
  mini_portile (~> 0.5.0)
64
64
  polyglot (0.3.3)
@@ -84,21 +84,21 @@ GEM
84
84
  rake (10.0.2)
85
85
  rdoc (3.12)
86
86
  json (~> 1.4)
87
- rspec (2.12.0)
88
- rspec-core (~> 2.12.0)
89
- rspec-expectations (~> 2.12.0)
90
- rspec-mocks (~> 2.12.0)
91
- rspec-core (2.12.1)
92
- rspec-expectations (2.12.0)
93
- diff-lcs (~> 1.1.3)
94
- rspec-mocks (2.12.0)
95
- rspec-rails (2.12.0)
87
+ rspec (2.14.1)
88
+ rspec-core (~> 2.14.0)
89
+ rspec-expectations (~> 2.14.0)
90
+ rspec-mocks (~> 2.14.0)
91
+ rspec-core (2.14.5)
92
+ rspec-expectations (2.14.3)
93
+ diff-lcs (>= 1.1.3, < 2.0)
94
+ rspec-mocks (2.14.3)
95
+ rspec-rails (2.14.0)
96
96
  actionpack (>= 3.0)
97
97
  activesupport (>= 3.0)
98
98
  railties (>= 3.0)
99
- rspec-core (~> 2.12.0)
100
- rspec-expectations (~> 2.12.0)
101
- rspec-mocks (~> 2.12.0)
99
+ rspec-core (~> 2.14.0)
100
+ rspec-expectations (~> 2.14.0)
101
+ rspec-mocks (~> 2.14.0)
102
102
  sprockets (2.10.0)
103
103
  hike (~> 1.2)
104
104
  multi_json (~> 1.0)
data/gemfiles/rails_3.1.gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
- remote: /home/mange/Projects/roadie
2
+ remote: /Users/mange/Projects/roadie
3
3
  specs:
4
- roadie (2.4.0)
4
+ roadie (2.4.2)
5
5
  actionmailer (> 3.0.0, < 5.0.0)
6
6
  css_parser (~> 1.3.4)
7
- nokogiri (> 1.5.0, < 1.7.0)
7
+ nokogiri (> 1.5.0)
8
8
  sprockets
9
9
 
10
10
  GEM
@@ -39,14 +39,14 @@ GEM
39
39
  activesupport (3.1.4)
40
40
  multi_json (~> 1.0)
41
41
  addressable (2.3.5)
42
- appraisal (0.5.1)
42
+ appraisal (0.5.2)
43
43
  bundler
44
44
  rake
45
45
  arel (2.2.3)
46
46
  builder (3.0.0)
47
- css_parser (1.3.4)
47
+ css_parser (1.3.5)
48
48
  addressable
49
- diff-lcs (1.1.3)
49
+ diff-lcs (1.2.4)
50
50
  erubis (2.7.0)
51
51
  hike (1.2.1)
52
52
  i18n (0.6.1)
@@ -56,7 +56,7 @@ GEM
56
56
  mime-types (~> 1.16)
57
57
  treetop (~> 1.4.8)
58
58
  mime-types (1.19)
59
- mini_portile (0.5.0)
59
+ mini_portile (0.5.1)
60
60
  multi_json (1.4.0)
61
61
  nokogiri (1.6.0)
62
62
  mini_portile (~> 0.5.0)
@@ -88,21 +88,21 @@ GEM
88
88
  rake (10.0.2)
89
89
  rdoc (3.12)
90
90
  json (~> 1.4)
91
- rspec (2.12.0)
92
- rspec-core (~> 2.12.0)
93
- rspec-expectations (~> 2.12.0)
94
- rspec-mocks (~> 2.12.0)
95
- rspec-core (2.12.1)
96
- rspec-expectations (2.12.0)
97
- diff-lcs (~> 1.1.3)
98
- rspec-mocks (2.12.0)
99
- rspec-rails (2.12.0)
91
+ rspec (2.14.1)
92
+ rspec-core (~> 2.14.0)
93
+ rspec-expectations (~> 2.14.0)
94
+ rspec-mocks (~> 2.14.0)
95
+ rspec-core (2.14.5)
96
+ rspec-expectations (2.14.3)
97
+ diff-lcs (>= 1.1.3, < 2.0)
98
+ rspec-mocks (2.14.3)
99
+ rspec-rails (2.14.0)
100
100
  actionpack (>= 3.0)
101
101
  activesupport (>= 3.0)
102
102
  railties (>= 3.0)
103
- rspec-core (~> 2.12.0)
104
- rspec-expectations (~> 2.12.0)
105
- rspec-mocks (~> 2.12.0)
103
+ rspec-core (~> 2.14.0)
104
+ rspec-expectations (~> 2.14.0)
105
+ rspec-mocks (~> 2.14.0)
106
106
  sprockets (2.0.3)
107
107
  hike (~> 1.2)
108
108
  rack (~> 1.0)
data/gemfiles/rails_3.2.gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
- remote: /home/mange/Projects/roadie
2
+ remote: /Users/mange/Projects/roadie
3
3
  specs:
4
- roadie (2.4.0)
4
+ roadie (2.4.2)
5
5
  actionmailer (> 3.0.0, < 5.0.0)
6
6
  css_parser (~> 1.3.4)
7
- nokogiri (> 1.5.0, < 1.7.0)
7
+ nokogiri (> 1.5.0)
8
8
  sprockets
9
9
 
10
10
  GEM
@@ -38,14 +38,14 @@ GEM
38
38
  i18n (~> 0.6)
39
39
  multi_json (~> 1.0)
40
40
  addressable (2.3.5)
41
- appraisal (0.5.1)
41
+ appraisal (0.5.2)
42
42
  bundler
43
43
  rake
44
44
  arel (3.0.2)
45
45
  builder (3.0.0)
46
- css_parser (1.3.4)
46
+ css_parser (1.3.5)
47
47
  addressable
48
- diff-lcs (1.1.3)
48
+ diff-lcs (1.2.4)
49
49
  erubis (2.7.0)
50
50
  hike (1.2.1)
51
51
  i18n (0.6.1)
@@ -56,7 +56,7 @@ GEM
56
56
  mime-types (~> 1.16)
57
57
  treetop (~> 1.4.8)
58
58
  mime-types (1.19)
59
- mini_portile (0.5.0)
59
+ mini_portile (0.5.1)
60
60
  multi_json (1.4.0)
61
61
  nokogiri (1.6.0)
62
62
  mini_portile (~> 0.5.0)
@@ -86,21 +86,21 @@ GEM
86
86
  rake (10.0.2)
87
87
  rdoc (3.12)
88
88
  json (~> 1.4)
89
- rspec (2.12.0)
90
- rspec-core (~> 2.12.0)
91
- rspec-expectations (~> 2.12.0)
92
- rspec-mocks (~> 2.12.0)
93
- rspec-core (2.12.1)
94
- rspec-expectations (2.12.0)
95
- diff-lcs (~> 1.1.3)
96
- rspec-mocks (2.12.0)
97
- rspec-rails (2.12.0)
89
+ rspec (2.14.1)
90
+ rspec-core (~> 2.14.0)
91
+ rspec-expectations (~> 2.14.0)
92
+ rspec-mocks (~> 2.14.0)
93
+ rspec-core (2.14.5)
94
+ rspec-expectations (2.14.3)
95
+ diff-lcs (>= 1.1.3, < 2.0)
96
+ rspec-mocks (2.14.3)
97
+ rspec-rails (2.14.0)
98
98
  actionpack (>= 3.0)
99
99
  activesupport (>= 3.0)
100
100
  railties (>= 3.0)
101
- rspec-core (~> 2.12.0)
102
- rspec-expectations (~> 2.12.0)
103
- rspec-mocks (~> 2.12.0)
101
+ rspec-core (~> 2.14.0)
102
+ rspec-expectations (~> 2.14.0)
103
+ rspec-mocks (~> 2.14.0)
104
104
  sprockets (2.1.2)
105
105
  hike (~> 1.2)
106
106
  rack (~> 1.0)
data/gemfiles/rails_4.0.gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
- remote: /home/mange/Projects/roadie
2
+ remote: /Users/mange/Projects/roadie
3
3
  specs:
4
- roadie (2.4.0)
4
+ roadie (2.4.2)
5
5
  actionmailer (> 3.0.0, < 5.0.0)
6
6
  css_parser (~> 1.3.4)
7
- nokogiri (> 1.5.0, < 1.7.0)
7
+ nokogiri (> 1.5.0)
8
8
  sprockets
9
9
 
10
10
  GEM
@@ -41,7 +41,7 @@ GEM
41
41
  arel (4.0.0)
42
42
  atomic (1.1.10)
43
43
  builder (3.1.4)
44
- css_parser (1.3.4)
44
+ css_parser (1.3.5)
45
45
  addressable
46
46
  diff-lcs (1.2.4)
47
47
  erubis (2.7.0)
@@ -51,7 +51,7 @@ GEM
51
51
  mime-types (~> 1.16)
52
52
  treetop (~> 1.4.8)
53
53
  mime-types (1.23)
54
- mini_portile (0.5.0)
54
+ mini_portile (0.5.1)
55
55
  minitest (4.7.5)
56
56
  multi_json (1.7.7)
57
57
  nokogiri (1.6.0)
@@ -74,21 +74,21 @@ GEM
74
74
  rake (>= 0.8.7)
75
75
  thor (>= 0.18.1, < 2.0)
76
76
  rake (10.1.0)
77
- rspec (2.13.0)
78
- rspec-core (~> 2.13.0)
79
- rspec-expectations (~> 2.13.0)
80
- rspec-mocks (~> 2.13.0)
81
- rspec-core (2.13.1)
82
- rspec-expectations (2.13.0)
77
+ rspec (2.14.1)
78
+ rspec-core (~> 2.14.0)
79
+ rspec-expectations (~> 2.14.0)
80
+ rspec-mocks (~> 2.14.0)
81
+ rspec-core (2.14.5)
82
+ rspec-expectations (2.14.3)
83
83
  diff-lcs (>= 1.1.3, < 2.0)
84
- rspec-mocks (2.13.1)
85
- rspec-rails (2.13.2)
84
+ rspec-mocks (2.14.3)
85
+ rspec-rails (2.14.0)
86
86
  actionpack (>= 3.0)
87
87
  activesupport (>= 3.0)
88
88
  railties (>= 3.0)
89
- rspec-core (~> 2.13.0)
90
- rspec-expectations (~> 2.13.0)
91
- rspec-mocks (~> 2.13.0)
89
+ rspec-core (~> 2.14.0)
90
+ rspec-expectations (~> 2.14.0)
91
+ rspec-mocks (~> 2.14.0)
92
92
  sprockets (2.10.0)
93
93
  hike (~> 1.2)
94
94
  multi_json (~> 1.0)
data/lib/roadie/inliner.rb CHANGED
@@ -135,7 +135,7 @@ module Roadie
135
135
 
136
136
  def elements_with_declarations
137
137
  Hash.new { |hash, key| hash[key] = [] }.tap do |element_declarations|
138
- parsed_css.each_rule_set do |rule_set|
138
+ parsed_css.each_rule_set do |rule_set, _|
139
139
  each_good_selector(rule_set) do |selector|
140
140
  each_element_in_selector(selector) do |element|
141
141
  style_declarations_in_rule_set(selector.specificity, rule_set) do |declaration|
data/lib/roadie/selector.rb CHANGED
@@ -31,7 +31,9 @@ module Roadie
31
31
  attr_reader :selector
32
32
 
33
33
  private
34
- BAD_PSEUDO_FUNCTIONS = %w[:active :focus :hover :link :target :visited].freeze
34
+ BAD_PSEUDO_FUNCTIONS = %w[:active :focus :hover :link :target :visited
35
+ :-ms-input-placeholder :-moz-placeholder
36
+ :before :after].freeze
35
37
 
36
38
  def pseudo_element?
37
39
  selector.include? '::'
data/lib/roadie/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Roadie
2
- VERSION = '2.4.1'
2
+ VERSION = '2.4.2'
3
3
  end
data/roadie.gemspec CHANGED
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
14
14
  s.summary = %q{Making HTML emails comfortable for the Rails rockstars}
15
15
  s.description = %q{Roadie tries to make sending HTML emails a little less painful in Rails 3 by inlining stylesheets and rewrite relative URLs for you.}
16
16
 
17
- s.add_dependency 'nokogiri', '> 1.5.0', '< 1.7.0'
17
+ s.add_dependency 'nokogiri', RUBY_VERSION < '1.9.3' ? ['> 1.5.0', '< 1.6.0'] : '> 1.5.0'
18
18
  s.add_dependency 'css_parser', '~> 1.3.4'
19
19
  s.add_dependency 'actionmailer', '> 3.0.0', '< 5.0.0'
20
20
  s.add_dependency 'sprockets'
data/spec/lib/roadie/selector_spec.rb CHANGED
@@ -19,6 +19,10 @@ module Roadie
19
19
  p:link
20
20
  p:target
21
21
  p:visited
22
+ p:before
23
+ p:after
24
+ p:-ms-input-placeholder
25
+ p:-moz-placeholder
22
26
  ].each do |bad_selector|
23
27
  Selector.new(bad_selector).should_not be_inlinable
24
28
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roadie
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.1
4
+ version: 2.4.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-05 00:00:00.000000000 Z
12
+ date: 2013-10-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri
@@ -19,9 +19,6 @@ dependencies:
19
19
  - - ! '>'
20
20
  - !ruby/object:Gem::Version
21
21
  version: 1.5.0
22
- - - <
23
- - !ruby/object:Gem::Version
24
- version: 1.7.0
25
22
  type: :runtime
26
23
  prerelease: false
27
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -30,9 +27,6 @@ dependencies:
30
27
  - - ! '>'
31
28
  - !ruby/object:Gem::Version
32
29
  version: 1.5.0
33
- - - <
34
- - !ruby/object:Gem::Version
35
- version: 1.7.0
36
30
  - !ruby/object:Gem::Dependency
37
31
  name: css_parser
38
32
  requirement: !ruby/object:Gem::Requirement
@@ -246,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
246
240
  version: '0'
247
241
  segments:
248
242
  - 0
249
- hash: 198720048823264334
243
+ hash: -3397236686986822588
250
244
  required_rubygems_version: !ruby/object:Gem::Requirement
251
245
  none: false
252
246
  requirements:
@@ -255,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
255
249
  version: '0'
256
250
  segments:
257
251
  - 0
258
- hash: 198720048823264334
252
+ hash: -3397236686986822588
259
253
  requirements: []
260
254
  rubyforge_project:
261
255
  rubygems_version: 1.8.24