Changeset 34 for trunk

Timestamp:

01/23/2006 16:51:15 (3 years ago)

Author:

why

Message:

camping.gemspec: version 1.2.
lib/camping.rb: trying to reflow.
examples/serve: chdir into each example directory when running its app.

Location:

trunk

Files:

• camping.gemspec (modified) (1 diff)
• examples/serve (modified) (4 diffs)
• lib/camping.rb (modified) (2 diffs)

trunk/camping.gemspec

@@ -2 +2 @@
 spec = Gem::Specification.new do |s|
   s.name = 'camping'
-  s.version = "1.1"
+  s.version = "1.2"
   s.platform = Gem::Platform::RUBY
   s.summary = "miniature rails for stay-at-home moms"

trunk/examples/serve

@@ -1 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 #
 # Serves all examples, mounted into Webrick.
@@ -5 +5 @@
 require 'stringio'
 require 'webrick/httpserver'
+
+dir = Dir.pwd
 apps = 
     Dir['*'].select do |d|
+        Dir.chdir(dir)
         if File.exists? "#{d}/#{d}.rb"
-            load "#{d}/#{d}.rb"
+            begin
+                Dir.chdir("#{dir}/#{d}")
+                load "#{d}.rb"
+                true
+            rescue Exception => e
+                puts "Camping app `#{d}' will not load: #{e.class} #{e.message}"
+            end
         end
     end
@@ -31 +40 @@
                 header.delete('status')
               end
-              if header.has_key?('set-cookie')
-                header['set-cookie'].each{|k|
-                  self.cookies << WEBrick::Cookie.parse_set_cookie(k)
-                }
-                header.delete('set-cookie')
-              end
               header.each{|key, val| self[key] = val.join(", ") }
             rescue => ex
@@ -43 +46 @@
             self.body = body
         end
+        Dir.chdir("#{dir}/#{app}")
         klass.run((req.body and StringIO.new(req.body)), resp)
+        Dir.chdir(dir)
+        nil
     end
 end

trunk/lib/camping.rb

@@ -3 +3 @@
 module Helpers;def R c,*args;p=/\(.+?\)/;args.inject(c.urls.detect{|x|x.scan(p
 ).size==args.size}.dup){|str,a|str.sub(p,(a.method(a.class.primary_key)[]rescue
-a).to_s)};end;def / p;p[/^\//]?@root+p:p end; def errors_for(o); ul.errors { 
-o.errors.each_full { |er| li er } } unless o.errors.empty?; end; end; module Controllers;
-module Base; include Helpers;attr_accessor :input,:cookies,:headers,:body,:status,:root;def
-method_missing(m,*args,&blk);str=m==:render ? markaview(*args,&blk):eval(
-"markaby.#{m}(*args,&blk)");str=markaview(:layout){str}rescue nil;r(200,str.
-to_s);end;def r(s,b,h={});@status=s;@headers.merge!(h);@body=b;end;def 
-redirect(c,*args);c=R(c,*args)if c.respond_to?:urls;r(302,'','Location'=>self/c);end;def service(r,
-e,m,a)@status,@headers,@root=200,{},e['SCRIPT_NAME'];cook=C.cookie_parse(e[
-'HTTP_COOKIE']||e['COOKIE']);qs=C.qs_parse(e['QUERY_STRING']);if "POST"==m;inp=r.read(e[
+a).to_s)};end;def / p;p[/^\//]?@root+p:p end;def errors_for(o);ul.errors{o.
+errors.each_full{|er|li er}}unless o.errors.empty?;end;end;module Controllers
+module Base; include Helpers;attr_accessor :input,:cookies,:headers,:body,
+:status,:root;def method_missing(m,*args,&blk);str=m==:render ? markaview(*args,
+&blk):eval("markaby.#{m}(*args,&blk)");str=markaview(:layout){str}rescue nil;r(
+200,str.to_s);end;def r(s,b,h={});@status=s;@headers.merge!(h);@body=b;end;def 
+redirect(c,*args);c=R(c,*args)if c.respond_to?:urls;r(302,'','Location'=>self/c)
+end;def service(r,e,m,a)@status,@headers,@root=200,{},e['SCRIPT_NAME'];cook=C.kp(
+e['HTTP_COOKIE']);qs=C.qs_parse(e['QUERY_STRING']);if "POST"==m;inp=r.read(e[
 'CONTENT_LENGTH'].to_i);if %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)|n.
 match(e['CONTENT_TYPE']);b="--#$1";inp.split(/(?:\r?\n|\A)#{Regexp::quote(
@@ -39 +39 @@
 A-F]{2})+)/n){[$1.delete('%')].pack('H*')} end;def qs_parse(qs,d ='&;');(qs||''
 ).split(/[#{d}] */n).inject({}){|hsh, p|k,v=p.split('=',2).map{|v|unescape(v)}
-hsh[k]=v unless v.blank?;hsh} end; def cookie_parse(s);c=qs_parse(s,';,') end
+hsh[k]=v unless v.blank?;hsh} end; def kp(s);c=qs_parse(s,';,') end
 def run(r=$stdin,w=$stdout);w<<begin;k,a=Controllers.D "/#{ENV['PATH_INFO']}".
 gsub(%r!/+!,'/');m=ENV['REQUEST_METHOD']||"GET";k.class_eval{include C