aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching/actions.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-09-27 15:13:11 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2010-09-27 16:43:04 -0300
commit2f326b7f27349b933fe617d83b3f80c6573ce5d8 (patch)
treecea35ce13fe257fdad5c642681a2df0e4ffdcac2 /actionpack/lib/action_controller/caching/actions.rb
parent8be911c698aadd389b1607b4dbcea47001761536 (diff)
downloadrails-2f326b7f27349b933fe617d83b3f80c6573ce5d8.tar.gz
rails-2f326b7f27349b933fe617d83b3f80c6573ce5d8.tar.bz2
rails-2f326b7f27349b933fe617d83b3f80c6573ce5d8.zip
Remove warning "URI.unescape is obsolete" from actionpack.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
-rw-r--r--actionpack/lib/action_controller/caching/actions.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index e00f4a7b1d..cd352f69fc 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -141,6 +141,8 @@ module ActionController #:nodoc:
end
class ActionCachePath
+ include UriParser
+
attr_reader :path, :extension
# If +infer_extension+ is true, the cache path extension is looked up from the request's
@@ -163,10 +165,6 @@ module ActionController #:nodoc:
path << ".#{extension}" if extension and !path.ends_with?(extension)
uri_parser.unescape(path)
end
-
- def uri_parser
- @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
- end
end
end
end