camping 1.3 → 1.4

data/lib/camping.rb

@@ -1,53 +1,50 @@
-%w[rubygems active_record markaby metaid tempfile].each{|l|require l}
+%w[rubygems active_record markaby metaid tempfile uri].each{|l|require l}
 module Camping;C=self;F=__FILE__;S=IO.read(F).gsub(/_+FILE_+/,F.dump)
-module Helpers;def R c,*args;p=/\(.+?\)/;args.inject(c.urls.find{|x|x.scan(p
-).size==args.size}.dup){|str,a|str.sub(p,(a.__send__(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,:env,:headers,:body,
-:status,:root;def method_missing(m,*a,&b);str=m==:render ? markaview(*a,
-&b):eval("markaby.#{m}(*a,&b)");str=markaview(:layout){str} if Views.method_defined? :layout;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,@env,@headers,@root=200,e,{'Content-Type'=>'text/html'},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(
-b)}(?:--)?\r\n/m).each{|pt|h,v=pt.split("\r\n\r\n",2);fh={};[:name,:filename].
-each{|x|fh[x]=$1 if h=~/^Content-Disposition: form-data;.*(?:\s#{x}="([^"]+)")\
-/m};fn=fh[:name];if fh[:filename];fh[:type]=$1 if h =~ /^Content-Type: (.+?)(\
-\r\n|\Z)/m;fh[:tempfile]=Tempfile.new("C").instance_eval{binmode;write v
-rewind;self};else;fh=v;end;qs[fn]=fh if fn};else;qs.merge!(C.qs_parse(inp));end
-end;@cookies, @input = cook.dup, qs.dup;@body=send(m,*a) if respond_to? m;@headers["Set-Cookie"]=@cookies.map{|k,v|"#{k}=#{C.
-escape(v)}; path=#{self/"/"}" if v != cook[k]}.compact;self;end;def to_s;"Status: #{
-@status}\n#{@headers.map{|k,v|[*v].map{
-|x|"#{k}: #{x}"}*"\n"}*"\n"}\n\n#{@body}";end;def markaby;Mab.new(
-instance_variables.map{|iv|[iv[1..-1],instance_variable_get(iv)]});end;def 
-markaview(m,*a,&b);h=markaby;h.send(m,*a,&b);h.to_s
-end;end;class R;include Base end;class 
-NotFound;def get(p);r(404,div{h1("Cam\ping Problem!")+h2("#{p} not found")});end
-end;class ServerError;include Base;def get(k,m,e);r(500,Mab.new{h1 "Cam\ping Problem!"
-h2 "#{k}.#{m}";h3 "#{e.class} #{e.message}:";ul{e.backtrace.each{|bt|li(bt)}}}.to_s
-)end end;class<<self;def R(*urls);Class.new(R){meta_def(:urls){urls}};end;def 
-D(path);constants.inject(nil){|d,c|k=
-const_get(c);k.meta_def(:urls){["/#{c.downcase}"]}if !(k<R);d||([k, $~[1..-1]
-] if k.urls.find { |x| path =~ /^#{x}\/?$/ })}||[NotFound, [path]];end end end
-class<<self;def goes m;eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING)end;def 
-escape s;s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n){'%'+$1.unpack('H2'*$1.size).join(
-'%').upcase}.tr(' ','+') end;def unescape(s);s.tr('+', ' ').gsub(/((?:%[0-9a-f\
-A-F]{2})+)/n){[$1.delete('%')].pack('H*')} end;def qs_parse qs,d='&;';m=proc{
-|_,o,n|o.merge(n,&m)rescue([*o]<<n)};qs.to_s.split(/[#{d}] */n).inject(H[]){
-|h,p|k,v=unescape(p).split('=',2);h.merge(k.split(/[\]\[]+/).reverse.inject(v){
-|x,i|H[i,x]},&m)}end;def kp(s);c=qs_parse(s,';,');end
-def run(r=$stdin,e=ENV);begin;k,a=Controllers.D "/#{e['PATH_INFO']}".
-gsub(%r!/+!,'/');m=e['REQUEST_METHOD']||"GET";k.send :include,C,Controllers::Base,
-Models;o=k.new;o.service(r,e,m.downcase,a);rescue\
-=>x;Controllers::ServerError.new.service(r,e,"get",[k,m,x]);end;end;end
-module Views; include Controllers,Helpers end;module Models
-A=ActiveRecord;Base=A::Base;def Base.table_name_prefix;"#{name[/^(\w+)/,1]}_".
-downcase.sub(/^(#{A}|camping)_/i,'');end;end
-class Mab<Markaby::Builder;include Views
-def tag!(*g,&b);h=g[-1];[:href,:action].each{|a|(h[a]=self/h[a])rescue 0}
-super;end;end;class H<HashWithIndifferentAccess;def method_missing(m,*a)
+module Helpers;def R c,*args;p=/\(.+?\)/;args.inject(c.urls.find{|x|x.scan(p).
+size==args.size}.dup){|str,a|str.sub(p,(a.__send__(a.class.primary_key)rescue
+a).to_s)} end;def URL c='/',*a;c=R(c,*a)if c.respond_to?:urls;c=self/c;c=
+"http://"+@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 m,*a,&b;s=m==:render ? markaview(*a,&b):eval(
+"markaby.#{m}(*a,&b)");s=markaview(:layout){s} if Views.method_defined?:layout
+r 200,s.to_s end;def r s,b,h={};@status=s;@headers.merge!(h);@body=b end;def 
+redirect *a;r 302,'','Location'=>URL(*a) end;def initialize r,e,m;e=H[e.to_hash]
+@status,@method,@env,@headers,@root=200,m.downcase,e,{'Content-Type'=>"text/htm\
+l"},e.SCRIPT_NAME.sub(/\/$/,'');@k=C.kp e.HTTP_COOKIE;q=C.qs_parse e.QUERY_STRING
+@in=r;if %r|\Amultipart/form-.*boundary=\"?([^\";,]+)|n.match e.CONTENT_TYPE;b=
+"--#$1";@in.read.split(/(?:\r?\n|\A)#{Regexp.quote b}(?:--)?\r\n/m).map{|y|h,v=y.
+split "\r\n\r\n",2;fh={};[:name,:filename].map{|x|fh[x]=$1 if h=~/^Content-Di.+\
+: form-data;.*(?:\s#{x}="([^"]+)")/m};fn=fh[:name];if fh[:filename];fh[:type]=
+$1 if h=~/^Content-Type: (.+?)(\r\n|\Z)/m;fh[:tempfile]=Tempfile.new(:C).
+instance_eval{binmode;write v;rewind;self}else;fh=v end;q[fn]=fh if fn}elsif 
+@method=="post";q.merge! C.qs_parse(@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]}.compact;self end;def to_s;"Status: #{@status}\n#{@headers.map{
+|k,v|[*v].map{|x|"#{k}: #{x}"}*"\n"}*"\n"}\n\n#{@body}" end;def markaby;Mab.new(
+instance_variables.map{|iv|[iv[1..-1],instance_variable_get(iv)]}) end;def 
+markaview m,*a,&b;h=markaby;h.send m,*a,&b;h.to_s end end;class R;include Base
+end;module Controllers;class NotFound;def get p;r(404,div{h1 "Cam\ping Problem!"
+h2 p+" not found"}) end end;class ServerError;include Base;def get k,m,e;r(500,
+Mab.new{h1 "Cam\ping Problem!";h2 "#{k}.#{m}";h3 "#{e.class} #{e.message}:";ul{
+e.backtrace.each{|bt|li(bt)}}}.to_s)end end;class<<self;def R *urls;Class.new(
+R){meta_def(:urls){urls}}end;def D path;constants.inject(nil){|d,c|k=const_get c
+k.meta_def(:urls){["/#{c.downcase}"]}if !(k<R);d||([k,$~[1..-1]]if k.urls.find{
+|x|path=~/^#{x}\/?$/})}||[NotFound,[path]] end end end;class<<self;def goes m
+eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING)end;def escape s;s.to_s.gsub(
+/([^ a-zA-Z0-9_.-]+)/n){'%'+$1.unpack('H2'*$1.size).join('%').upcase}.tr ' ','+'
+end;def un s;s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){[$1.delete('%'
+)].pack('H*')} end;def qs_parse q,d='&;';m=proc{|_,o,n|o.merge(n,&m)rescue([*o
+]<<n)};q.to_s.split(/[#{d}] */n).inject(H[]){|h,p|k,v=un(p).split('=',2)
+h.merge k.split(/[\]\[]+/).reverse.inject(v){|x,i|H[i,x]},&m}end;def kp(s);c=
+qs_parse(s,';,')end;def run r=$stdin,e=ENV;k,a=Controllers.D un("/#{e['PATH_INFO']
+}".gsub(/\/+/,'/'));k.send:include,C,Base,Models;k.new(r,e,(m=e['REQUEST_METHOD'
+]||"GET")).service *a;rescue=>x;Controllers::ServerError.new(r,e,'get').service(
+k,m,x)end end;module Views;include Controllers,Helpers end;module Models;A=
+ActiveRecord;Base=A::Base;def Base.table_name_prefix;"#{name[/^(\w+)/,1]}_".
+downcase.sub(/^(#{A}|camping)_/i,'')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
 if m.to_s=~/=$/;self[$`]=a[0];elsif a.empty?;self[m];else;raise NoMethodError,
-"#{m}";end;end;end;end
+"#{m}" end end end end

data/lib/camping/session.rb

@@ -0,0 +1,123 @@
+# == About camping/session.rb
+#
+# This file contains two modules which supply basic sessioning to your Camping app.
+# Again, we're dealing with a pretty little bit of code: approx. 60 lines.
+# 
+# * Camping::Models::Session is a module which adds a single <tt>sessions</tt> table
+#   to your database.
+# * Camping::Session is a module which you will mix into your application (or into
+#   specific controllers which require sessions) to supply a <tt>@state</tt> variable
+#   you can use in controllers and views.
+#
+# For a basic tutorial, see the *Getting Started* section of the Camping::Session module.
+require 'camping'
+
+module Camping::Models
+# A database table for storing Camping sessions.  Contains a unique 32-character hashid, a
+# creation timestamp, and a column of serialized data called <tt>ivars</tt>. 
+class Session < Base
+    serialize :ivars
+    def []=(k, v) # :nodoc:
+        self.ivars[k] = v
+    end
+    def [](k) # :nodoc:
+        self.ivars[k] rescue nil
+    end
+
+    RAND_CHARS = [*'A'..'Z'] + [*'0'..'9'] + [*'a'..'z']
+
+    # Generates a new session ID and creates a row for the new session in the database.
+    def self.generate cookies
+        rand_max = RAND_CHARS.size
+        sid = (0...32).inject("") { |ret,_| ret << RAND_CHARS[rand(rand_max)] }
+        sess = Session.create :hashid => sid, :ivars => Camping::H[]
+        cookies.camping_sid = sess.hashid
+        sess
+    end
+
+    # Gets the existing session based on the <tt>camping_sid</tt> available in cookies.
+    # If none is found, generates a new session.
+    def self.persist cookies
+        if cookies.camping_sid
+            session = Camping::Models::Session.find_by_hashid cookies.camping_sid
+        end
+        unless session
+            session = Camping::Models::Session.generate cookies
+        end
+        session
+    end
+
+    # Builds the session table in the database.  To be used in your application's
+    # <tt>create</tt> method.
+    #
+    # Like so:
+    #
+    #   def Blog.create
+    #       Camping::Models::Session.create_schema
+    #       unless Blog::Models::Post.table_exists?
+    #           ActiveRecord::Schema.define(&Blog::Models.schema)
+    #       end
+    #   end
+    #
+    def self.create_schema
+        unless table_exists?
+            ActiveRecord::Schema.define do
+                create_table :sessions, :force => true do |t|
+                    t.column :id,          :integer, :null => false
+                    t.column :hashid,      :string,  :limit => 32
+                    t.column :created_at,  :datetime
+                    t.column :ivars,       :text
+                end
+            end
+            reset_column_information
+        end
+    end
+end
+end
+
+module Camping
+# The Camping::Session module is designed to be mixed into your application or into specific
+# controllers which require sessions.  This module defines a <tt>service</tt> method which
+# intercepts all requests handed to those controllers.
+#
+# == Getting Started
+#
+# To get sessions working for your application:
+#
+# 1. <tt>require 'camping/session'</tt>
+# 2. Mixin the module: <tt>module YourApp; include Camping::Session end</tt>
+# 3. In your application's <tt>create</tt> method, add a call to <tt>Camping::Models::Schema.create_schema</tt>
+# 4. Throughout your application, use the <tt>@state</tt> var like a hash to store your application's data. 
+# 
+# If you are unfamiliar with the <tt>create</tt> method, see 
+# http://code.whytheluckystiff.net/camping/wiki/GiveUsTheCreateMethod.
+#
+# == A Few Notes
+#
+# * The session ID is stored in a cookie. Look in <tt>@cookies.camping_sid</tt>.
+# * The session data is stored in the <tt>sessions</tt> table in your database.
+# * All mounted Camping apps using this class will use the same database table.
+# * However, your application's data is stored in its own hash.
+# * Session data is only saved if it has changed. 
+module Session
+    # This <tt>service</tt> method, when mixed into controllers, intercepts requests
+    # and wraps them with code to start and close the session.  If a session isn't found
+    # in the database it is created.  The <tt>@state</tt> variable is set and if it changes,
+    # it is saved back into the database.
+    def service(*a)
+        session = Camping::Models::Session.persist @cookies
+        app = self.class.name.gsub(/^(\w+)::.+$/, '\1')
+        @state = (session[app] ||= Camping::H[])
+        hash_before = Marshal.dump(@state).hash
+        s = super(*a)
+        if session
+            hash_after = Marshal.dump(@state).hash
+            unless hash_before == hash_after
+                session[app] = @state
+                session.save
+            end
+        end
+        s
+    end
+end
+end

data/lib/camping/webrick.rb

@@ -0,0 +1,20 @@
+require 'camping'
+require 'webrick/httpservlet/abstract.rb'
+
+class WEBrick::CampingHandler < WEBrick::HTTPServlet::AbstractServlet
+    def initialize(server, klass)
+        super(server, klass)
+        @klass = klass
+    end
+    def do_GET(req, resp)
+        controller = @klass.run((req.body and StringIO.new(req.body)), req.meta_vars)
+        resp.status = controller.status
+        controller.headers.each do |k, v|
+            [*v].each do |vi|
+                resp[k] = vi
+            end
+        end
+        resp.body = controller.body
+    end
+    alias_method :do_POST, :do_GET
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: camping
 version: !ruby/object:Gem::Version 
-  version: "1.3"
-date: 2006-02-08 00:00:00 -07:00
+  version: "1.4"
+date: 2006-04-11 00:00:00 -06:00
 summary: miniature rails for stay-at-home moms
 require_paths: 
 - lib
@@ -34,22 +34,35 @@ files:
 - examples/blog
 - examples/charts
 - examples/campsh
+- examples/camping.log
 - examples/serve
+- examples/serve.db
 - examples/tepee/tepee.rb
 - examples/tepee/start
-- examples/blog/blog.sqlite3
+- examples/blog/camping.log
 - examples/blog/blog.rb
 - examples/blog/start
+- examples/blog/blog.sqlite3
+- examples/blog/test.yml
+- examples/blog/blog.db
+- examples/blog/foo.log
 - examples/charts/charts
-- examples/charts/pie.rb
 - examples/charts/charts.rb
+- examples/charts/pie.rb
+- examples/charts/1.gif
 - examples/charts/start
+- examples/charts/2.gif
+- examples/charts/3.gif
 - examples/campsh/campsh.rb
+- lib/camping
 - lib/camping.rb
 - lib/camping-unabridged.rb
+- lib/camping/session.rb
+- lib/camping/webrick.rb
 - bin/camping
-- extras/flipbook_rdoc.rb
+- extras/permalink.gif
 - extras/Camping.gif
+- extras/flipbook_rdoc.rb
 test_files: []
 
 rdoc_options: 
@@ -85,16 +98,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.13"
+        version: 1.14.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: markaby
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: "0.4"
     version: 
 - !ruby/object:Gem::Dependency 
   name: metaid