aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching/actions.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-09-27 20:57:26 -0300
committerEmilio Tagua <miloops@gmail.com>2010-09-27 20:57:26 -0300
commit197a995bc548e206bb907c40d75f8ed70fa5a923 (patch)
treecbfccffef28b604f2cf006e008e779189abed66b /actionpack/lib/action_controller/caching/actions.rb
parent8adb24016d76a2257b79f4566de66e1b88e56c71 (diff)
downloadrails-197a995bc548e206bb907c40d75f8ed70fa5a923.tar.gz
rails-197a995bc548e206bb907c40d75f8ed70fa5a923.tar.bz2
rails-197a995bc548e206bb907c40d75f8ed70fa5a923.zip
Move uri parser to AS as URI.parser method to reuse it in AP and ARes.
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
-rw-r--r--actionpack/lib/action_controller/caching/actions.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index cd352f69fc..d69d96b974 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -141,8 +141,6 @@ 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,7 +161,7 @@ module ActionController #:nodoc:
def normalize!(path)
path << 'index' if path[-1] == ?/
path << ".#{extension}" if extension and !path.ends_with?(extension)
- uri_parser.unescape(path)
+ URI.parser.unescape(path)
end
end
end