Fixes #22

camping · Jun 2, 2010 · 56a886d · 56a886d
1 parent 590c105
commit 56a886d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/camping-unabridged.rb b/lib/camping-unabridged.rb
@@ -186,7 +186,7 @@ def R(c,*g)
       raise "bad route" unless u = c.urls.find{|x|
         break x if x.scan(p).size == g.size && 
           /^#{x}\/?$/ =~ (x=g.inject(x){|x,a|
-            x.sub p,U.escape((a.to_param rescue a))})
+            x.sub p,U.escape((a.to_param rescue a))}.gsub(/\\(.)/){$1})
       }
       h.any?? u+"?"+U.build_query(h[0]) : u
     end

diff --git a/lib/camping.rb b/lib/camping.rb
@@ -5,7 +5,7 @@ class H<Hash;def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.
 to_s]:super end;undef id,type if ??==63;end;module Helpers;def R c,*g;p,h=
 /\(.+?\)/,g.grep(Hash);g-=h;raise"bad route"unless u=c.urls.find{|x|break x if
 x.scan(p).size==g.size&&/^#{x}\/?$/=~(x=g.inject(x){|x,a|x.sub p,U.escape((a.
-to_param rescue a))})};h.any?? u+"?"+U.build_query(h[0]):u end;def
+to_param rescue a))}.gsub(/\\(.)/){$1})};h.any?? u+"?"+U.build_query(h[0]):u end;def
 / p;p[0]==?/?@root + p : p end;def URL c='/',*a;c=R(c, *a) if c.respond_to?(
 :urls);c=self/c;c=@request.url[/.{8,}?(?=\/)/]+c if c[0]==?/;URI c end end
 module Base;attr_accessor:env,:request,:root,:input,:cookies,:state,:status,