Changeset 234

Timestamp:

09/30/2007 16:41:53 (14 months ago)

Author:

zimbatm

Message:

ActiveSupport? dependency gone ! H is now simply inheriting from Hash.

Location:

trunk/lib

Files:

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

trunk/lib/camping-unabridged.rb

@@ -29 +29 @@
 # in its <tt>examples/camping</tt> directory. 
 #
-%w[active_support markaby tempfile uri].map { |l| require l }
+%w[markaby tempfile uri].map { |l| require l }
 
 # == Camping 
@@ -86 +86 @@
   S = IO.read(__FILE__) rescue nil
   P = "Cam\ping Problem!"
-  H = HashWithIndifferentAccess
-  # An object-like Hash, based on ActiveSupport's HashWithIndifferentAccess.
+  # An object-like Hash.
   # All Camping query string and cookie variables are loaded as this.
   # 
@@ -110 +109 @@
   # Use the <tt>@cookies</tt> variable in the same fashion to access cookie variables.
   # Also, the <tt>@env</tt> variable is an H containing the HTTP headers and server info.
-  class H
+  class H < Hash
     # Gets or sets keys in the hash.
     #
@@ -118 +117 @@
     #
     def method_missing(m,*a)
-        m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m]:super
-    end
-    alias u regular_update
+        m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.to_s]:super
+    end
+    alias u merge!
   end
 
@@ -370 +369 @@
               fh.u H[*$'.scan(/(?:\s(\w+)="([^"]+)")/).flatten]
             when /^Content-Type: (.+?)(\r$|\Z)/m
-              fh[:type] = $1
+              fh.type = $1
             end
           end
-          fn=fh[:name]
-          o=if fh[:filename]
-            o=fh[:tempfile]=Tempfile.new(:C)
+          fn=fh.name
+          o=if fh.filename
+            o=fh.tempfile=Tempfile.new(:C)
             o.binmode
           else
@@ -393 +392 @@
           end
           C.qsp(fn,'&;',fh,q) if fn
-          fh[:tempfile].rewind if fh.is_a?H
+          fh.tempfile.rewind if fh.is_a?H
         end
       when "application/x-www-form-urlencoded"
@@ -675 +674 @@
     #   #=> #<Blog::Controllers::Login @user=... >
     #
-    #   Blog.get(:Info, :env => {:HTTP_HOST => 'wagon'})
+    #   Blog.get(:Info, :env => {'HTTP_HOST' => 'wagon'})
     #   #=> #<Blog::Controllers::Info @env={'HTTP_HOST'=>'wagon'} ...>
     #

trunk/lib/camping.rb

@@ -1 @@
-%w[active_support markaby tempfile uri].map{|l|require l};module Camping;C=self
-S=IO.read(__FILE__)rescue nil;P="Cam\ping Problem!";H=HashWithIndifferentAccess
-class H;def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m]:super
-end;alias u regular_update;end;module Helpers def R c,*g;p,h=/\(.+?\)/,g.
+%w[markaby tempfile uri].map{|l|require l};module Camping;C=self
+S=IO.read(__FILE__)rescue nil;P="Cam\ping Problem!";class H<Hash
+def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.to_s]:super
+end;alias u merge!;end;module Helpers def R c,*g;p,h=/\(.+?\)/,g.
 grep(Hash);(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].
@@ -20 +20 @@
 @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;s=8192;k=''
+/^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;s=8192;k=''
 l=@in.read(s*2);while l;if(k<<l)=~b;o<<$`.chomp;@in.seek(-$'.size,IO::SEEK_CUR)
-break;end;o<<k.slice!(0...s);l=@in.read(s);end;C.qsp(fn,'&;',fh,q)if fn;fh[
-:tempfile].rewind if fh.is_a?H;end;when "application/x-www-form-urlencoded"
+break;end;o<<k.slice!(0...s);l=@in.read(s);end;C.qsp(fn,'&;',fh,q)if fn;fh.
+tempfile.rewind if fh.is_a?H;end;when "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