actionpack 3.1.0.rc4 → 3.1.0.rc5

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (40) hide show
  1. data/CHANGELOG +6 -0
  2. data/lib/abstract_controller/asset_paths.rb +1 -1
  3. data/lib/abstract_controller/layouts.rb +10 -8
  4. data/lib/action_controller/base.rb +13 -11
  5. data/lib/action_controller/caching/sweeping.rb +1 -0
  6. data/lib/action_controller/metal/redirecting.rb +1 -0
  7. data/lib/action_controller/metal/request_forgery_protection.rb +10 -9
  8. data/lib/action_controller/metal/responder.rb +5 -0
  9. data/lib/action_controller/metal/streaming.rb +6 -14
  10. data/lib/action_controller/railtie.rb +0 -1
  11. data/lib/action_controller/test_case.rb +19 -0
  12. data/lib/action_dispatch/http/upload.rb +11 -1
  13. data/lib/action_dispatch/middleware/cookies.rb +5 -0
  14. data/lib/action_dispatch/routing/mapper.rb +10 -9
  15. data/lib/action_dispatch/routing/polymorphic_routes.rb +4 -9
  16. data/lib/action_dispatch/testing/test_request.rb +1 -1
  17. data/lib/action_pack/version.rb +1 -1
  18. data/lib/action_view.rb +1 -0
  19. data/lib/action_view/asset_paths.rb +148 -0
  20. data/lib/action_view/base.rb +1 -1
  21. data/lib/action_view/helpers/asset_paths.rb +2 -78
  22. data/lib/action_view/helpers/asset_tag_helper.rb +8 -2
  23. data/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb +11 -12
  24. data/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb +2 -2
  25. data/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb +4 -3
  26. data/lib/action_view/helpers/cache_helper.rb +4 -6
  27. data/lib/action_view/helpers/controller_helper.rb +2 -0
  28. data/lib/action_view/helpers/date_helper.rb +47 -47
  29. data/lib/action_view/helpers/form_helper.rb +45 -11
  30. data/lib/action_view/helpers/form_tag_helper.rb +1 -1
  31. data/lib/action_view/helpers/number_helper.rb +3 -1
  32. data/lib/action_view/helpers/text_helper.rb +5 -6
  33. data/lib/action_view/helpers/translation_helper.rb +2 -2
  34. data/lib/action_view/helpers/url_helper.rb +11 -11
  35. data/lib/action_view/renderer/partial_renderer.rb +27 -22
  36. data/lib/sprockets/assets.rake +23 -0
  37. data/lib/sprockets/compressors.rb +21 -0
  38. data/lib/sprockets/helpers/rails_helper.rb +44 -19
  39. data/lib/sprockets/railtie.rb +29 -18
  40. metadata +29 -54
data/lib/sprockets/railtie.rb CHANGED
@@ -1,21 +1,14 @@
1
1
  module Sprockets
2
2
  autoload :Helpers, "sprockets/helpers"
3
+ autoload :LazyCompressor, "sprockets/compressors"
4
+ autoload :NullCompressor, "sprockets/compressors"
3
5
 
6
+ # TODO: Get rid of config.assets.enabled
4
7
  class Railtie < ::Rails::Railtie
5
- def self.using_coffee?
6
- require 'coffee-script'
7
- defined?(CoffeeScript)
8
- rescue LoadError
9
- false
10
- end
11
-
12
- config.app_generators.javascript_engine :coffee if using_coffee?
8
+ config.default_asset_host_protocol = :relative
13
9
 
14
- # Configure ActionController to use sprockets.
15
- initializer "sprockets.set_configs", :after => "action_controller.set_configs" do |app|
16
- ActiveSupport.on_load(:action_controller) do
17
- self.use_sprockets = app.config.assets.enabled
18
- end
10
+ rake_tasks do
11
+ load "sprockets/assets.rake"
19
12
  end
20
13
 
21
14
  # We need to configure this after initialization to ensure we collect
@@ -30,7 +23,7 @@ module Sprockets
30
23
 
31
24
  ActiveSupport.on_load(:action_view) do
32
25
  include ::Sprockets::Helpers::RailsHelper
33
-
26
+
34
27
  app.assets.context_class.instance_eval do
35
28
  include ::Sprockets::Helpers::RailsHelper
36
29
  end
@@ -54,12 +47,30 @@ module Sprockets
54
47
  env = Sprockets::Environment.new(app.root.to_s)
55
48
 
56
49
  env.static_root = File.join(app.root.join("public"), assets.prefix)
57
- env.paths.concat assets.paths
58
50
 
59
- env.logger = Rails.logger
51
+ if env.respond_to?(:append_path)
52
+ assets.paths.each { |path| env.append_path(path) }
53
+ else
54
+ env.paths.concat assets.paths
55
+ end
60
56
 
61
- env.js_compressor = expand_js_compressor(assets.js_compressor)
62
- env.css_compressor = expand_css_compressor(assets.css_compressor)
57
+ env.logger = ::Rails.logger
58
+
59
+ if env.respond_to?(:cache) && assets.cache_store != false
60
+ env.cache = ActiveSupport::Cache.lookup_store(assets.cache_store) || ::Rails.cache
61
+ end
62
+
63
+ if assets.compress
64
+ # temporarily hardcode default JS compressor to uglify. Soon, it will work
65
+ # the same as SCSS, where a default plugin sets the default.
66
+ unless assets.js_compressor == false
67
+ env.js_compressor = LazyCompressor.new { expand_js_compressor(assets.js_compressor || :uglifier) }
68
+ end
69
+
70
+ unless assets.css_compressor == false
71
+ env.css_compressor = LazyCompressor.new { expand_css_compressor(assets.css_compressor) }
72
+ end
73
+ end
63
74
 
64
75
  env
65
76
  end
metadata CHANGED
@@ -1,15 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actionpack
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424109
5
- prerelease: 6
4
+ prerelease: true
6
5
  segments:
7
6
  - 3
8
7
  - 1
9
8
  - 0
10
- - rc
11
- - 4
12
- version: 3.1.0.rc4
9
+ - rc5
10
+ version: 3.1.0.rc5
13
11
  platform: ruby
14
12
  authors:
15
13
  - David Heinemeier Hansson
@@ -17,69 +15,60 @@ autorequire:
17
15
  bindir: bin
18
16
  cert_chain: []
19
17
 
20
- date: 2011-06-09 00:00:00 Z
18
+ date: 2011-07-25 00:00:00 -07:00
19
+ default_executable:
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
23
22
  name: activesupport
24
23
  prerelease: false
25
24
  requirement: &id001 !ruby/object:Gem::Requirement
26
- none: false
27
25
  requirements:
28
26
  - - "="
29
27
  - !ruby/object:Gem::Version
30
- hash: 15424109
31
28
  segments:
32
29
  - 3
33
30
  - 1
34
31
  - 0
35
- - rc
36
- - 4
37
- version: 3.1.0.rc4
32
+ - rc5
33
+ version: 3.1.0.rc5
38
34
  type: :runtime
39
35
  version_requirements: *id001
40
36
  - !ruby/object:Gem::Dependency
41
37
  name: activemodel
42
38
  prerelease: false
43
39
  requirement: &id002 !ruby/object:Gem::Requirement
44
- none: false
45
40
  requirements:
46
41
  - - "="
47
42
  - !ruby/object:Gem::Version
48
- hash: 15424109
49
43
  segments:
50
44
  - 3
51
45
  - 1
52
46
  - 0
53
- - rc
54
- - 4
55
- version: 3.1.0.rc4
47
+ - rc5
48
+ version: 3.1.0.rc5
56
49
  type: :runtime
57
50
  version_requirements: *id002
58
51
  - !ruby/object:Gem::Dependency
59
52
  name: rack-cache
60
53
  prerelease: false
61
54
  requirement: &id003 !ruby/object:Gem::Requirement
62
- none: false
63
55
  requirements:
64
56
  - - ~>
65
57
  - !ruby/object:Gem::Version
66
- hash: 21
67
58
  segments:
68
59
  - 1
69
60
  - 0
70
- - 1
71
- version: 1.0.1
61
+ - 2
62
+ version: 1.0.2
72
63
  type: :runtime
73
64
  version_requirements: *id003
74
65
  - !ruby/object:Gem::Dependency
75
66
  name: builder
76
67
  prerelease: false
77
68
  requirement: &id004 !ruby/object:Gem::Requirement
78
- none: false
79
69
  requirements:
80
70
  - - ~>
81
71
  - !ruby/object:Gem::Version
82
- hash: 7
83
72
  segments:
84
73
  - 3
85
74
  - 0
@@ -91,11 +80,9 @@ dependencies:
91
80
  name: i18n
92
81
  prerelease: false
93
82
  requirement: &id005 !ruby/object:Gem::Requirement
94
- none: false
95
83
  requirements:
96
84
  - - ~>
97
85
  - !ruby/object:Gem::Version
98
- hash: 7
99
86
  segments:
100
87
  - 0
101
88
  - 6
@@ -106,27 +93,23 @@ dependencies:
106
93
  name: rack
107
94
  prerelease: false
108
95
  requirement: &id006 !ruby/object:Gem::Requirement
109
- none: false
110
96
  requirements:
111
97
  - - ~>
112
98
  - !ruby/object:Gem::Version
113
- hash: 27
114
99
  segments:
115
100
  - 1
116
101
  - 3
117
- - 0
118
- version: 1.3.0
102
+ - 1
103
+ version: 1.3.1
119
104
  type: :runtime
120
105
  version_requirements: *id006
121
106
  - !ruby/object:Gem::Dependency
122
107
  name: rack-test
123
108
  prerelease: false
124
109
  requirement: &id007 !ruby/object:Gem::Requirement
125
- none: false
126
110
  requirements:
127
111
  - - ~>
128
112
  - !ruby/object:Gem::Version
129
- hash: 7
130
113
  segments:
131
114
  - 0
132
115
  - 6
@@ -138,11 +121,9 @@ dependencies:
138
121
  name: rack-mount
139
122
  prerelease: false
140
123
  requirement: &id008 !ruby/object:Gem::Requirement
141
- none: false
142
124
  requirements:
143
125
  - - ~>
144
126
  - !ruby/object:Gem::Version
145
- hash: 61
146
127
  segments:
147
128
  - 0
148
129
  - 8
@@ -154,51 +135,45 @@ dependencies:
154
135
  name: sprockets
155
136
  prerelease: false
156
137
  requirement: &id009 !ruby/object:Gem::Requirement
157
- none: false
158
138
  requirements:
159
139
  - - ~>
160
140
  - !ruby/object:Gem::Version
161
- hash: 62196471
162
141
  segments:
163
142
  - 2
164
143
  - 0
165
144
  - 0
166
145
  - beta
167
- - 10
168
- version: 2.0.0.beta.10
146
+ - 12
147
+ version: 2.0.0.beta.12
169
148
  type: :runtime
170
149
  version_requirements: *id009
171
150
  - !ruby/object:Gem::Dependency
172
- name: tzinfo
151
+ name: erubis
173
152
  prerelease: false
174
153
  requirement: &id010 !ruby/object:Gem::Requirement
175
- none: false
176
154
  requirements:
177
155
  - - ~>
178
156
  - !ruby/object:Gem::Version
179
- hash: 37
180
157
  segments:
158
+ - 2
159
+ - 7
181
160
  - 0
182
- - 3
183
- - 27
184
- version: 0.3.27
161
+ version: 2.7.0
185
162
  type: :runtime
186
163
  version_requirements: *id010
187
164
  - !ruby/object:Gem::Dependency
188
- name: erubis
165
+ name: tzinfo
189
166
  prerelease: false
190
167
  requirement: &id011 !ruby/object:Gem::Requirement
191
- none: false
192
168
  requirements:
193
169
  - - ~>
194
170
  - !ruby/object:Gem::Version
195
- hash: 19
196
171
  segments:
197
- - 2
198
- - 7
199
172
  - 0
200
- version: 2.7.0
201
- type: :runtime
173
+ - 3
174
+ - 29
175
+ version: 0.3.29
176
+ type: :development
202
177
  version_requirements: *id011
203
178
  description: Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.
204
179
  email: david@loudthinking.com
@@ -335,6 +310,7 @@ files:
335
310
  - lib/action_dispatch.rb
336
311
  - lib/action_pack/version.rb
337
312
  - lib/action_pack.rb
313
+ - lib/action_view/asset_paths.rb
338
314
  - lib/action_view/base.rb
339
315
  - lib/action_view/buffers.rb
340
316
  - lib/action_view/context.rb
@@ -388,9 +364,12 @@ files:
388
364
  - lib/action_view/test_case.rb
389
365
  - lib/action_view/testing/resolvers.rb
390
366
  - lib/action_view.rb
367
+ - lib/sprockets/assets.rake
368
+ - lib/sprockets/compressors.rb
391
369
  - lib/sprockets/helpers/rails_helper.rb
392
370
  - lib/sprockets/helpers.rb
393
371
  - lib/sprockets/railtie.rb
372
+ has_rdoc: true
394
373
  homepage: http://www.rubyonrails.org
395
374
  licenses: []
396
375
 
@@ -400,22 +379,18 @@ rdoc_options: []
400
379
  require_paths:
401
380
  - lib
402
381
  required_ruby_version: !ruby/object:Gem::Requirement
403
- none: false
404
382
  requirements:
405
383
  - - ">="
406
384
  - !ruby/object:Gem::Version
407
- hash: 57
408
385
  segments:
409
386
  - 1
410
387
  - 8
411
388
  - 7
412
389
  version: 1.8.7
413
390
  required_rubygems_version: !ruby/object:Gem::Requirement
414
- none: false
415
391
  requirements:
416
392
  - - ">"
417
393
  - !ruby/object:Gem::Version
418
- hash: 25
419
394
  segments:
420
395
  - 1
421
396
  - 3
@@ -424,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
424
399
  requirements:
425
400
  - none
426
401
  rubyforge_project:
427
- rubygems_version: 1.8.2
402
+ rubygems_version: 1.3.6
428
403
  signing_key:
429
404
  specification_version: 3
430
405
  summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).