Changeset 229

Timestamp:

09/26/2007 17:54:09 (14 months ago)

Author:

zimbatm

Message:

Applied patch by archengule for ticket #99, works like a charm !

Location:

trunk/lib

Files:

• camping-unabridged.rb (modified) (1 diff)
• camping.rb (modified) (1 diff)

trunk/lib/camping-unabridged.rb

@@ -620 +620 @@
     def qsp(q, d='&;', y=nil, z=H[])
         m = proc {|_,o,n|o.u(n,&m)rescue([*o]<<n)}
-        q.to_s.
-            split(/[#{d}]+ */n).
-            inject((b,z=z,H[])[0]) { |h,p| k, v=un(p).split('=',2)
+        (q.to_s.split(/[#{d}]+ */n) - [""]).
+            inject((b,z=z,H[])[0]) { |h,p| 
+              k, v=un(p).split('=',2)
                 h.u(k.split(/[\]\[]+/).reverse.
                     inject(y||v) { |x,i| H[i,x] },&m)

trunk/lib/camping.rb

@@ -40 +40 @@
 /[^ \w.-]+/n){'%'+($&.unpack('H2'*$&.size)*'%').upcase}.tr(' ','+')end;def un s
 s.tr('+',' ').gsub(/%([\da-f]{2})/in){[$1].pack('H*')}end;def qsp q,d='&;',y=
-nil,z=H[];m=proc{|_,o,n|o.u(n,&m)rescue([*o]<<n)};q.to_s.split(/[#{d}]+ */n).
+nil,z=H[];m=proc{|_,o,n|o.u(n,&m)rescue([*o]<<n)};(q.to_s.split(/[#{d}]+ */n)-['']).
 inject((b,z=z,H[])[0]){|h,p|k,v=un(p).split('=',2);h.u k.split(/[\]\[]+/).
 reverse.inject(y||v){|x,i|H[i,x]},&m}end;def kp s;c=qsp(s,';,')end;def