Restore _escaped function to using URI::PATTERN::RESERVED

This ensures that the issue with colons in page links
(like on the Ruby site) still works, though it possibly
breaks non-ASCII page names.

Author: tjgrathwell

README.md

@@ -40,7 +40,7 @@ To server sites from another locale (say, "es" or Spanish)...
 
 The server listens on `0.0.0.0:9292`.
 
-Now you have to setup subdomain for the site. If you have Pow, run:
+Now you have to set up subdomain mappings for the site. If you have Pow, run:
 
     $ echo 9292 > ~/.pow/railsbridge # works for any subdomain
 

app.rb

@@ -29,7 +29,7 @@ class InstallFest < Sinatra::Application   # todo: use Sinatra::Base instead, wi
   AVAILABLE_LOCALES = %w(en es)
 
   configure do
-    I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.load_path = Dir[File.join(settings.root, 'locales', '*.yml')]
     I18n.backend.load_translations
 

lib/doc_page.rb

@@ -124,7 +124,9 @@ def body_content
         # Encode page name and fragment name separately so that
         # the fragment indicator '#' won't be escaped.
         page_name, fragment = @back.split('#')
-        back_url = [URI.escape(page_name), URI.escape(fragment)].join('#')
+        url_components = [URI.escape(page_name, URI::PATTERN::RESERVED)]
+        url_components << URI.escape(fragment, URI::PATTERN::RESERVED) if fragment
+        back_url = url_components.join('#')
 
         div.back {
           text I18n.t("general.back_to") + " "

lib/step.rb

@@ -107,7 +107,7 @@ def link_without_toc name
   end
 
   def _escaped str
-    URI.escape(str)
+    URI.escape(str, URI::PATTERN::RESERVED)
   end
 
   def simple_link name, options={}