do not use URI.encode on 1.9 (deprecated)

esimionato · Mar 18, 2012 · f2bc346 · f2bc346
1 parent 0fb73fc
commit f2bc346
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -1324,9 +1324,11 @@ def compile(path)
         end
       end
 
+      URI = ::URI.const_defined?(:Parser) ? ::URI::Parser.new : ::URI
+
       def encoded(char)
-        enc = URI.encode(char)
-        enc = "(?:#{Regexp.escape enc}|#{URI.encode char, /./})" if enc == char
+        enc = URI.escape(char)
+        enc = "(?:#{Regexp.escape enc}|#{URI.escape char, /./})" if enc == char
         enc = "(?:#{enc}|#{encoded('+')})" if char == " "
         enc
       end