camping 1.3 → 1.4

data/examples/serve

@@ -7,39 +7,38 @@ RAILS_CONNECTION_ADAPTERS = %w[sqlite]
 $:.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'stringio'
 require 'webrick/httpserver'
-require 'camping'
+require 'camping/webrick'
 
 # All applications share a single database
 Camping::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'serve.db'
 Camping::Models::Base.logger = Logger.new('camping.log')
 
 # Find the working applications
-apps = 
-    Dir['*'].select do |d|
-        if File.directory? "#{d}"
-            begin
-                load "#{d}/#{d}.rb"
-                true
-            rescue Exception => e
-                puts "Camping app `#{d}' will not load: #{e.class} #{e.message}"
+def find_apps
+    apps = 
+        Dir['*'].select do |d|
+            if File.directory? "#{d}"
+                begin
+                    load "#{d}/#{d}.rb"
+                    true
+                rescue Exception => e
+                    puts "Camping app `#{d}' will not load: #{e.class} #{e.message}"
+                end
             end
         end
+    apps.map! do |app|
+        begin
+            klass = Object.const_get(Object.constants.grep(/^#{app}$/i)[0])
+            klass.create if klass.respond_to? :create
+            [app, klass]
+        rescue Exception => e
+            puts "Camping app `#{app}' will not load: #{e.class} #{e.message}"
+        end
     end
-apps.map! do |app|
-    begin
-        klass = Object.const_get(Object.constants.grep(/^#{app}$/i)[0])
-        klass.create if klass.respond_to? :create
-        [app, klass]
-    rescue Exception => e
-        puts "Camping app `#{app}' will not load: #{e.class} #{e.message}"
-    end
+    apps.compact
 end
-apps.compact!
-
-s = WEBrick::HTTPServer.new(:BindAddress => '0.0.0.0', :Port => 3301)
 
-# Root mount displays applications mounted
-s.mount_proc("/") do |req, resp|
+def index_page req, resp, apps
     welcome = "Welcome to the Camping Example Server"
     b = Markaby::Builder.new({}, {})
     b = b.instance_eval do
@@ -80,6 +79,14 @@ s.mount_proc("/") do |req, resp|
     resp.body = b.to_s
 end
 
+apps = find_apps
+s = WEBrick::HTTPServer.new(:BindAddress => '0.0.0.0', :Port => 3301)
+
+# Root mount displays applications mounted
+s.mount_proc("/") do |req, resp|
+    index_page req, resp, apps
+end
+
 # Mount which handles each application
 apps.each do |app, klass|
     # Mount for view source
@@ -88,17 +95,7 @@ apps.each do |app, klass|
         resp.body = File.read("#{app}/#{app}.rb")
     end
 
-    s.mount_proc("/#{app}") do |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
-        nil
-    end
+    s.mount("/#{app}", WEBrick::CampingHandler, klass)
 end
 
 # Server up

data/examples/tepee/tepee.rb

@@ -115,12 +115,13 @@ module Tepee::Views
   def _markup body
     return '' if body.blank?
     body.gsub!(Tepee::Models::Page::PAGE_LINK) do
-      page = title = $1.underscore
+      page = title = $1
       title = $2 unless $2.empty?
+      page = page.gsub /\W/, '_'
       if Tepee::Models::Page.find(:all, :select => 'title').collect { |p| p.title }.include?(page)
-        %Q{<a href="#{R Show, page}">#{title}</a>}
+        %Q{<a href="#{self/R(Show, page)}">#{title}</a>}
       else
-        %Q{<span>#{title}<a href="#{R Edit, page, 1}">?</a></span>}
+        %Q{<span>#{title}<a href="#{self/R(Edit, page, 1)}">?</a></span>}
       end
     end
     RedCloth.new(body, [ :hard_breaks ]).to_html
@@ -135,8 +136,14 @@ def Tepee.create
 end
 
 if __FILE__ == $0
+  require 'mongrel/camping'
+
   Tepee::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'tepee.db'
   Tepee::Models::Base.logger = Logger.new('camping.log')
+  Tepee::Models::Base.threaded_connections=false
   Tepee.create
-  puts Tepee.run
+  
+  server = Mongrel::Camping::start("0.0.0.0",3001,"/tepee",Tepee)
+  puts "** Tepee example is running at http://localhost:3000/tepee"
+  server.join
 end

data/extras/flipbook_rdoc.rb

@@ -7,7 +7,7 @@ class HTMLGenerator
         'allfiles'     => gen_into_index(@files),
         'allclasses'   => gen_into_index(@classes),
         "initial_page" => main_url,
-        'title'        => CGI.escapeHTML(@options.title),
+        'realtitle'    => CGI.escapeHTML(@options.title),
         'charset'      => @options.charset
       }
 
@@ -53,8 +53,10 @@ class HTMLGenerator
         end
         template.write_html_on(f, values)
       end
-      camping_gif = File.join(CAMPING_EXTRAS_DIR, 'Camping.gif')
-      File.copy(camping_gif, 'Camping.gif')
+      ['Camping.gif', 'permalink.gif'].each do |img|
+          ipath = File.join(CAMPING_EXTRAS_DIR, img)
+          File.copy(ipath, img)
+      end
     end
 end
 end
@@ -138,22 +140,24 @@ STYLE = %{
     #menu { background-color: #dfa; padding: 4px 12px; margin: 0; }
     #menu h3 { padding: 0; margin: 0; }
     #menu #links { float: right; }
-    .dyn-source { background-color: #f3f3e5; border: solid 1px #99C; padding: 4px 8px; margin: 0; display: none; }
-    .dyn-source pre  { font-size: 8pt; }
+    pre { font-weight: bold; color: #730; }
+    tt { color: #703; font-size: 12pt; }
+    .dyn-source { background-color: #775915; padding: 4px 8px; margin: 0; display: none; }
+    .dyn-source pre  { color: #DDDDDD; font-size: 8pt; }
     .source-link     { text-align: right; font-size: 8pt; }
     .ruby-comment    { color: green; font-style: italic }
-    .ruby-constant   { color: #4433aa; font-weight: bold; }
-    .ruby-identifier { color: #222222;  }
-    .ruby-ivar       { color: #2233dd; }
-    .ruby-keyword    { color: #3333FF; font-weight: bold }
-    .ruby-node       { color: #777777; }
-    .ruby-operator   { color: #111111;  }
-    .ruby-regexp     { color: #662222; }
-    .ruby-value      { color: #662222; font-style: italic }
-    .kw { color: #3333FF; font-weight: bold }
-    .cmt { color: green; font-style: italic }
-    .str { color: #662222; font-style: italic }
-    .re  { color: #662222; }
+    .ruby-constant   { color: #CCDDFF; font-weight: bold; }
+    .ruby-identifier { color: #CCCCCC;  }
+    .ruby-ivar       { color: #BBCCFF; }
+    .ruby-keyword    { color: #EEEEFF; font-weight: bold }
+    .ruby-node       { color: #FFFFFF; }
+    .ruby-operator   { color: #CCCCCC;  }
+    .ruby-regexp     { color: #DDFFDD; }
+    .ruby-value      { color: #FFAAAA; font-style: italic }
+    .kw { color: #DDDDFF; font-weight: bold }
+    .cmt { color: #CCFFCC; font-style: italic }
+    .str { color: #EECCCC; font-style: italic }
+    .re  { color: #EECCCC; }
 }
 
 CONTENTS_XML = %{
@@ -206,10 +210,10 @@ IF:methods
 START:methods
 <h4 class="ruled">%type% %category% method: 
 IF:callseq
-<strong><a name="%aref%">%callseq%</a></strong>
+<strong><a name="%aref%">%callseq%</a></strong> <a href="#%aref%"><img src="%root%/permalink.gif" border="0" title="Permalink to %callseq%" /></a>
 ENDIF:callseq
 IFNOT:callseq
-<strong><a name="%aref%">%name%%params%</a></strong></h4>
+<strong><a name="%aref%">%name%%params%</a></strong> <a href="#%aref%"><img src="%root%/permalink.gif" border="0" title="Permalink to %type% %category% method: %name%" /></a></h4>
 ENDIF:callseq
 
 IF:m_desc
@@ -240,7 +244,14 @@ BODY = %{
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>%title%</title>
+  <title>
+IF:title
+  %realtitle% &raquo; %title%
+ENDIF:title
+IFNOT:title
+  %realtitle%
+ENDIF:title
+  </title>
   <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
   <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
     <script language="JavaScript" type="text/javascript">
@@ -468,7 +479,7 @@ INDEX = %{
 <HTML>
 <HEAD>
 <META HTTP-EQUIV="refresh" content="0;URL=%initial_page%">
-<TITLE>%title%</TITLE>
+<TITLE>%realtitle%</TITLE>
 </HEAD>
 <BODY>
 Click <a href="%initial_page%">here</a> to open the Camping docs.

data/lib/camping-unabridged.rb

@@ -28,7 +28,7 @@
 # http://rubyforge.org/projects/mongrel  Mongrel comes with examples
 # in its <tt>examples/camping</tt> directory. 
 #
-%w[rubygems active_record markaby metaid tempfile].each { |lib| require lib }
+%w[rubygems active_record markaby metaid tempfile uri].each { |lib| require lib }
 
 # == Camping 
 #
@@ -90,6 +90,7 @@ module Camping
   F = __FILE__
   S = IO.read(F).gsub(/_+FILE_+/,F.dump)
 
+  H = HashWithIndifferentAccess
   # An object-like Hash, based on ActiveSupport's HashWithIndifferentAccess.
   # All Camping query string and cookie variables are loaded as this.
   # 
@@ -112,7 +113,7 @@ module Camping
   # to get the value for the <tt>page</tt> query variable.
   #
   # Use the <tt>@cookies</tt> variable in the same fashion to access cookie variables.
-  class H < HashWithIndifferentAccess
+  class H
     def method_missing(m,*a)
         if m.to_s =~ /=$/
             self[$`] = a[0]
@@ -162,8 +163,38 @@ module Camping
     # If a controller has many routes, the route will be selected if it is the
     # first in the routing list to have the right number of arguments.
     #
-    # Keep in mind that this route doesn't include the root path.  Occassionally
-    # you will need to use <tt>/</tt> (the slash method above).
+    # == Using R in the View
+    #
+    # Keep in mind that this route doesn't include the root path.
+    # You will need to use <tt>/</tt> (the slash method above) in your controllers.
+    # Or, go ahead and use the Helpers#URL method to build a complete URL for a route.
+    #
+    # However, in your views, the :href, :src and :action attributes automatically
+    # pass through the slash method, so you are encouraged to use <tt>R</tt> or
+    # <tt>URL</tt> in your views.
+    #
+    #  module Blog::Views
+    #    def menu
+    #      div.menu! do
+    #        a 'Home', :href => URL()
+    #        a 'Profile', :href => "/profile"
+    #        a 'Logout', :href => R(Logout)
+    #        a 'Google', :href => 'http://google.com'
+    #      end
+    #    end
+    #  end
+    #
+    # Let's say the above example takes place inside an application mounted at
+    # <tt>http://localhost:3301/frodo</tt> and that a controller named <tt>Logout</tt>
+    # is assigned to route <tt>/logout</tt>.  The HTML will come out as:
+    #
+    #   <div id="menu">
+    #     <a href="http://localhost:3301/frodo/">Home</a>
+    #     <a href="/frodo/profile">Profile</a>
+    #     <a href="/frodo/logout">Logout</a>
+    #     <a href="http://google.com">Google</a>
+    #   </div>
+    #
     def R(c,*args)
       p = /\(.+?\)/
       args.inject(c.urls.find{|x|x.scan(p).size==args.size}.dup){|str,a|
@@ -188,7 +219,7 @@ module Camping
     # have built-in, usable error checking in only one line of code. :-)
     #
     # See AR validation documentation for details on validations.
-    def errors_for(o); ul.errors { o.errors.each_full { |er| li er } } unless o.errors.empty?; end
+    def errors_for(o); ul.errors { o.errors.each_full { |er| li er } } if o.errors.any?; end
     # Simply builds the complete URL from a relative or absolute path +p+.  If your
     # application is running from <tt>/blog</tt>:
     #
@@ -197,170 +228,197 @@ module Camping
     #   self / R(Edit, 1)   #=> "/blog/edit/1"
     #
     def /(p); p[/^\//]?@root+p:p end
+    # Builds a URL route to a controller or a path, returning a URI object.
+    # This way you'll get the hostname and the port number, a complete URL.
+    #
+    # You can use this to grab URLs for controllers using the R-style syntax.
+    # So, if your application is mounted at <tt>http://test.ing/blog/</tt>
+    # and you have a View controller which routes as <tt>R '/view/(\d+)'</tt>:
+    #
+    #   URL(View, @post.id)    #=> #<URI:http://test.ing/blog/view/12>
+    #
+    # Or you can use the direct path:
+    #
+    #   self.URL               #=> #<URI:http://test.ing/blog/>
+    #   self.URL + "view/12"   #=> #<URI:http://test.ing/blog/view/12>
+    #   URL("/view/12")        #=> #<URI:http://test.ing/blog/view/12>
+    #
+    # It's okay to pass URL strings through this method as well:
+    #
+    #   URL("http://google.com")  #=> #<URI:http://google.com>
+    #
+    # Any string which doesn't begin with a slash will pass through
+    # unscathed.
+    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
   end
 
-  # Controllers is a module for placing classes which handle URLs.  This is done
-  # by defining a route to each class using the Controllers::R method.
+  # Camping::Base is built into each controller by way of the generic routing
+  # class Camping::R.  In some ways, this class is trying to do too much, but
+  # it saves code for all the glue to stay in one place.
+  #
+  # Forgivable, considering that it's only really a handful of methods and accessors.
+  #
+  # == Treating controller methods like Response objects
+  #
+  # Camping originally came with a barebones Response object, but it's often much more readable
+  # to just use your controller as the response.
+  #
+  # Go ahead and alter the status, cookies, headers and body instance variables as you
+  # see fit in order to customize the response.
   #
   #   module Camping::Controllers
-  #     class Edit < R '/edit/(\d+)'
-  #       def get; end
-  #       def post; end
+  #     class SoftLink
+  #       def get
+  #         redirect "/"
+  #       end
   #     end
   #   end
   #
-  # If no route is set, Camping will guess the route from the class name.
-  # The rule is very simple: the route becomes a slash followed by the lowercased
-  # class name.  See Controllers::D for the complete rules of dispatch.
+  # Is equivalent to:
   #
-  # == Special classes
+  #   module Camping::Controllers
+  #     class SoftLink
+  #       def get
+  #         @status = 302
+  #         @headers['Location'] = "/"
+  #       end
+  #     end
+  #   end
   #
-  # There are two special classes used for handling 404 and 500 errors.  The
-  # NotFound class handles URLs not found.  The ServerError class handles exceptions
-  # uncaught by your application.
-  module Controllers
-    # Controllers::Base is built into each controller by way of the generic routing
-    # class Controllers::R.  In some ways, this class is trying to do too much, but
-    # it saves code for all the glue to stay in one place.
-    #
-    # Forgivable, considering that it's only really a handful of methods and accessors.
-    #
-    # == Treating controller methods like Response objects
-    #
-    # Camping originally came with a barebones Response object, but it's often much more readable
-    # to just use your controller as the response.
-    #
-    # Go ahead and alter the status, cookies, headers and body instance variables as you
-    # see fit in order to customize the response.
+  module Base
+    include Helpers
+    attr_accessor :input, :cookies, :env, :headers, :body, :status, :root
+    # Display a view, calling it by its method name +m+.  If a <tt>layout</tt>
+    # method is found in Camping::Views, it will be used to wrap the HTML.
     #
     #   module Camping::Controllers
-    #     class SoftLink
+    #     class Show
     #       def get
-    #         redirect "/"
+    #         @posts = Post.find :all
+    #         render :index
     #       end
     #     end
     #   end
     #
-    # Is equivalent to:
+    def render(m); end; undef_method :render
+
+    # Any stray method calls will be passed to Markaby.  This means you can reply
+    # with HTML directly from your controller for quick debugging.
     #
     #   module Camping::Controllers
-    #     class SoftLink
-    #       def get
-    #         @status = 302
-    #         @headers['Location'] = "/"
-    #       end
+    #     class Info
+    #       def get; code @env.inspect end
     #     end
     #   end
     #
-    module Base
-      include Helpers
-      attr_accessor :input, :cookies, :env, :headers, :body, :status, :root
-      # Display a view, calling it by its method name +m+.  If a <tt>layout</tt>
-      # method is found in Camping::Views, it will be used to wrap the HTML.
-      #
-      #   module Camping::Controllers
-      #     class Show
-      #       def get
-      #         @posts = Post.find :all
-      #         render :index
-      #       end
-      #     end
-      #   end
-      #
-      def render(m); end; undef_method :render
-
-      # Any stray method calls will be passed to Markaby.  This means you can reply
-      # with HTML directly from your controller for quick debugging.
-      #
-      #   module Camping::Controllers
-      #     class Info
-      #       def get; code @env.inspect end
-      #     end
-      #   end
-      #
-      # If you have a <tt>layout</tt> method in Camping::Views, it will be used to
-      # wrap the HTML.
-      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
+    # If you have a <tt>layout</tt> method in Camping::Views, it will be used to
+    # wrap the HTML.
+    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
 
-      # Formulate a redirect response: a 302 status with <tt>Location</tt> header
-      # and a blank body.  If +c+ is a string, the root path will be added.  If
-      # +c+ is a controller class, Helpers::R will be used to route the redirect
-      # and the root path will be added.
-      #
-      # So, given a root of <tt>/articles</tt>:
-      #
-      #   redirect "view/12"    # redirects to "/articles/view/12"
-      #   redirect View, 12     # redirects to "/articles/view/12"
-      #
-      def redirect(c, *args)
-        c = R(c,*args) if c.respond_to? :urls
-        r(302, '', 'Location' => self/c)
-      end
+    # Formulate a redirect response: a 302 status with <tt>Location</tt> header
+    # and a blank body.  Uses Helpers#URL to build the location from a controller
+    # route or path.
+    #
+    # So, given a root of <tt>http://localhost:3301/articles</tt>:
+    #
+    #   redirect "view/12"    # redirects to "http://localhost:3301/articles/view/12"
+    #   redirect View, 12     # redirects to "http://localhost:3301/articles/view/12"
+    #
+    def redirect(*a)
+      r(302,'','Location'=>URL(*a))
+    end
 
-      # A quick means of setting this controller's status, body and headers.
-      # Used internally by Camping, but... by all means...
-      #
-      #   r(302, '', 'Location' => self / "/view/12")
-      #
-      # Is equivalent to:
-      #
-      #   redirect "/view/12"
-      #
-      def r(s, b, h = {}); @status = s; @headers.merge!(h); @body = b; end
+    # A quick means of setting this controller's status, body and headers.
+    # Used internally by Camping, but... by all means...
+    #
+    #   r(302, '', 'Location' => self / "/view/12")
+    #
+    # Is equivalent to:
+    #
+    #   redirect "/view/12"
+    #
+    def r(s, b, h = {}); @status = s; @headers.merge!(h); @body = b; end
 
-      def service(r, e, m, a) #:nodoc:
-        @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
-            }
+    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(/\/$/,'')
+      @k = C.kp(e.HTTP_COOKIE)
+      qs = C.qs_parse(e.QUERY_STRING)
+      @in = r
+      if %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)|n.match(e.CONTENT_TYPE)
+        b = "--#$1"
+        @in.read.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
-            qs.merge!(C.qs_parse(inp))
+            fh=v
           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 #:nodoc:
-        "Status: #{@status}\n#{@headers.map{|k,v|[*v].map{|x|"#{k}: #{x}"}*"\n"}*"\n"}\n\n#{@body}"
-      end
-      def markaby #:nodoc:
-          Mab.new( instance_variables.map { |iv| 
-            [iv[1..-1], instance_variable_get(iv)] } )
-      end
-      def markaview(m, *a, &b) #:nodoc:
-        h=markaby
-        h.send(m, *a, &b)
-        h.to_s
+          qs[fn]=fh if fn
+        }
+      elsif @method == "post"
+        qs.merge!(C.qs_parse(@in.read))
       end
+      @cookies, @input = @k.dup, qs.dup
+    end
+
+    def service(*a) #:nodoc:
+      @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 #:nodoc:
+      "Status: #{@status}\n#{@headers.map{|k,v|[*v].map{|x|"#{k}: #{x}"}*"\n"}*"\n"}\n\n#{@body}"
+    end
+    def markaby #:nodoc:
+        Mab.new( instance_variables.map { |iv| 
+          [iv[1..-1], instance_variable_get(iv)] } )
+    end
+    def markaview(m, *a, &b) #:nodoc:
+      h=markaby
+      h.send(m, *a, &b)
+      h.to_s
     end
+  end
 
-    # The R class is the parent class for all controllers and ensures they all get the Base mixin.
-    class R; include Base end
+  # The R class is the parent class for all routed controllers.
+  class R; include Base end
 
+  # Controllers is a module for placing classes which handle URLs.  This is done
+  # by defining a route to each class using the Controllers::R method.
+  #
+  #   module Camping::Controllers
+  #     class Edit < R '/edit/(\d+)'
+  #       def get; end
+  #       def post; end
+  #     end
+  #   end
+  #
+  # If no route is set, Camping will guess the route from the class name.
+  # The rule is very simple: the route becomes a slash followed by the lowercased
+  # class name.  See Controllers::D for the complete rules of dispatch.
+  #
+  # == Special classes
+  #
+  # There are two special classes used for handling 404 and 500 errors.  The
+  # NotFound class handles URLs not found.  The ServerError class handles exceptions
+  # uncaught by your application.
+  module Controllers
     # The NotFound class is a special controller class for handling 404 errors, in case you'd
     # like to alter the appearance of the 404.  The path is passed in as +p+.
     #
@@ -376,7 +434,7 @@ module Camping
     #     end
     #   end
     #
-    class NotFound; def get(p); r(404, div{h1("Cam\ping Problem!")+h2("#{p} not found")}); end end
+    class NotFound; def get(p); r(404, div{h1("Cam\ping Problem!");h2("#{p} not found")}); end end
 
     # The ServerError class is a special controller class for handling many (but not all) 500 errors.
     # If there is a parse error in Camping or in your application's source code, it will not be caught
@@ -464,10 +522,10 @@ module Camping
     def escape(s); s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n){'%'+$1.unpack('H2'*$1.size).join('%').upcase}.tr(' ', '+') end
     # Unescapes a URL-encoded string.
     #
-    #   Camping.unescape("I%27d+go+to+the+museum+straightway%21") 
+    #   Camping.un("I%27d+go+to+the+museum+straightway%21") 
     #     #=> "I'd go to the museum straightway!"
     #
-    def unescape(s); s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){[$1.delete('%')].pack('H*')} end
+    def un(s); s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){[$1.delete('%')].pack('H*')} end
 
     # Parses a query string into an Camping::H object.
     #
@@ -485,7 +543,7 @@ module Camping
         m = proc {|_,o,n|o.merge(n,&m)rescue([*o]<<n)}
         (qs||'').
             split(/[#{d}] */n).
-            inject(H[]) { |h,p| k, v=unescape(p).split('=',2)
+            inject(H[]) { |h,p| k, v=un(p).split('=',2)
                 h.merge(k.split(/[\]\[]+/).reverse.
                     inject(v) { |x,i| H[i,x] },&m)
             } 
@@ -524,16 +582,12 @@ module Camping
     #     end
     #   end
     #
-    def run(r=$stdin)
-      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
+    def run(r=$stdin,e=ENV)
+      k, a = Controllers.D un("/#{e['PATH_INFO']}".gsub(%r!/+!,'/'))
+      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
 
@@ -590,13 +644,13 @@ module Camping
   module Views; include Controllers, Helpers end
   
   # The Mab class wraps Markaby, allowing it to run methods from Camping::Views
-  # and also to replace :href and :action attributes in tags by prefixing the root
+  # and also to replace :href, :action and :src attributes in tags by prefixing the root
   # path.
   class Mab < Markaby::Builder
       include Views
       def tag!(*g,&b)
           h=g[-1]
-          [:href,:action].each{|a|(h[a]=self/h[a])rescue 0}
+          [:href,:action,:src].each{|a|(h[a]=self/h[a])rescue 0}
           super 
       end
   end