Changeset 230

Timestamp:

09/28/2007 16:07:35 (14 months ago)

Author:

zimbatm

Message:

Early ENV to H transformation. 7 octets gained (and no regression I hope)

Location:

trunk/lib

Files:

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

trunk/lib/camping-unabridged.rb

@@ -354 +354 @@
 
     def initialize(r, e, m) #:nodoc:
-      e = H[e.to_hash]
       @status, @method, @env, @headers, @root = 200, m.downcase, e, 
           {'Content-Type'=>'text/html'}, e.SCRIPT_NAME.sub(/\/$/,'')
@@ -653 +652 @@
     def run(r=$stdin,e=ENV)
       X.M
-      k,a=X.D un("/#{e['PATH_INFO']}".gsub(/\/+/,'/'))
-      k.new(r,e,(m=e['REQUEST_METHOD']||"GET")).Y.service(*a)
+      e = H[e.to_hash]
+      k,a=X.D un("/#{e.PATH_INFO}".gsub(/\/+/,'/'))
+      k.new(r,e,(m=e.REQUEST_METHOD||"GET")).Y.service(*a)
     rescue=>x
       X::ServerError.new(r,e,'get').service(k,m,x)

trunk/lib/camping.rb

@@ -12 +12 @@
 send(:layout){s}}if /^_/!~a[0].to_s and m.respond_to?:layout;s end;def
 redirect*a;r 302,'','Location'=>URL(*a)end;def r s,b,h={};@status=s;headers.
-merge!h;@body=b end;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,{
+merge!h;@body=b end;def to_a;[status,body,headers]end;def initialize r,e,m;@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.
@@ -43 +42 @@
 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
-run r=$stdin,e=ENV;X.M;k,a=X.D un("/#{e['PATH_INFO']}".gsub(/\/+/,'/'));k.new(
-r,e,(m=e['REQUEST_METHOD']||"GET")).Y.service(*a);rescue=>x;X::ServerError.new(
+run r=$stdin,e=ENV;X.M;e=H[e.to_hash];k,a=X.D un("/#{e.PATH_INFO}".gsub(/\/+/,'/'));k.new(
+r,e,(m=e.REQUEST_METHOD||"GET")).Y.service(*a);rescue=>x;X::ServerError.new(
 r,e,'get').service(k,m,x)end;def method_missing m,c,*a;X.M;k=X.const_get(c).
 new(StringIO.new,H['HTTP_HOST','','SCRIPT_NAME','','HTTP_COOKIE',''],m.to_s);H.