Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove warning "URI.unescape is obsolete" from actionpack.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  • Loading branch information...
commit 2f326b7f27349b933fe617d83b3f80c6573ce5d8 1 parent 8be911c
@miloops miloops authored spastorino committed
View
1  actionpack/lib/action_controller.rb
@@ -8,6 +8,7 @@ module ActionController
autoload :Caching
autoload :Metal
autoload :Middleware
+ autoload :UriParser
autoload_under "metal" do
autoload :Compatibility
View
6 actionpack/lib/action_controller/caching/actions.rb
@@ -141,6 +141,8 @@ def filter(controller)
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 @@ def normalize!(path)
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
View
3  actionpack/lib/action_controller/caching/pages.rb
@@ -1,5 +1,4 @@
require 'fileutils'
-require 'uri'
require 'active_support/core_ext/class/attribute_accessors'
module ActionController #:nodoc:
@@ -58,6 +57,8 @@ module Pages
end
module ClassMethods
+ include UriParser
+
# Expires the page that was cached with the +path+ as a key. Example:
# expire_page "/lists/show"
def expire_page(path)
View
4 actionpack/lib/action_controller/test_case.rb
@@ -129,10 +129,6 @@ def to_s() join '/' end
def self.new_escaped(strings)
new strings.collect {|str| uri_parser.unescape str}
end
-
- def uri_parser
- @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
- end
end
def assign_parameters(routes, controller_path, action, parameters = {})
View
9 actionpack/lib/action_controller/uri_parser.rb
@@ -0,0 +1,9 @@
+require 'uri'
+
+module ActionController #:nodoc:
+ module UriParser
+ def uri_parser
+ @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
+ end
+ end
+end
View
6 actionpack/lib/action_dispatch/routing/route_set.rb
@@ -5,6 +5,8 @@
module ActionDispatch
module Routing
class RouteSet #:nodoc:
+ include ActionController::UriParser
+
PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
class Dispatcher #:nodoc:
@@ -68,10 +70,6 @@ def merge_default_action!(params)
def split_glob_param!(params)
params[@glob_param] = params[@glob_param].split('/').map { |v| uri_parser.unescape(v) }
end
-
- def uri_parser
- @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
- end
end
# A NamedRouteCollection instance is a collection of named routes, and also

1 comment on commit 2f326b7

@josevalim
Owner

This seems to me more like an Active Support concern (note we will need this same logic in Active Resource). Maybe add URI.parser to active_support/core_ext/uri.rb and make them all depend on it?

Please sign in to comment.
Something went wrong with that request. Please try again.