roadie 2.3.1 → 2.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/Changelog.md +9 -2
  2. data/Gemfile.lock +1 -1
  3. data/README.md +5 -0
  4. data/gemfiles/rails-3.0.gemfile.lock +1 -1
  5. data/gemfiles/rails-3.1.gemfile.lock +3 -3
  6. data/gemfiles/rails-3.2.gemfile.lock +3 -3
  7. data/lib/roadie/inliner.rb +3 -3
  8. data/lib/roadie/version.rb +1 -1
  9. data/spec/lib/roadie/inliner_spec.rb +12 -0
  10. metadata +57 -19
data/Changelog.md CHANGED
@@ -1,9 +1,16 @@
1
1
  ### dev
2
2
 
3
- [full changelog](https://github.com/Mange/roadie/compare/v2.3.1...master)
3
+ [full changelog](https://github.com/Mange/roadie/compare/v2.3.2...master)
4
4
 
5
5
  * Nothing yet
6
6
 
7
+ ### 2.3.2
8
+
9
+ [full changelog](https://github.com/Mange/roadie/compare/v2.3.1...v2.3.2)
10
+
11
+ * Bug fixes:
12
+ * Don't fail on selectors which start with @ (#28) – [Roman Shterenzon (romanbsd)](https://github.com/romanbsd)
13
+
7
14
  ### 2.3.1
8
15
 
9
16
  [full changelog](https://github.com/Mange/roadie/compare/v2.3.0...v2.3.1)
@@ -22,7 +29,7 @@
22
29
  [full changelog](https://github.com/Mange/roadie/compare/v2.2.0...v2.3.0.pre1)
23
30
 
24
31
  * Enhancements:
25
- * Support Rails 3.2.pre1 - [Morton Jonuschat (yabawock)](https://github.com/yabawock)
32
+ * Support Rails 3.2.pre1 - [Morton Jonuschat (yabawock)](https://github.com/yabawock)
26
33
  * Sped up the Travis builds
27
34
  * Official support for Rails 3.0 again
28
35
  * Dependencies allow 3.0
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- roadie (2.3.1)
4
+ roadie (2.3.2)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
data/README.md CHANGED
@@ -194,6 +194,11 @@ Documentation
194
194
  * [Online documentation for master](http://rubydoc.info/github/Mange/roadie/master/frames)
195
195
  * [Changelog](https://github.com/Mange/roadie/blob/master/Changelog.md)
196
196
 
197
+ Running specs
198
+ -------------
199
+
200
+ Run specs for your current ruby against the latest compatible version of rails with `rake spec`. You can run against all supported combinations of ruby and rails by issuing `rake spec:all`.
201
+
197
202
  History and contributors
198
203
  ------------------------
199
204
 
data/gemfiles/rails-3.0.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/mange/Projects/roadie
3
3
  specs:
4
- roadie (2.3.1)
4
+ roadie (2.3.2)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
data/gemfiles/rails-3.1.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/mange/Projects/roadie
3
3
  specs:
4
- roadie (2.3.1)
4
+ roadie (2.3.2)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
@@ -38,7 +38,7 @@ GEM
38
38
  activesupport (= 3.1.4)
39
39
  activesupport (3.1.4)
40
40
  multi_json (~> 1.0)
41
- addressable (2.2.7)
41
+ addressable (2.2.8)
42
42
  appraisal (0.4.1)
43
43
  bundler
44
44
  rake
@@ -58,7 +58,7 @@ GEM
58
58
  treetop (~> 1.4.8)
59
59
  mime-types (1.18)
60
60
  multi_json (1.1.0)
61
- nokogiri (1.5.2)
61
+ nokogiri (1.5.5)
62
62
  polyglot (0.3.3)
63
63
  rack (1.3.6)
64
64
  rack-cache (1.2)
data/gemfiles/rails-3.2.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/mange/Projects/roadie
3
3
  specs:
4
- roadie (2.3.1)
4
+ roadie (2.3.2)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
@@ -37,7 +37,7 @@ GEM
37
37
  activesupport (3.2.2)
38
38
  i18n (~> 0.6)
39
39
  multi_json (~> 1.0)
40
- addressable (2.2.7)
40
+ addressable (2.2.8)
41
41
  appraisal (0.4.1)
42
42
  bundler
43
43
  rake
@@ -58,7 +58,7 @@ GEM
58
58
  treetop (~> 1.4.8)
59
59
  mime-types (1.18)
60
60
  multi_json (1.1.0)
61
- nokogiri (1.5.2)
61
+ nokogiri (1.5.5)
62
62
  polyglot (0.3.3)
63
63
  rack (1.4.1)
64
64
  rack-cache (1.2)
data/lib/roadie/inliner.rb CHANGED
@@ -131,7 +131,7 @@ module Roadie
131
131
  def elements_with_declarations
132
132
  Hash.new { |hash, key| hash[key] = [] }.tap do |element_declarations|
133
133
  parsed_css.each_rule_set do |rule_set|
134
- each_selector_without_psuedo(rule_set) do |selector, specificity|
134
+ each_selector_without_pseudo(rule_set) do |selector, specificity|
135
135
  each_element_in_selector(selector) do |element|
136
136
  style_declarations_in_rule_set(specificity, rule_set) do |declaration|
137
137
  element_declarations[element] << declaration
@@ -142,8 +142,8 @@ module Roadie
142
142
  end
143
143
  end
144
144
 
145
- def each_selector_without_psuedo(rules)
146
- rules.selectors.reject { |selector| selector.include?(':') }.each do |selector|
145
+ def each_selector_without_pseudo(rules)
146
+ rules.selectors.reject { |selector| selector.include?(':') or selector.starts_with?('@') }.each do |selector|
147
147
  yield selector, CssParser.calculate_specificity(selector)
148
148
  end
149
149
  end
data/lib/roadie/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Roadie
2
- VERSION = '2.3.1'
2
+ VERSION = '2.3.2'
3
3
  end
data/spec/lib/roadie/inliner_spec.rb CHANGED
@@ -103,6 +103,18 @@ describe Roadie::Inliner do
103
103
  rendering('<p></p>').should_not have_styling('color' => 'red')
104
104
  end
105
105
 
106
+ it "ignores selectors with @" do
107
+ use_css '@keyframes progress-bar-stripes {
108
+ from {
109
+ background-position: 40px 0;
110
+ }
111
+ to {
112
+ background-position: 0 0;
113
+ }
114
+ }'
115
+ expect { rendering('<p></p>') }.not_to raise_error
116
+ end
117
+
106
118
  describe "inline <style> element" do
107
119
  it "is used for inlined styles" do
108
120
  rendering(<<-HTML).should have_styling([['color', 'green'], ['font-size', '1.1em']])
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.3.1
4
+ version: 2.3.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-03-22 00:00:00.000000000 Z
12
+ date: 2012-07-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri
16
- requirement: &70347165864000 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: 1.4.4
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70347165864000
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: 1.4.4
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: css_parser
27
- requirement: &70347165863580 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '0'
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70347165863580
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: actionmailer
38
- requirement: &70347165879380 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>'
@@ -46,10 +56,18 @@ dependencies:
46
56
  version: 3.3.0
47
57
  type: :runtime
48
58
  prerelease: false
49
- version_requirements: *70347165879380
59
+ version_requirements: !ruby/object:Gem::Requirement
60
+ none: false
61
+ requirements:
62
+ - - ! '>'
63
+ - !ruby/object:Gem::Version
64
+ version: 3.0.0
65
+ - - <
66
+ - !ruby/object:Gem::Version
67
+ version: 3.3.0
50
68
  - !ruby/object:Gem::Dependency
51
69
  name: sprockets
52
- requirement: &70347165878700 !ruby/object:Gem::Requirement
70
+ requirement: !ruby/object:Gem::Requirement
53
71
  none: false
54
72
  requirements:
55
73
  - - ! '>='
@@ -57,10 +75,15 @@ dependencies:
57
75
  version: '0'
58
76
  type: :runtime
59
77
  prerelease: false
60
- version_requirements: *70347165878700
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ none: false
80
+ requirements:
81
+ - - ! '>='
82
+ - !ruby/object:Gem::Version
83
+ version: '0'
61
84
  - !ruby/object:Gem::Dependency
62
85
  name: rails
63
- requirement: &70347165878240 !ruby/object:Gem::Requirement
86
+ requirement: !ruby/object:Gem::Requirement
64
87
  none: false
65
88
  requirements:
66
89
  - - ! '>='
@@ -68,10 +91,15 @@ dependencies:
68
91
  version: '0'
69
92
  type: :development
70
93
  prerelease: false
71
- version_requirements: *70347165878240
94
+ version_requirements: !ruby/object:Gem::Requirement
95
+ none: false
96
+ requirements:
97
+ - - ! '>='
98
+ - !ruby/object:Gem::Version
99
+ version: '0'
72
100
  - !ruby/object:Gem::Dependency
73
101
  name: rspec-rails
74
- requirement: &70347165877820 !ruby/object:Gem::Requirement
102
+ requirement: !ruby/object:Gem::Requirement
75
103
  none: false
76
104
  requirements:
77
105
  - - ! '>='
@@ -79,10 +107,15 @@ dependencies:
79
107
  version: '0'
80
108
  type: :development
81
109
  prerelease: false
82
- version_requirements: *70347165877820
110
+ version_requirements: !ruby/object:Gem::Requirement
111
+ none: false
112
+ requirements:
113
+ - - ! '>='
114
+ - !ruby/object:Gem::Version
115
+ version: '0'
83
116
  - !ruby/object:Gem::Dependency
84
117
  name: appraisal
85
- requirement: &70347165877400 !ruby/object:Gem::Requirement
118
+ requirement: !ruby/object:Gem::Requirement
86
119
  none: false
87
120
  requirements:
88
121
  - - ! '>='
@@ -90,7 +123,12 @@ dependencies:
90
123
  version: '0'
91
124
  type: :development
92
125
  prerelease: false
93
- version_requirements: *70347165877400
126
+ version_requirements: !ruby/object:Gem::Requirement
127
+ none: false
128
+ requirements:
129
+ - - ! '>='
130
+ - !ruby/object:Gem::Version
131
+ version: '0'
94
132
  description: Roadie tries to make sending HTML emails a little less painful in Rails
95
133
  3 by inlining stylesheets and rewrite relative URLs for you.
96
134
  email:
@@ -168,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
168
206
  version: '0'
169
207
  segments:
170
208
  - 0
171
- hash: 3157574064731637945
209
+ hash: -3017908964885938458
172
210
  required_rubygems_version: !ruby/object:Gem::Requirement
173
211
  none: false
174
212
  requirements:
@@ -177,10 +215,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
177
215
  version: '0'
178
216
  segments:
179
217
  - 0
180
- hash: 3157574064731637945
218
+ hash: -3017908964885938458
181
219
  requirements: []
182
220
  rubyforge_project:
183
- rubygems_version: 1.8.15
221
+ rubygems_version: 1.8.24
184
222
  signing_key:
185
223
  specification_version: 3
186
224
  summary: Making HTML emails comfortable for the Rails rockstars