Changeset 188

Timestamp:

03/22/2007 23:35:43 (20 months ago)

Author:

why

Message:

• lib/camping.rb: whateley's patch to allow other incoming content-types to go unscathed by the query parser. and a reformated camping.rb.
  

Location:

trunk/lib

Files:

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

trunk/lib/camping-unabridged.rb

@@ -422 +422 @@
           fh[:tempfile].rewind if fh.is_a?H
         end
-      elsif @method == "post"
+      elsif @method == "post" and e.CONTENT_TYPE == "application/x-www-form-urlencoded"
         qs.merge!(C.qsp(@in.read))
       end

trunk/lib/camping.rb

@@ -4 +4 @@
 (g-=h).inject(c.urls.find{|x|x.scan(p).size==g.size}.dup){|s,a|s.sub p,C.
 escape((a[a.class.primary_key]rescue a))}+(h.any?? "?"+h[0].map{|x|x.map{|z|C.
-escape z}*"="}*"&": "")end;def URL c='/',*a;c=R(c,*a)if c.
-respond_to?:urls;c=self/c;c="//"+@env.HTTP_HOST+c if c[/^\//];URI(c)end;def/p
-p[/^\//]?@root+p : p end;def errors_for o;ul.errors{o.errors.each_full{|x|li x}
-}if o.errors.any?end end;module Base;include Helpers;attr_accessor:input,
-:cookies,:env,:headers,:body,:status,:root;def method_missing*a,&b
-a.shift if a[0]==:render;m=Mab.new({},self);s=m.capture{send(*a,&b)}
-s=m.capture{send(:layout){s}} if /^_/!~a[0].to_s and m.respond_to?:layout
-s end;def r s,b,h={};@status=s;@headers.merge!h;@body=b end
-def redirect*a;r 302,'','Location'=>URL(*a)end;Z="\r\n"
-def to_a;[@status,@body,@headers]end
-def initialize r,e,m;e=H[e.to_hash];@status,@method,@env,@headers,@root=200,m.
-downcase,e,{'Content-Type'=>"text/html"},e.SCRIPT_NAME.sub(/\/$/,'')
-@k=C.kp e.HTTP_COOKIE;q=C.qsp e.QUERY_STRING;@in=r
-if%r|\Amultipart/form-.*boundary=\"?([^\";,]+)|n.match e.CONTENT_TYPE
-b=/(?:\r?\n|\A)#{Regexp::quote("--#$1")}(?:--)?\r$/;until@in.eof?;fh=H[];for l in@in
-case l;when Z;break;when/^Content-D.+?: form-data;/;fh.u H[*$'.
-scan(/(?:\s(\w+)="([^"]+)")/).flatten];when/^Content-Type: (.+?)(\r$|\Z)/m;fh[
-:type]=$1;end;end;fn=fh[:name];o=if fh[:filename];o=fh[:tempfile]=Tempfile.new(:C)
-o.binmode;else;fh=""end;while l=@in.read(16384);if l=~b;o<<$`.chomp;@in.seek(-$'.
-size,IO::SEEK_CUR);break;end;o<<l;end;C.qsp(fn,'&;',fh,q) if fn;fh[:tempfile].rewind if
-fh.is_a?H;end;elsif@method=="post";q.u C.qsp(@in.read)end;@cookies,@input=
-@k.dup,q.dup end;def service*a;@body=send(@method,*a)if respond_to?@method
-@headers["Set-Cookie"]=@cookies.map{|k,v|"#{k}=#{C.escape(v)}; path=#{self/'/'
-}"if v!=@k[k]}-[nil];self end;def to_s;a=[];@headers.map{|k,v|[*v].map{|x|a<<
-"#{k}: #{x}"}};"Status: #{@status}#{Z+a*Z+Z*2+@body}"end;end
-X=module Controllers;@r=[];class<<self;def r;@r;end;def R*u;r=@r;Class.new{
-meta_def(:urls){u};meta_def(:inherited){|x|r<<x}}end;def M;def M;end;constants.map{|c|
-k=const_get(c);k.send:include,C,Base,Models;r[0,0]=k if !r.include?k;k.meta_def(
-:urls){["/#{c.downcase}"]}if !k.respond_to?:urls}end;def D p;r.map{|k|k.urls.
-map{|x|return k,$~[1..-1]if p=~/^#{x}\/?$/}};[NotFound,[p]]end end;class 
-NotFound<R();def get p;r(404,Mab.new{h1 P;h2 p+" not found"})end end;class 
-ServerError<R();def get k,m,e;r(500,Mab.new{h1 P;h2"#{k}.#{m}";h3"#{e.class
+escape z}*"="}*"&": "")end;def URL c='/',*a;c=R(c,*a)if c.respond_to?:urls
+c=self/c;c="//"+@env.HTTP_HOST+c if c[/^\//];URI(c)end;def/p;p[/^\//]?@root+p :
+p end;def errors_for o;ul.errors{o.errors.each_full{|x|li x}}if o.errors.any?end
+end;module Base;include Helpers;attr_accessor:input,:cookies,:env,:headers,:body,
+:status,:root;def method_missing*a,&b;a.shift if a[0]==:render;m=Mab.new {},self
+s=m.capture{send(*a,&b)};s=m.capture{send(:layout){s}} if /^_/!~a[0].to_s and m.
+respond_to?:layout;s end;def r s,b,h={};@status=s;@headers.merge!h;@body=b end
+def redirect*a;r 302,'','Location'=>URL(*a)end;Z="\r\n";def to_a;[@status,@body,
+@headers]end;def initialize r,e,m;e=H[e.to_hash];@status,@method,@env,@headers,
+@root=200,m.downcase,e,{'Content-Type'=>"text/html"},e.SCRIPT_NAME.sub(/\/$/,'')
+@k=C.kp e.HTTP_COOKIE;q=C.qsp e.QUERY_STRING;@in=r;if%r|\Amultipart/form-.*boun\
+dary=\"?([^\";,]+)|n.match e.CONTENT_TYPE;b=/(?:\r?\n|\A)#{Regexp::quote("--#$1"
+)}(?:--)?\r$/;until@in.eof?;fh=H[];for l in@in;case l;when Z;break
+when/^Content-D.+?: form-data;/;fh.u H[*$'.scan(/(?:\s(\w+)="([^"]+)")/).flatten]
+when/^Content-Type: (.+?)(\r$|\Z)/m;fh[:type]=$1;end;end;fn=fh[:name];o=if
+fh[:filename];o=fh[:tempfile]=Tempfile.new(:C);o.binmode;else;fh=""end;while l=@in.
+read(16384);if l=~b;o<<$`.chomp;@in.seek(-$'.size,IO::SEEK_CUR);break;end;o<<l
+end;C.qsp(fn,'&;',fh,q) if fn;fh[:tempfile].rewind if fh.is_a?H;end;elsif@method==
+"post" and e.CONTENT_TYPE == "application/x-www-form-urlencoded"
+q.u C.qsp(@in.read)end;@cookies,@input=@k.dup,q.dup end;def service*a
+@body=send(@method,*a)if respond_to?@method;@headers["Set-Cookie"]=@cookies.map{
+|k,v|"#{k}=#{C.escape(v)}; path=#{self/'/'}"if v!=@k[k]}-[nil];self end;def to_s
+a=[];@headers.map{|k,v|[*v].map{|x|a<<"#{k}: #{x}"}};"Status: #{@status}#{Z+a*Z+
+Z*2+@body}"end;end;X=module Controllers;@r=[];class<<self;def r;@r;end;def R*u
+r=@r;Class.new{meta_def(:urls){u};meta_def(:inherited){|x|r<<x}}end;def M;def M
+end;constants.map{|c|k=const_get(c);k.send:include,C,Base,Models;r[0,0]=k if
+!r.include?k;k.meta_def(:urls){["/#{c.downcase}"]}if !k.respond_to?:urls}end;def
+D p;r.map{|k|k.urls.map{|x|return k,$~[1..-1]if p=~/^#{x}\/?$/}};[NotFound,[p]]end
+end;class NotFound<R();def get p;r(404,Mab.new{h1 P;h2 p+" not found"})end end
+class ServerError<R();def get k,m,e;r(500,Mab.new{h1 P;h2"#{k}.#{m}";h3"#{e.class
 } #{e.message}:";ul{e.backtrace.each{|bt|li(bt)}}}.to_s)end end;self;end;class<<
 self;def goes m;eval S.gsub(/Camping/,m.to_s).gsub("A\pps=[]","Cam\ping::Apps<<\
@@ -49 +47 @@
 '','SCRIPT_NAME','','HTTP_COOKIE',''],m.to_s);H.new(a.pop).each{|e,f|k.send(
 "#{e}=",f)}if Hash===a[-1];k.service *a;end;end;module Views;include X,Helpers
-end;module Models;autoload:Base,'camping/db';def Y;self;end;end;class Mab<Markaby::Builder
-include Views;def tag!*g,&b;h=g[-1];[:href,:action,:src].map{|a|(h[a]=self/h[a])rescue
-0};super end end;H=HashWithIndifferentAccess;class H;def method_missing m,*a
-m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m]:raise(NoMethodError,"#{m}")end
-alias_method:u,:regular_update;end end
+end;module Models;autoload:Base,'camping/db';def Y;self;end;end;class Mab<
+Markaby::Builder;include Views;def tag!*g,&b;h=g[-1];[:href,:action,:src].map{
+|a|(h[a]=self/h[a])rescue 0};super end end;H=HashWithIndifferentAccess;class H
+def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m]:raise(
+NoMethodError,"#{m}")end;alias_method:u,:regular_update;end end