roadie 2.3.0 → 2.3.1

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 +8 -1
  2. data/Gemfile.lock +71 -74
  3. data/README.md +4 -4
  4. data/gemfiles/rails-3.0.gemfile.lock +43 -43
  5. data/gemfiles/rails-3.1.gemfile.lock +48 -48
  6. data/gemfiles/rails-3.2.gemfile.lock +52 -54
  7. data/lib/roadie.rb +1 -1
  8. data/lib/roadie/version.rb +1 -1
  9. data/spec/lib/roadie_spec.rb +21 -3
  10. metadata +18 -18
data/Changelog.md CHANGED
@@ -1,9 +1,16 @@
1
1
  ### dev
2
2
 
3
- [full changelog](https://github.com/Mange/roadie/compare/v2.3.0...master)
3
+ [full changelog](https://github.com/Mange/roadie/compare/v2.3.1...master)
4
4
 
5
5
  * Nothing yet
6
6
 
7
+ ### 2.3.1
8
+
9
+ [full changelog](https://github.com/Mange/roadie/compare/v2.3.0...v2.3.1)
10
+
11
+ * Bug fixes:
12
+ * Does not work with Rails 3.0 unless provider set specifically (#23)
13
+
7
14
  ### 2.3.0
8
15
 
9
16
  [full changelog](https://github.com/Mange/roadie/compare/v2.3.0.pre1...v2.3.0)
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- roadie (2.3.0)
4
+ roadie (2.3.1)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
@@ -10,106 +10,103 @@ PATH
10
10
  GEM
11
11
  remote: http://rubygems.org/
12
12
  specs:
13
- actionmailer (3.1.3)
14
- actionpack (= 3.1.3)
15
- mail (~> 2.3.0)
16
- actionpack (3.1.3)
17
- activemodel (= 3.1.3)
18
- activesupport (= 3.1.3)
19
- builder (~> 3.0.0)
20
- erubis (~> 2.7.0)
21
- i18n (~> 0.6)
22
- rack (~> 1.3.5)
23
- rack-cache (~> 1.1)
24
- rack-mount (~> 0.8.2)
25
- rack-test (~> 0.6.1)
26
- sprockets (~> 2.0.3)
27
- activemodel (3.1.3)
28
- activesupport (= 3.1.3)
29
- builder (~> 3.0.0)
30
- i18n (~> 0.6)
31
- activerecord (3.1.3)
32
- activemodel (= 3.1.3)
33
- activesupport (= 3.1.3)
34
- arel (~> 2.2.1)
35
- tzinfo (~> 0.3.29)
36
- activeresource (3.1.3)
37
- activemodel (= 3.1.3)
38
- activesupport (= 3.1.3)
39
- activesupport (3.1.3)
40
- multi_json (~> 1.0)
13
+ abstract (1.0.0)
14
+ actionmailer (3.0.12)
15
+ actionpack (= 3.0.12)
16
+ mail (~> 2.2.19)
17
+ actionpack (3.0.12)
18
+ activemodel (= 3.0.12)
19
+ activesupport (= 3.0.12)
20
+ builder (~> 2.1.2)
21
+ erubis (~> 2.6.6)
22
+ i18n (~> 0.5.0)
23
+ rack (~> 1.2.5)
24
+ rack-mount (~> 0.6.14)
25
+ rack-test (~> 0.5.7)
26
+ tzinfo (~> 0.3.23)
27
+ activemodel (3.0.12)
28
+ activesupport (= 3.0.12)
29
+ builder (~> 2.1.2)
30
+ i18n (~> 0.5.0)
31
+ activerecord (3.0.12)
32
+ activemodel (= 3.0.12)
33
+ activesupport (= 3.0.12)
34
+ arel (~> 2.0.10)
35
+ tzinfo (~> 0.3.23)
36
+ activeresource (3.0.12)
37
+ activemodel (= 3.0.12)
38
+ activesupport (= 3.0.12)
39
+ activesupport (3.0.12)
41
40
  addressable (2.2.7)
42
- appraisal (0.4.0)
41
+ appraisal (0.4.1)
43
42
  bundler
44
43
  rake
45
- arel (2.2.1)
46
- builder (3.0.0)
44
+ arel (2.0.10)
45
+ builder (2.1.2)
47
46
  css_parser (1.2.6)
48
47
  addressable
49
48
  rdoc
50
49
  diff-lcs (1.1.3)
51
- erubis (2.7.0)
50
+ erubis (2.6.6)
51
+ abstract (>= 1.0.0)
52
52
  ffi (1.0.11)
53
53
  growl (1.0.3)
54
- guard (0.10.0)
54
+ guard (1.0.1)
55
55
  ffi (>= 0.5.0)
56
56
  thor (~> 0.14.6)
57
57
  guard-rspec (0.6.0)
58
58
  guard (>= 0.10.0)
59
59
  hike (1.2.1)
60
- i18n (0.6.0)
61
- json (1.6.4)
62
- mail (2.3.0)
60
+ i18n (0.5.0)
61
+ json (1.6.5)
62
+ mail (2.2.19)
63
+ activesupport (>= 2.3.6)
63
64
  i18n (>= 0.4.0)
64
65
  mime-types (~> 1.16)
65
66
  treetop (~> 1.4.8)
66
- mime-types (1.17.2)
67
- multi_json (1.0.4)
67
+ mime-types (1.18)
68
+ multi_json (1.1.0)
68
69
  nokogiri (1.5.2)
69
70
  polyglot (0.3.3)
70
- rack (1.3.6)
71
- rack-cache (1.1)
72
- rack (>= 0.4)
73
- rack-mount (0.8.3)
71
+ rack (1.2.5)
72
+ rack-mount (0.6.14)
74
73
  rack (>= 1.0.0)
75
- rack-ssl (1.3.2)
76
- rack
77
- rack-test (0.6.1)
74
+ rack-test (0.5.7)
78
75
  rack (>= 1.0)
79
- rails (3.1.3)
80
- actionmailer (= 3.1.3)
81
- actionpack (= 3.1.3)
82
- activerecord (= 3.1.3)
83
- activeresource (= 3.1.3)
84
- activesupport (= 3.1.3)
76
+ rails (3.0.12)
77
+ actionmailer (= 3.0.12)
78
+ actionpack (= 3.0.12)
79
+ activerecord (= 3.0.12)
80
+ activeresource (= 3.0.12)
81
+ activesupport (= 3.0.12)
85
82
  bundler (~> 1.0)
86
- railties (= 3.1.3)
87
- railties (3.1.3)
88
- actionpack (= 3.1.3)
89
- activesupport (= 3.1.3)
90
- rack-ssl (~> 1.3.2)
83
+ railties (= 3.0.12)
84
+ railties (3.0.12)
85
+ actionpack (= 3.0.12)
86
+ activesupport (= 3.0.12)
91
87
  rake (>= 0.8.7)
92
88
  rdoc (~> 3.4)
93
- thor (~> 0.14.6)
89
+ thor (~> 0.14.4)
94
90
  rake (0.9.2.2)
95
- rb-fsevent (0.9.0.pre5)
91
+ rb-fsevent (0.9.0)
96
92
  rdoc (3.12)
97
93
  json (~> 1.4)
98
- rspec (2.7.0)
99
- rspec-core (~> 2.7.0)
100
- rspec-expectations (~> 2.7.0)
101
- rspec-mocks (~> 2.7.0)
102
- rspec-core (2.7.1)
103
- rspec-expectations (2.7.0)
104
- diff-lcs (~> 1.1.2)
105
- rspec-mocks (2.7.0)
106
- rspec-rails (2.7.0)
107
- actionpack (~> 3.0)
108
- activesupport (~> 3.0)
109
- railties (~> 3.0)
110
- rspec (~> 2.7.0)
111
- sprockets (2.0.3)
94
+ rspec (2.9.0)
95
+ rspec-core (~> 2.9.0)
96
+ rspec-expectations (~> 2.9.0)
97
+ rspec-mocks (~> 2.9.0)
98
+ rspec-core (2.9.0)
99
+ rspec-expectations (2.9.0)
100
+ diff-lcs (~> 1.1.3)
101
+ rspec-mocks (2.9.0)
102
+ rspec-rails (2.9.0)
103
+ actionpack (>= 3.0)
104
+ activesupport (>= 3.0)
105
+ railties (>= 3.0)
106
+ rspec (~> 2.9.0)
107
+ sprockets (2.3.1)
112
108
  hike (~> 1.2)
109
+ multi_json (~> 1.0)
113
110
  rack (~> 1.0)
114
111
  tilt (~> 1.1, != 1.3.0)
115
112
  thor (0.14.6)
@@ -117,7 +114,7 @@ GEM
117
114
  treetop (1.4.10)
118
115
  polyglot
119
116
  polyglot (>= 0.3.1)
120
- tzinfo (0.3.31)
117
+ tzinfo (0.3.32)
121
118
 
122
119
  PLATFORMS
123
120
  ruby
data/README.md CHANGED
@@ -170,20 +170,20 @@ Bugs / TODO
170
170
  FAQ
171
171
  ---
172
172
 
173
- ## I'm getting segmentation faults (or other C-like problems)! What should I do? ##
173
+ ### I'm getting segmentation faults (or other C-like problems)! What should I do? ###
174
174
 
175
175
  Roadie uses Nokogiri to parse the HTML of your email, so any C-like problems like segfaults are likely in that end. The best way to fix this is to first upgrade libxml2 on your system and then reinstall Nokogiri.
176
176
  Instructions on how to do this on most platforms, see [Nokogiri's official install guide](http://nokogiri.org/tutorials/installing_nokogiri.html).
177
177
 
178
- ## My `:hover` selectors don't work. How can I fix them? ##
178
+ ### My `:hover` selectors don't work. How can I fix them? ###
179
179
 
180
180
  Put any styles using `:hover` in a separate stylesheet and make sure it is ignored. (See "Ignoring stylesheets" above)
181
181
 
182
- ## My `@media` queries don't work. How can I fix them? ##
182
+ ### My `@media` queries don't work. How can I fix them? ###
183
183
 
184
184
  Put any styles using them in a separate stylesheet and make sure it is ignored. (See "Ignoring stylesheets" above)
185
185
 
186
- ## My vendor-specific styles don't work. How can I fix them? ##
186
+ ### My vendor-specific styles don't work. How can I fix them? ###
187
187
 
188
188
  Put any styles using them in a separate stylesheet and make sure it is ignored. (See "Ignoring stylesheets" above)
189
189
 
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.0)
4
+ roadie (2.3.1)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
@@ -11,34 +11,34 @@ GEM
11
11
  remote: http://rubygems.org/
12
12
  specs:
13
13
  abstract (1.0.0)
14
- actionmailer (3.0.11)
15
- actionpack (= 3.0.11)
14
+ actionmailer (3.0.12)
15
+ actionpack (= 3.0.12)
16
16
  mail (~> 2.2.19)
17
- actionpack (3.0.11)
18
- activemodel (= 3.0.11)
19
- activesupport (= 3.0.11)
17
+ actionpack (3.0.12)
18
+ activemodel (= 3.0.12)
19
+ activesupport (= 3.0.12)
20
20
  builder (~> 2.1.2)
21
21
  erubis (~> 2.6.6)
22
22
  i18n (~> 0.5.0)
23
- rack (~> 1.2.1)
23
+ rack (~> 1.2.5)
24
24
  rack-mount (~> 0.6.14)
25
25
  rack-test (~> 0.5.7)
26
26
  tzinfo (~> 0.3.23)
27
- activemodel (3.0.11)
28
- activesupport (= 3.0.11)
27
+ activemodel (3.0.12)
28
+ activesupport (= 3.0.12)
29
29
  builder (~> 2.1.2)
30
30
  i18n (~> 0.5.0)
31
- activerecord (3.0.11)
32
- activemodel (= 3.0.11)
33
- activesupport (= 3.0.11)
31
+ activerecord (3.0.12)
32
+ activemodel (= 3.0.12)
33
+ activesupport (= 3.0.12)
34
34
  arel (~> 2.0.10)
35
35
  tzinfo (~> 0.3.23)
36
- activeresource (3.0.11)
37
- activemodel (= 3.0.11)
38
- activesupport (= 3.0.11)
39
- activesupport (3.0.11)
36
+ activeresource (3.0.12)
37
+ activemodel (= 3.0.12)
38
+ activesupport (= 3.0.12)
39
+ activesupport (3.0.12)
40
40
  addressable (2.2.7)
41
- appraisal (0.4.0)
41
+ appraisal (0.4.1)
42
42
  bundler
43
43
  rake
44
44
  arel (2.0.10)
@@ -51,13 +51,13 @@ GEM
51
51
  abstract (>= 1.0.0)
52
52
  hike (1.2.1)
53
53
  i18n (0.5.0)
54
- json (1.6.4)
54
+ json (1.6.5)
55
55
  mail (2.2.19)
56
56
  activesupport (>= 2.3.6)
57
57
  i18n (>= 0.4.0)
58
58
  mime-types (~> 1.16)
59
59
  treetop (~> 1.4.8)
60
- mime-types (1.17.2)
60
+ mime-types (1.18)
61
61
  multi_json (1.1.0)
62
62
  nokogiri (1.5.2)
63
63
  polyglot (0.3.3)
@@ -66,36 +66,36 @@ GEM
66
66
  rack (>= 1.0.0)
67
67
  rack-test (0.5.7)
68
68
  rack (>= 1.0)
69
- rails (3.0.11)
70
- actionmailer (= 3.0.11)
71
- actionpack (= 3.0.11)
72
- activerecord (= 3.0.11)
73
- activeresource (= 3.0.11)
74
- activesupport (= 3.0.11)
69
+ rails (3.0.12)
70
+ actionmailer (= 3.0.12)
71
+ actionpack (= 3.0.12)
72
+ activerecord (= 3.0.12)
73
+ activeresource (= 3.0.12)
74
+ activesupport (= 3.0.12)
75
75
  bundler (~> 1.0)
76
- railties (= 3.0.11)
77
- railties (3.0.11)
78
- actionpack (= 3.0.11)
79
- activesupport (= 3.0.11)
76
+ railties (= 3.0.12)
77
+ railties (3.0.12)
78
+ actionpack (= 3.0.12)
79
+ activesupport (= 3.0.12)
80
80
  rake (>= 0.8.7)
81
81
  rdoc (~> 3.4)
82
82
  thor (~> 0.14.4)
83
83
  rake (0.9.2.2)
84
84
  rdoc (3.12)
85
85
  json (~> 1.4)
86
- rspec (2.7.0)
87
- rspec-core (~> 2.7.0)
88
- rspec-expectations (~> 2.7.0)
89
- rspec-mocks (~> 2.7.0)
90
- rspec-core (2.7.1)
91
- rspec-expectations (2.7.0)
92
- diff-lcs (~> 1.1.2)
93
- rspec-mocks (2.7.0)
94
- rspec-rails (2.7.0)
95
- actionpack (~> 3.0)
96
- activesupport (~> 3.0)
97
- railties (~> 3.0)
98
- rspec (~> 2.7.0)
86
+ rspec (2.9.0)
87
+ rspec-core (~> 2.9.0)
88
+ rspec-expectations (~> 2.9.0)
89
+ rspec-mocks (~> 2.9.0)
90
+ rspec-core (2.9.0)
91
+ rspec-expectations (2.9.0)
92
+ diff-lcs (~> 1.1.3)
93
+ rspec-mocks (2.9.0)
94
+ rspec-rails (2.9.0)
95
+ actionpack (>= 3.0)
96
+ activesupport (>= 3.0)
97
+ railties (>= 3.0)
98
+ rspec (~> 2.9.0)
99
99
  sprockets (2.3.1)
100
100
  hike (~> 1.2)
101
101
  multi_json (~> 1.0)
@@ -106,7 +106,7 @@ GEM
106
106
  treetop (1.4.10)
107
107
  polyglot
108
108
  polyglot (>= 0.3.1)
109
- tzinfo (0.3.31)
109
+ tzinfo (0.3.32)
110
110
 
111
111
  PLATFORMS
112
112
  ruby
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.0)
4
+ roadie (2.3.1)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
@@ -10,39 +10,39 @@ PATH
10
10
  GEM
11
11
  remote: http://rubygems.org/
12
12
  specs:
13
- actionmailer (3.1.3)
14
- actionpack (= 3.1.3)
13
+ actionmailer (3.1.4)
14
+ actionpack (= 3.1.4)
15
15
  mail (~> 2.3.0)
16
- actionpack (3.1.3)
17
- activemodel (= 3.1.3)
18
- activesupport (= 3.1.3)
16
+ actionpack (3.1.4)
17
+ activemodel (= 3.1.4)
18
+ activesupport (= 3.1.4)
19
19
  builder (~> 3.0.0)
20
20
  erubis (~> 2.7.0)
21
21
  i18n (~> 0.6)
22
- rack (~> 1.3.5)
22
+ rack (~> 1.3.6)
23
23
  rack-cache (~> 1.1)
24
24
  rack-mount (~> 0.8.2)
25
25
  rack-test (~> 0.6.1)
26
26
  sprockets (~> 2.0.3)
27
- activemodel (3.1.3)
28
- activesupport (= 3.1.3)
27
+ activemodel (3.1.4)
28
+ activesupport (= 3.1.4)
29
29
  builder (~> 3.0.0)
30
30
  i18n (~> 0.6)
31
- activerecord (3.1.3)
32
- activemodel (= 3.1.3)
33
- activesupport (= 3.1.3)
34
- arel (~> 2.2.1)
31
+ activerecord (3.1.4)
32
+ activemodel (= 3.1.4)
33
+ activesupport (= 3.1.4)
34
+ arel (~> 2.2.3)
35
35
  tzinfo (~> 0.3.29)
36
- activeresource (3.1.3)
37
- activemodel (= 3.1.3)
38
- activesupport (= 3.1.3)
39
- activesupport (3.1.3)
36
+ activeresource (3.1.4)
37
+ activemodel (= 3.1.4)
38
+ activesupport (= 3.1.4)
39
+ activesupport (3.1.4)
40
40
  multi_json (~> 1.0)
41
41
  addressable (2.2.7)
42
- appraisal (0.4.0)
42
+ appraisal (0.4.1)
43
43
  bundler
44
44
  rake
45
- arel (2.2.1)
45
+ arel (2.2.3)
46
46
  builder (3.0.0)
47
47
  css_parser (1.2.6)
48
48
  addressable
@@ -51,17 +51,17 @@ GEM
51
51
  erubis (2.7.0)
52
52
  hike (1.2.1)
53
53
  i18n (0.6.0)
54
- json (1.6.4)
55
- mail (2.3.0)
54
+ json (1.6.5)
55
+ mail (2.3.3)
56
56
  i18n (>= 0.4.0)
57
57
  mime-types (~> 1.16)
58
58
  treetop (~> 1.4.8)
59
- mime-types (1.17.2)
60
- multi_json (1.0.4)
59
+ mime-types (1.18)
60
+ multi_json (1.1.0)
61
61
  nokogiri (1.5.2)
62
62
  polyglot (0.3.3)
63
63
  rack (1.3.6)
64
- rack-cache (1.1)
64
+ rack-cache (1.2)
65
65
  rack (>= 0.4)
66
66
  rack-mount (0.8.3)
67
67
  rack (>= 1.0.0)
@@ -69,17 +69,17 @@ GEM
69
69
  rack
70
70
  rack-test (0.6.1)
71
71
  rack (>= 1.0)
72
- rails (3.1.3)
73
- actionmailer (= 3.1.3)
74
- actionpack (= 3.1.3)
75
- activerecord (= 3.1.3)
76
- activeresource (= 3.1.3)
77
- activesupport (= 3.1.3)
72
+ rails (3.1.4)
73
+ actionmailer (= 3.1.4)
74
+ actionpack (= 3.1.4)
75
+ activerecord (= 3.1.4)
76
+ activeresource (= 3.1.4)
77
+ activesupport (= 3.1.4)
78
78
  bundler (~> 1.0)
79
- railties (= 3.1.3)
80
- railties (3.1.3)
81
- actionpack (= 3.1.3)
82
- activesupport (= 3.1.3)
79
+ railties (= 3.1.4)
80
+ railties (3.1.4)
81
+ actionpack (= 3.1.4)
82
+ activesupport (= 3.1.4)
83
83
  rack-ssl (~> 1.3.2)
84
84
  rake (>= 0.8.7)
85
85
  rdoc (~> 3.4)
@@ -87,19 +87,19 @@ GEM
87
87
  rake (0.9.2.2)
88
88
  rdoc (3.12)
89
89
  json (~> 1.4)
90
- rspec (2.7.0)
91
- rspec-core (~> 2.7.0)
92
- rspec-expectations (~> 2.7.0)
93
- rspec-mocks (~> 2.7.0)
94
- rspec-core (2.7.1)
95
- rspec-expectations (2.7.0)
96
- diff-lcs (~> 1.1.2)
97
- rspec-mocks (2.7.0)
98
- rspec-rails (2.7.0)
99
- actionpack (~> 3.0)
100
- activesupport (~> 3.0)
101
- railties (~> 3.0)
102
- rspec (~> 2.7.0)
90
+ rspec (2.9.0)
91
+ rspec-core (~> 2.9.0)
92
+ rspec-expectations (~> 2.9.0)
93
+ rspec-mocks (~> 2.9.0)
94
+ rspec-core (2.9.0)
95
+ rspec-expectations (2.9.0)
96
+ diff-lcs (~> 1.1.3)
97
+ rspec-mocks (2.9.0)
98
+ rspec-rails (2.9.0)
99
+ actionpack (>= 3.0)
100
+ activesupport (>= 3.0)
101
+ railties (>= 3.0)
102
+ rspec (~> 2.9.0)
103
103
  sprockets (2.0.3)
104
104
  hike (~> 1.2)
105
105
  rack (~> 1.0)
@@ -109,7 +109,7 @@ GEM
109
109
  treetop (1.4.10)
110
110
  polyglot
111
111
  polyglot (>= 0.3.1)
112
- tzinfo (0.3.31)
112
+ tzinfo (0.3.32)
113
113
 
114
114
  PLATFORMS
115
115
  ruby
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.0)
4
+ roadie (2.3.1)
5
5
  actionmailer (> 3.0.0, < 3.3.0)
6
6
  css_parser
7
7
  nokogiri (>= 1.4.4)
@@ -10,40 +10,38 @@ PATH
10
10
  GEM
11
11
  remote: http://rubygems.org/
12
12
  specs:
13
- actionmailer (3.2.0.rc1)
14
- actionpack (= 3.2.0.rc1)
15
- mail (~> 2.3.0)
16
- actionpack (3.2.0.rc1)
17
- activemodel (= 3.2.0.rc1)
18
- activesupport (= 3.2.0.rc1)
13
+ actionmailer (3.2.2)
14
+ actionpack (= 3.2.2)
15
+ mail (~> 2.4.0)
16
+ actionpack (3.2.2)
17
+ activemodel (= 3.2.2)
18
+ activesupport (= 3.2.2)
19
19
  builder (~> 3.0.0)
20
20
  erubis (~> 2.7.0)
21
- i18n (~> 0.6)
22
- journey (~> 1.0.0.rc1)
23
- rack (~> 1.3.5)
21
+ journey (~> 1.0.1)
22
+ rack (~> 1.4.0)
24
23
  rack-cache (~> 1.1)
25
24
  rack-test (~> 0.6.1)
26
25
  sprockets (~> 2.1.2)
27
- activemodel (3.2.0.rc1)
28
- activesupport (= 3.2.0.rc1)
26
+ activemodel (3.2.2)
27
+ activesupport (= 3.2.2)
29
28
  builder (~> 3.0.0)
30
- i18n (~> 0.6)
31
- activerecord (3.2.0.rc1)
32
- activemodel (= 3.2.0.rc1)
33
- activesupport (= 3.2.0.rc1)
34
- arel (~> 3.0.0.rc1)
29
+ activerecord (3.2.2)
30
+ activemodel (= 3.2.2)
31
+ activesupport (= 3.2.2)
32
+ arel (~> 3.0.2)
35
33
  tzinfo (~> 0.3.29)
36
- activeresource (3.2.0.rc1)
37
- activemodel (= 3.2.0.rc1)
38
- activesupport (= 3.2.0.rc1)
39
- activesupport (3.2.0.rc1)
34
+ activeresource (3.2.2)
35
+ activemodel (= 3.2.2)
36
+ activesupport (= 3.2.2)
37
+ activesupport (3.2.2)
40
38
  i18n (~> 0.6)
41
39
  multi_json (~> 1.0)
42
40
  addressable (2.2.7)
43
- appraisal (0.4.0)
41
+ appraisal (0.4.1)
44
42
  bundler
45
43
  rake
46
- arel (3.0.0.rc1)
44
+ arel (3.0.2)
47
45
  builder (3.0.0)
48
46
  css_parser (1.2.6)
49
47
  addressable
@@ -52,34 +50,34 @@ GEM
52
50
  erubis (2.7.0)
53
51
  hike (1.2.1)
54
52
  i18n (0.6.0)
55
- journey (1.0.0.rc4)
56
- json (1.6.4)
57
- mail (2.3.0)
53
+ journey (1.0.3)
54
+ json (1.6.5)
55
+ mail (2.4.4)
58
56
  i18n (>= 0.4.0)
59
57
  mime-types (~> 1.16)
60
58
  treetop (~> 1.4.8)
61
- mime-types (1.17.2)
62
- multi_json (1.0.4)
59
+ mime-types (1.18)
60
+ multi_json (1.1.0)
63
61
  nokogiri (1.5.2)
64
62
  polyglot (0.3.3)
65
- rack (1.3.6)
66
- rack-cache (1.1)
63
+ rack (1.4.1)
64
+ rack-cache (1.2)
67
65
  rack (>= 0.4)
68
66
  rack-ssl (1.3.2)
69
67
  rack
70
68
  rack-test (0.6.1)
71
69
  rack (>= 1.0)
72
- rails (3.2.0.rc1)
73
- actionmailer (= 3.2.0.rc1)
74
- actionpack (= 3.2.0.rc1)
75
- activerecord (= 3.2.0.rc1)
76
- activeresource (= 3.2.0.rc1)
77
- activesupport (= 3.2.0.rc1)
70
+ rails (3.2.2)
71
+ actionmailer (= 3.2.2)
72
+ actionpack (= 3.2.2)
73
+ activerecord (= 3.2.2)
74
+ activeresource (= 3.2.2)
75
+ activesupport (= 3.2.2)
78
76
  bundler (~> 1.0)
79
- railties (= 3.2.0.rc1)
80
- railties (3.2.0.rc1)
81
- actionpack (= 3.2.0.rc1)
82
- activesupport (= 3.2.0.rc1)
77
+ railties (= 3.2.2)
78
+ railties (3.2.2)
79
+ actionpack (= 3.2.2)
80
+ activesupport (= 3.2.2)
83
81
  rack-ssl (~> 1.3.2)
84
82
  rake (>= 0.8.7)
85
83
  rdoc (~> 3.4)
@@ -87,19 +85,19 @@ GEM
87
85
  rake (0.9.2.2)
88
86
  rdoc (3.12)
89
87
  json (~> 1.4)
90
- rspec (2.7.0)
91
- rspec-core (~> 2.7.0)
92
- rspec-expectations (~> 2.7.0)
93
- rspec-mocks (~> 2.7.0)
94
- rspec-core (2.7.1)
95
- rspec-expectations (2.7.0)
96
- diff-lcs (~> 1.1.2)
97
- rspec-mocks (2.7.0)
98
- rspec-rails (2.7.0)
99
- actionpack (~> 3.0)
100
- activesupport (~> 3.0)
101
- railties (~> 3.0)
102
- rspec (~> 2.7.0)
88
+ rspec (2.9.0)
89
+ rspec-core (~> 2.9.0)
90
+ rspec-expectations (~> 2.9.0)
91
+ rspec-mocks (~> 2.9.0)
92
+ rspec-core (2.9.0)
93
+ rspec-expectations (2.9.0)
94
+ diff-lcs (~> 1.1.3)
95
+ rspec-mocks (2.9.0)
96
+ rspec-rails (2.9.0)
97
+ actionpack (>= 3.0)
98
+ activesupport (>= 3.0)
99
+ railties (>= 3.0)
100
+ rspec (~> 2.9.0)
103
101
  sprockets (2.1.2)
104
102
  hike (~> 1.2)
105
103
  rack (~> 1.0)
@@ -109,7 +107,7 @@ GEM
109
107
  treetop (1.4.10)
110
108
  polyglot
111
109
  polyglot (>= 0.3.1)
112
- tzinfo (0.3.31)
110
+ tzinfo (0.3.32)
113
111
 
114
112
  PLATFORMS
115
113
  ruby
data/lib/roadie.rb CHANGED
@@ -29,7 +29,7 @@ module Roadie
29
29
  def current_provider
30
30
  return config.roadie.provider if config.roadie.provider
31
31
 
32
- if config.assets.enabled
32
+ if config.respond_to?(:assets) and config.assets and config.assets.enabled
33
33
  AssetPipelineProvider.new
34
34
  else
35
35
  FilesystemProvider.new
data/lib/roadie/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Roadie
2
- VERSION = '2.3.0'
2
+ VERSION = '2.3.1'
3
3
  end
data/spec/lib/roadie_spec.rb CHANGED
@@ -24,16 +24,34 @@ describe Roadie do
24
24
 
25
25
  describe ".current_provider" do
26
26
  let(:provider) { double("provider instance") }
27
+ let(:config) { Roadie.app.config }
27
28
 
28
29
  context "with a set provider in the config" do
29
30
  it "uses the set provider" do
30
- Roadie.app.config.roadie.provider = provider
31
+ config.roadie.provider = provider
32
+ Roadie.current_provider.should == provider
33
+ end
34
+ end
35
+
36
+ context "when Rails' asset pipeline is not present" do
37
+ before(:each) do
38
+ # Turns out it's pretty much impossible to work with Rails.application.config
39
+ # in a nice way; it changed quite a lot since 3.0. There's also no way of
40
+ # removing a configuration key after it's set, we cannot remove the assets
41
+ # config completely to trigger the normal error triggered in a 3.0 app (NoMethodError)
42
+ # We'll simulate it by mutating it in an ugly way for this test
43
+ config.stub(:assets).and_raise(NoMethodError)
44
+ config.stub(:respond_to?).with(:assets) { false }
45
+ end
46
+
47
+ it "uses the FilesystemProvider" do
48
+ Roadie::FilesystemProvider.should_receive(:new).and_return(provider)
31
49
  Roadie.current_provider.should == provider
32
50
  end
33
51
  end
34
52
 
35
53
  context "with rails' asset pipeline enabled" do
36
- before(:each) { Roadie.app.config.assets.enabled = true }
54
+ before(:each) { config.assets.enabled = true }
37
55
 
38
56
  it "uses the AssetPipelineProvider" do
39
57
  Roadie::AssetPipelineProvider.should_receive(:new).and_return(provider)
@@ -42,7 +60,7 @@ describe Roadie do
42
60
  end
43
61
 
44
62
  context "with rails' asset pipeline disabled" do
45
- before(:each) { Roadie.app.config.assets.enabled = false }
63
+ before(:each) { config.assets.enabled = false }
46
64
 
47
65
  it "uses the FilesystemProvider" do
48
66
  Roadie::FilesystemProvider.should_receive(:new).and_return(provider)
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.0
4
+ version: 2.3.1
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-20 00:00:00.000000000 Z
12
+ date: 2012-03-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri
16
- requirement: &70286498619780 !ruby/object:Gem::Requirement
16
+ requirement: &70347165864000 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.4.4
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70286498619780
24
+ version_requirements: *70347165864000
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: css_parser
27
- requirement: &70286498618020 !ruby/object:Gem::Requirement
27
+ requirement: &70347165863580 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70286498618020
35
+ version_requirements: *70347165863580
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: actionmailer
38
- requirement: &70286498616720 !ruby/object:Gem::Requirement
38
+ requirement: &70347165879380 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>'
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: 3.3.0
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *70286498616720
49
+ version_requirements: *70347165879380
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: sprockets
52
- requirement: &70286498631180 !ruby/object:Gem::Requirement
52
+ requirement: &70347165878700 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
57
57
  version: '0'
58
58
  type: :runtime
59
59
  prerelease: false
60
- version_requirements: *70286498631180
60
+ version_requirements: *70347165878700
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: rails
63
- requirement: &70286498625240 !ruby/object:Gem::Requirement
63
+ requirement: &70347165878240 !ruby/object:Gem::Requirement
64
64
  none: false
65
65
  requirements:
66
66
  - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
68
68
  version: '0'
69
69
  type: :development
70
70
  prerelease: false
71
- version_requirements: *70286498625240
71
+ version_requirements: *70347165878240
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: rspec-rails
74
- requirement: &70286498624180 !ruby/object:Gem::Requirement
74
+ requirement: &70347165877820 !ruby/object:Gem::Requirement
75
75
  none: false
76
76
  requirements:
77
77
  - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
79
79
  version: '0'
80
80
  type: :development
81
81
  prerelease: false
82
- version_requirements: *70286498624180
82
+ version_requirements: *70347165877820
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: appraisal
85
- requirement: &70286498623560 !ruby/object:Gem::Requirement
85
+ requirement: &70347165877400 !ruby/object:Gem::Requirement
86
86
  none: false
87
87
  requirements:
88
88
  - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
90
90
  version: '0'
91
91
  type: :development
92
92
  prerelease: false
93
- version_requirements: *70286498623560
93
+ version_requirements: *70347165877400
94
94
  description: Roadie tries to make sending HTML emails a little less painful in Rails
95
95
  3 by inlining stylesheets and rewrite relative URLs for you.
96
96
  email:
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
168
168
  version: '0'
169
169
  segments:
170
170
  - 0
171
- hash: -3760537061728724086
171
+ hash: 3157574064731637945
172
172
  required_rubygems_version: !ruby/object:Gem::Requirement
173
173
  none: false
174
174
  requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
177
177
  version: '0'
178
178
  segments:
179
179
  - 0
180
- hash: -3760537061728724086
180
+ hash: 3157574064731637945
181
181
  requirements: []
182
182
  rubyforge_project:
183
183
  rubygems_version: 1.8.15