camping 1.0 → 1.1

data/examples/blog/blog.rb

@@ -22,6 +22,7 @@ module Camping::Controllers
         def get
             if cookies.user_id
                 @session = User.find cookies.user_id
+                @post = Post.new
             end
             render :add
         end

data/lib/camping-mural.rb

@@ -1,29 +1,28 @@
 %w[rubygems active_record markaby metaid ostruct].each {|lib| require lib}
-module Camping;module Models;Base = ActiveRecord::Base;end;module Views;end
-Markaby::Builder.class_eval{include Views};module Controllers;module RM
+module Camping;C=self;module Models;Base=ActiveRecord::Base;end;module Views
+end;Markaby::Builder.class_eval{include Views};module Controllers;module RM
 attr_accessor :input,:cookies,:headers,:body,:status;def method_missing(m, 
 *args, &blk);str=eval("markaby.#{m}(*args, &blk)");str=markaview(:layout){
 str}rescue nil;r(200,str.to_s,'Content-Type'=>'text/html');end;def render(m)
-str = markaview(m);str = markaview(:layout){ str }rescue nil;r(200, str, 
+str=markaview(m);str=markaview(:layout){ str }rescue nil;r(200, str, 
 "Content-Type" => 'text/html');end;def redirect(*args);c, *args = args;if \
-c.respond_to? :urls;c = c.urls.first;c.gsub!(/\(.+?\)/) do;((a = args.
-shift).respond_to?(:primary_key) ? a.method(a.primary_key) : a).to_s;end
-end;r(302,'','Location' => c);end;def r(s, b, h = {});@status = s;@headers.
-merge!(h);@body = b;end;def service(e, m, a);@status, @headers = 200, 
-{'Content-Type' => 'text/html'};@cookies=Camping.cookie_parse(e['COOKIE']||
-e['HTTP_COOKIE']);cook = @cookies.marshal_dump.dup;if (e['REQUEST_METHOD']==
-'POST')and %r|\Amultipart/form-data.*boundary=\"?.+?\"?|n=~e['CONTENT_TYPE']
-return r(500, "Urgh, multipart/form-data not yet supported.");else;@input =
-Camping.qs_parse(e['REQUEST_METHOD']!="POST" ? e['QUERY_STRING'] : $stdin.
-read(e['CONTENT_LENGTH'].to_i));end;@body = method( m.downcase ).call(*a)
-@headers['Set-Cookie'] = @cookies.marshal_dump.map { |k,v| "#{k}=#{Camping.
-escape(v)}; path=/"if v != cook[k]}.compact;self;end;def to_s;"Status: #{
-@status}\n#{@headers.map{|k,v|v.to_a.map{|v2|"#{k}: #{v2}"}}.flatten.join(
-"\n")}\n\n#{@body}";end;private;def markaby;Markaby::Builder.new( 
-instance_variables.map{|iv|[iv[1..-1].intern, instance_variable_get(iv)] }, 
-{});end;def markaview(m,*args,&blk);markaby.instance_eval{Views.
-instance_method(m).bind(self).call(*args, &blk); self }.to_s;end;end;class R
-include RM end;class NotFound < R;def get;r(404,h1('Camping Problem!')+h2(
+c.respond_to? :urls;c=c.urls.first.gsub(/\(.+?\)/){a=args.shift;a.
+method(a.class.primary_key)[] rescue a};end;r(302,'','Location' => c);end
+def r(s,b,h={});@status=s;@headers.merge!(h);@body = b;end;def service(
+r,e,m,a);@status,@headers=200,{'Content-Type' => 'text/html'};@cookies=
+C.cookie_parse(e['COOKIE']||e['HTTP_COOKIE']);cook=@cookies.marshal_dump.
+dup;if (e['REQUEST_METHOD']=='POST')and %r|\Amultipart/form-data.*boundar\
+y=\"?.+?\"?|n=~e['CONTENT_TYPE'];return r(500, "Urgh, multipart/form-data\
+ not yet supported.");else;@input=C.qs_parse(e['REQUEST_METHOD']!="POST" ?
+e['QUERY_STRING']:r.read(e['CONTENT_LENGTH'].to_i));end;@body=method(m.
+downcase).call(*a);@headers['Set-Cookie']=@cookies.marshal_dump.map{|k,v|
+"#{k}=#{C.escape(v)};path=/"if v != cook[k]}.compact;self;end;def to_s;
+"Status: #{@status}\n#{@headers.map{|k,v|v.to_a.map{|v2|"#{k}: #{v2}"}}.
+flatten.join("\n")}\n\n#{@body}";end;private;def markaby;Markaby::Builder.
+new( instance_variables.map{|iv|[iv[1..-1].intern,instance_variable_get(
+iv)]},{});end;def markaview(m,*args,&blk);markaby.instance_eval{Views.
+instance_method(m).bind(self).call(*args, &blk);self}.to_s;end;end;class R
+include RM end;class NotFound < R;def get;r(404,h1('#{C} Problem!')+h2(
 'Not Found'))end end;class<<self;def R(*urls);Class.new(R){meta_def(
 :inherited){|c|c.meta_def(:urls){urls}}}end;def D(path);constants.each{|c| 
 k=const_get(c);return k,$~[1..-1]if (k.urls rescue "/#{c.downcase}").find{
@@ -35,10 +34,10 @@ end;def unescape(s);s.tr('+',' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){[$1.delete(
 '%')].pack('H*')}end;def qs_parse(qs,d='&;');OpenStruct.new((qs||'').split(
 /[#{d}] */n).inject({}){|hsh, p|k,v=p.split('=',2).map{|v|unescape(v)};hsh[
 k]=v unless v.empty?;hsh}) end;def cookie_parse(s);c=qs_parse(s,';,') end
-def run;begin;k,a,m=Controllers.D(ENV['PATH_INFO'])+[ENV['REQUEST_METHOD']||
-"GET"];k.class_eval{include Controllers::RM};o=k.new;o.class.class_eval do
-Models.constants.each{|c|g=Models.const_get(c);remove_const c if 
-const_defined? c;const_set c,g};end;puts o.service(ENV, m, a);rescue=>e
-puts Response.new(200){@headers['Content-Type']='text/html';@body=Markaby::
-Builder.new({},{}){h1'Camping Problem!';h2"#{k}.#{m}";h3"#{e.class} \
+def run(r=$stdin,w=$stdout);begin;k,a,m=Controllers.D(ENV['PATH_INFO'])+[
+ENV['REQUEST_METHOD']||"GET"];k.class_eval{include Controllers::RM};o=k.new
+o.class.class_eval{Models.constants.each{|c|g=Models.const_get(c)
+remove_const c if const_defined? c;const_set c,g}};w<<o.service(r,ENV,m,a)
+rescue=>e;w<<Response.new(200){@headers['Content-Type']='text/html';@body=
+Markaby::Builder.new({},{}){h1'#{C} Problem!';h2"#{k}.#{m}";h3"#{e.class} \
 #{e.message}:";ul{e.backtrace.each{|bt|li bt}}}.to_s};end end end end

data/lib/camping.rb

@@ -20,15 +20,15 @@ module Camping
       def redirect(*args)
         c, *args = args
         if c.respond_to? :urls
-          c = c.urls.first 
-          c.gsub!(/\(.+?\)/) do
-            ((a = args.shift).respond_to?(:primary_key) ? a.method(a.primary_key) : a).to_s
+          c = c.urls.first.gsub(/\(.+?\)/) do
+            a = args.shift
+            a.method(a.class.primary_key)[] rescue a
           end
         end
         r(302, '', 'Location' => c)
       end
       def r(s, b, h = {}); @status = s; @headers.merge!(h); @body = b; end
-      def service(e, m, a)
+      def service(r, e, m, a)
         @status, @headers = 200, {'Content-Type' => 'text/html'}
         @cookies = Camping.cookie_parse(e['HTTP_COOKIE'] || e['COOKIE'])
         cook = @cookies.marshal_dump.dup
@@ -37,7 +37,7 @@ module Camping
           return r(500, "Urgh, multipart/form-data not yet supported.")
         else
           @input = Camping.qs_parse(e['REQUEST_METHOD'] == "POST" ? 
-                                    $stdin.read(e['CONTENT_LENGTH'].to_i) : e['QUERY_STRING'])
+                                    r.read(e['CONTENT_LENGTH'].to_i) : e['QUERY_STRING'])
         end
 
         @body = method( m.downcase ).call(*a)
@@ -84,7 +84,7 @@ module Camping
     def qs_parse(qs, d = '&;'); OpenStruct.new((qs||'').split(/[#{d}] */n).
         inject({}){|hsh, p|k, v = p.split('=',2).map {|v| unescape(v)}; hsh[k] = v unless v.empty?; hsh}) end
     def cookie_parse(s); c = qs_parse(s, ';,'); end
-    def run
+    def run(r=$stdin,w=$stdout)
       begin
         k, a, m = Controllers.D(ENV['PATH_INFO']) + [ENV['REQUEST_METHOD'] || "GET"]
         k.class_eval { include Controllers::RM }
@@ -96,9 +96,9 @@ module Camping
             const_set c, g
           end
         end
-        puts o.service(ENV, m, a)
+        w << o.service(r, ENV, m, a)
       rescue => e
-        puts Response.new(200) { @headers['Content-Type'] = 'text/html'; @body = Markaby::Builder.new({}, {}) { h1 'Camping Problem!'; h2 "#{k}.#{m}"; h3 "#{e.class} #{e.message}:"; ul { e.backtrace.each { |bt| li bt } } }.to_s }
+        w << Response.new(200) { @headers['Content-Type'] = 'text/html'; @body = Markaby::Builder.new({}, {}) { h1 'Camping Problem!'; h2 "#{k}.#{m}"; h3 "#{e.class} #{e.message}:"; ul { e.backtrace.each { |bt| li bt } } }.to_s }
       end
     end
   end

metadata

@@ -3,11 +3,11 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: camping
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2006-01-18 00:00:00 -07:00
+  version: "1.1"
+date: 2006-01-19 00:00:00 -07:00
 summary: miniature rails for stay-at-home moms
 require_paths: 
-  - lib
+- lib
 email: why@ruby-lang.org
 homepage: http://whytheluckystiff.net/camping/
 rubyforge_project: hobix
@@ -18,60 +18,60 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - why the lucky stiff
+- why the lucky stiff
 files: 
-  - examples/blog
-  - examples/blog/blog.sqlite3
-  - examples/blog/blog.rb
-  - examples/blog/camping.log
-  - examples/blog/start
-  - examples/blog/blog3.db
-  - examples/blog/styles.css
-  - lib/camping-mural.rb
-  - lib/camping.rb
+- examples/blog
+- examples/blog/blog.sqlite3
+- examples/blog/blog.rb
+- examples/blog/styles.css
+- examples/blog/start
+- lib/camping-mural.rb
+- lib/camping.rb
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: activerecord
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: markaby
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: metaid
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: markaby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: metaid
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 

data/examples/blog/camping.log

@@ -1,16 +0,0 @@
-# Logfile created on Tue Jan 17 22:57:14 MST 2006 by logger.rb/1.5.2.4
-  Camping::Models::Post Load (0.000000)   SQLite3::SQLException: no such table: posts: SELECT * FROM posts 
-  Camping::Models::Post Load (0.000764)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000776)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000781)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000803)   SELECT * FROM posts WHERE (posts.id = '1') LIMIT 1
-  Camping::Models::Post Load (0.000873)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000825)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000806)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000824)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000832)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000816)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000824)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000813)   SELECT * FROM posts 
-  Camping::Models::Post Load (0.000828)   SELECT * FROM posts 
-  Camping::Models::User Load (0.000831)   SELECT * FROM users WHERE (username = '_why' AND password = 'hacky') LIMIT 1