Changeset 134

Timestamp:

07/12/2006 12:44:46 (2 years ago)

Author:

why

Message:

• lib/camping.rb: allow the Camping scriptable dispatcher (Camping.method_missing) to take a hash of environment vars or query vars. also, an empty StringIO is the default input stream. apply zimbatm's patch to allow urls to be overridden.
  
• lib/camping-unabridged.rb: updated all the code and docs to match the above.
  
• lib/camping/reloader.rb: update the not a Camping app error message to give the expected module name.
  
• lib/camping/db.rb: docs.
  
• Rakefile: at least Markaby 0.4.65 required.
  

Location:

trunk

Files:

• Rakefile (modified) (1 diff)
• examples/blog.rb (modified) (1 diff)
• lib/camping-unabridged.rb (modified) (15 diffs)
• lib/camping.rb (modified) (1 diff)
• lib/camping/db.rb (modified) (1 diff)
• lib/camping/reloader.rb (modified) (1 diff)

trunk/Rakefile

@@ -61 +61 @@
 
         s.add_dependency('activesupport', '>=1.3.1')
-        s.add_dependency('markaby', '>0.4')
+        s.add_dependency('markaby', '>=0.4.65')
         s.add_dependency('metaid')
         s.required_ruby_version = '>= 1.8.2'

trunk/examples/blog.rb

@@ -71 +71 @@
             div do
                 code args.inspect; br; br
-                code ENV.inspect; br
+                code @env.inspect; br
                 code "Link: #{R(Info, 1, 2)}"
             end

trunk/lib/camping-unabridged.rb

@@ -29 +29 @@
 # in its <tt>examples/camping</tt> directory. 
 #
-%w[active_record markaby metaid tempfile uri].each { |lib| require lib }
+%w[active_support/core_ext/hash markaby metaid tempfile uri].each { |lib| require lib }
 
 # == Camping 
@@ -207 +207 @@
     #
     def R(c,*g)
-      p = /\(.+?\)/
+      p=/\(.+?\)/
       g.inject(c.urls.find{|x|x.scan(p).size==g.size}.dup){|s,a|
-        s.sub(p,C.escape((a.__send__(a.class.primary_key) rescue a)))
+        s.sub p,C.escape((a[a.class.primary_key]rescue a))
       }
     end
+
     # Shows AR validation errors for the object passed. 
     # There is no output if there are no errors.
@@ -309 +310 @@
     include Helpers
     attr_accessor :input, :cookies, :env, :headers, :body, :status, :root
+    Z = "\r\n"
+
     # 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.
@@ -334 +337 @@
     # 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
-      str
+    def method_missing(*a,&b)
+      a.shift if a[0]==:render
+      m=markaby
+      s=m.capture{send(*a,&b)}
+      s=m.layout{s} if m.respond_to?:layout
+      "#{s}"
     end
 
@@ -380 +385 @@
           for l in @in
             case l
-            when "\r\n": break
+            when Z: break
             when /^Content-Disposition: form-data;/
               fh.u H[*$'.scan(/(?:\s(\w+)="([^"]+)")/).flatten]
@@ -419 +424 @@
     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
+      @headers['Set-Cookie'] = @cookies.map { |k,v| "#{k}=#{C.escape(v)}; path=#{self/"/"}" if v != @k[k] } - [nil]
       self
     end
@@ -426 +431 @@
     # alter the way Camping builds HTTP headers, consider overriding this method.
     def to_s
-      "Status: #{@status}\r\n#{@headers.map{|k,v|[*v].map{|x|"#{k}: #{x}"}}*"\r\n"}\r\n\r\n#{@body}"
+      "Status: #{@status}#{Z+@headers.map{|k,v|[*v].map{|x|"#{k}: #{x}"}}*Z+Z*2+@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
+      Mab.new({},self)
     end
   end
 
+  X = 
   # 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.
@@ -461 +460 @@
   # uncaught by your application.
   module Controllers
+    @r = []
     class << self
-      attr_accessor :routes
+      def r; @r end
       # Add routes to a controller class by piling them into the R method.
       #
@@ -482 +482 @@
       # Most of the time the rules inferred by dispatch method Controllers::D will get you
       # by just fine.
-      def R(*u); Class.new{meta_def(:urls){u};meta_def(:inherited){|x|X.routes<<x}}; end
-
-      # Dispatch routes to controller classes.  Classes are searched in no particular order.
+      def R *u
+        r=@r
+        Class.new {
+          meta_def(:urls){u}
+          meta_def(:inherited){|x|r<<x}
+        }
+      end
+
+      # Dispatch routes to controller classes.
       # For each class, routes are checked for a match based on their order in the routing list
       # given to Controllers::R.  If no routes were given, the dispatcher uses a slash followed
       # by the name of the controller lowercased.
+      #
+      # Controllers are searched in this order:
+      #
+      # # Classes without routes, since they refer to a very specific URL.
+      # # Classes with routes are searched in order of their creation.
+      #
+      # So, define your catch-all controllers last.
       def D(path)
-        constants.each do |c| 
-            k = const_get(c)
-            k.meta_def(:urls){%r!^/#{c.downcase}/?$!}if !k.respond_to? :urls
-            case path when k.urls: return k, $~[1..-1] end
-        end
+        r.map { |k|
+          k.urls.map { |x|
+            return k, $~[1..-1] if path =~ /^#{x}\/?$/
+          }
+        }
         [NotFound, [path]]
+      end
+
+      # The route maker, this is called by Camping internally, you shouldn't need to call it.
+      #
+      # Still, it's worth know what this method does.  Since Ruby doesn't keep track of class
+      # creation order, we're keeping an internal list of the controllers which inherit from R().
+      # This method goes through and adds all the remaining routes to the beginning of the list
+      # and ensures all the controllers have the right mixins.
+      #
+      # Anyway, if you are calling the URI dispatcher from outside of a Camping server, you'll
+      # definitely need to call this at least once to set things up.
+      def M
+        def M; end
+        constants.map { |c|
+          k=const_get(c)
+          k.send:include,C,Base,Models
+          r[0,0]=k if !r.include?k
+          k.meta_def(:urls){["/#{c.downcase}"]}if !k.respond_to?:urls
+        }
       end
     end
@@ -552 +584 @@
       end
     end
+    self
   end
 
@@ -567 +600 @@
     #
     def goes(m)
-        eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING)
-        Apps << const_get(m)
+      eval S.gsub(/Camping/,m.to_s).gsub("A\pps = []","Cam\ping::Apps<<self"), TOPLEVEL_BINDING
     end
 
@@ -609 +641 @@
     # Parses a string of cookies from the <tt>Cookie</tt> header.
     def kp(s); c = qs_parse(s, ';,'); end
-
-    def method_missing(m, c, *a)
-        k = X.const_get(c)
-        k.send :include, C, Base, Models
-        k.allocate.method(m, *a)
-    end
 
     # Fields a request through Camping.  For traditional CGI applications, the method can be
@@ -647 +673 @@
     #
     def run(r=$stdin,e=ENV)
-      k, a = Controllers.D un("/#{e['PATH_INFO']}".gsub(%r!/+!,'/'))
-      i(k).new(r,e,(m=e['REQUEST_METHOD']||"GET")).service(*a)
-    rescue Exception => x
-      i(Controllers::ServerError).new(r,e,'get').service(k,m,x)
-    end
-
+      X.M
+      k,a=X.D un("/#{e['PATH_INFO']}".gsub(/\/+/,'/'))
+      k.new(r,e,(m=e['REQUEST_METHOD']||"GET")).service *a
+    rescue Exception=>x
+      X::ServerError.new(r,e,'get').service(k,m,x)
+    end
+
+    # The Camping scriptable dispatcher.  Any unhandled method call to the app module will
+    # be sent to a controller class, specified as an argument.
+    #
+    #   Blog.get(:Index)
+    #   #=> #<Blog::Controllers::Index ... >
+    #
+    # The controller object contains all the @cookies, @body, @headers, etc. formulated by
+    # the response.
+    #
+    # You can also feed environment variables and query variables as a hash, the final
+    # argument.
+    #
+    #   Blog.post(:Login, :input => {'username' => 'admin', 'password' => 'camping'})
+    #   #=> #<Blog::Controllers::Login @user=... >
+    #
+    #   Blog.get(:Info, :env => {:HTTP_HOST => 'wagon'})
+    #   #=> #<Blog::Controllers::Info @env={'HTTP_HOST'=>'wagon'} ...>
+    #
     def method_missing(m, c, *a)
-      k = Controllers.const_get(c)
-      i(k).new(nil,H['HTTP_HOST','','SCRIPT_NAME','','HTTP_COOKIE',''],m.to_s).service(*a)
+      X.M
+      k = X.const_get(c).new(StringIO.new,
+             H['HTTP_HOST','','SCRIPT_NAME','','HTTP_COOKIE',''],m.to_s)
+      H.new(a.pop).each { |e,f| k.send("#{e}=",f) } if Hash === a[-1]
+      k.service *a
     end
   end
@@ -685 +733 @@
   # Models cannot be referred to in Views at this time.
   module Models
-      A = ActiveRecord
-      # Base is an alias for ActiveRecord::Base.  The big warning I'm going to give you
-      # about this: *Base overloads table_name_prefix.*  This means that if you have a
-      # model class Blog::Models::Post, it's table name will be <tt>blog_posts</tt>.
-      Base = A::Base
-
-      # The default prefix for Camping model classes is the topmost module name lowercase
-      # and followed with an underscore.
-      #
-      #   Tepee::Models::Page.table_name_prefix
-      #     #=> "tepee_pages"
-      #
-      def Base.table_name_prefix
-          "#{name[/\w+/]}_".downcase.sub(/^(#{A}|camping)_/i,'')
-      end
+      autoload:Base,'camping/db'
   end
 
@@ -723 +757 @@
   end
 end
+
+autoload:ActiveRecord,'camping/db'

trunk/lib/camping.rb

@@ -24 +24 @@
 @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]}-[nil];self end;def to_s;"Status: #{@status}#{Z+@headers.map{
-|k,v|[*v].map{|x|"#{k}: #{x}"}}*Z+Z*2+@body}" end;def markaby;Mab.new({},self)
-end end;X=module Controllers
-@r=[];class<<self;def r;@r;end;def R *u;r=@r;Class.new{meta_def(:urls){u}
-meta_def(:inherited){|x|r<<x}}end;def M;constants.map{|c|k=const_get(c);k.
-send:include,C,Base,Models;if !r.include?k;k.meta_def(:urls){["/#{c.downcase}"]}
-r[0,0]=k;end}end;def D p;r.map{|k|k.urls.map{|x|return k,$~[1..-1]if p=~/^#{x}\/?$/}
-};[NotFound, [p]]end end;class NotFound<R();def get p;r(404,Mab.new{h1 P
-h2 p+" not found"}) end end;class ServerError<R();def get k,m,e;r(500,
-Mab.new{h1 P;h2 "#{k}.#{m}";h3 "#{e.class} #{e.message}:";ul{
-e.backtrace.each{|bt|li(bt)}}}.to_s)end end;self;end;class<<self;def goes m
-eval S.gsub(/Camping/,m.to_s).gsub("A\pps=[]","Cam\ping::Apps<<self"),TOPLEVEL_BINDING;end
-def escape(s)s.to_s.gsub(/[^ \w.-]+/n){'%'+($&.unpack('H2'*$&.size)*'%').upcase}.tr(' ','+')end
-def un(s)s.tr('+',' ').gsub(/%([\da-f]{2})/in){[$1].pack('H*')} end
-def qs_parse q,d='&;';m=proc{|_,o,n|o.u(n,&m)rescue([*o
-]<<n)};q.to_s.split(/[#{d}] */n).inject(H[]){|h,p|k,v=un(p).split('=',2)
-h.u 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;X.M;k,a=X.D un("/#{e['PATH_INFO']
-}".gsub(/\/+/,'/'));k.new(r,e,(m=e['REQUEST_METHOD'
-]||"GET")).service *a;rescue Exception=>x;X::ServerError.new(r,e,'get').service(
-k,m,x)end;def method_missing m,c,*a;k=X.const_get c;k.new('',
-H['HTTP_HOST','','SCRIPT_NAME','','HTTP_COOKIE',''],m.to_s).service *a;end
-end;module Views;include X,Helpers end;module Models;autoload(:Base,'camping/db')
-end;class Mab<Markaby::Builder;include \
+" if v!=@k[k]}-[nil];self end;def to_s;"Status: #{@status}#{Z+@headers.map{|k,v|
+[*v].map{|x|"#{k}: #{x}"}}*Z+Z*2+@body}" end;def markaby;Mab.new({},self)end;end
+X=module Controllers;@r=[];class<<self;def r;@r;end;def R *u;r=@r;Class.new{
+meta_def(:urls){u};meta_def(:inherited){|x|r<<x}}end;def M;def M;end;constants.map{|c|
+k=const_get(c);k.send:include,C,Base,Models;r[0,0]=k if !r.include?k;k.meta_def(
+:urls){["/#{c.downcase}"]}if !k.respond_to?:urls}end;def D p;r.map{|k|k.urls.
+map{|x|return k,$~[1..-1]if p=~/^#{x}\/?$/}};[NotFound, [p]]end end;class 
+NotFound<R();def get p;r(404,Mab.new{h1 P;h2 p+" not found"}) end end;class 
+ServerError<R();def get k,m,e;r(500,Mab.new{h1 P;h2 "#{k}.#{m}";h3 "#{e.class
+} #{e.message}:";ul{e.backtrace.each{|bt|li(bt)}}}.to_s)end end;self;end;class<<
+self;def goes m;eval S.gsub(/Camping/,m.to_s).gsub("A\pps=[]","Cam\ping::Apps<<\
+self"),TOPLEVEL_BINDING;end;def escape(s)s.to_s.gsub(/[^ \w.-]+/n){'%'+($&.
+unpack('H2'*$&.size)*'%').upcase}.tr(' ','+')end;def un(s)s.tr('+',' ').gsub(
+/%([\da-f]{2})/in){[$1].pack('H*')}end;def qs_parse q,d='&;';m=proc{|_,o,n|o.u(
+n,&m)rescue([*o]<<n)};q.to_s.split(/[#{d}] */n).inject(H[]){|h,p|k,v=un(p).
+split('=',2);h.u 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;X.M;k,a=X.D un("/#{e[
+'PATH_INFO']}".gsub(/\/+/,'/'));k.new(r,e,(m=e['REQUEST_METHOD']||"GET")).
+service *a;rescue Exception=>x;X::ServerError.new(r,e,'get').service(k,m,x)end
+def method_missing m,c,*a;X.M;k=X.const_get(c).new(StringIO.new,H['HTTP_HOST',
+'','SCRIPT_NAME','','HTTP_COOKIE',''],m.to_s);H.new(a.pop).each{|e,f|k.send(
+"#{e}=",f)}if Hash===a[-1];k.service *a;end;end;module Views;include X,Helpers
+end;module Models;autoload:Base,'camping/db';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
 m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m]:raise(NoMethodError,"#{m}")end
-alias_method:u,:regular_update;end end;autoload(:ActiveRecord,'camping/db')
+alias_method:u,:regular_update;end end;autoload:ActiveRecord,'camping/db'

trunk/lib/camping/db.rb

@@ -8 +8 @@
 module Camping::Models
     A = ActiveRecord
+    # Base is an alias for ActiveRecord::Base.  The big warning I'm going to give you
+    # about this: *Base overloads table_name_prefix.*  This means that if you have a
+    # model class Blog::Models::Post, it's table name will be <tt>blog_posts</tt>.
+    #
+    # ActiveRecord is not loaded if you never reference this class.  The minute you
+    # use the ActiveRecord or Camping::Models::Base class, then the ActiveRecord library
+    # is loaded.
     Base = A::Base
+
+    # The default prefix for Camping model classes is the topmost module name lowercase
+    # and followed with an underscore.
+    #
+    #   Tepee::Models::Page.table_name_prefix
+    #     #=> "tepee_pages"
+    #
     def Base.table_name_prefix
         "#{name[/\w+/]}_".downcase.sub(/^(#{A}|camping)_/i,'')
     end
 end
-Camping::S.sub! "autoload(:Base,'camping/db')", "Base=ActiveRecord::Base"
+Camping::S.sub! "autoload:Base,'camping/db'", "Base=ActiveRecord::Base"
 Camping::Apps.each do |app|
     app::Models::Base = ActiveRecord::Base

trunk/lib/camping/reloader.rb

@@ -60 +60 @@
         @klass = Object.const_get(Object.constants.grep(/^#{title}$/i)[0]) rescue nil
         unless @klass and @klass.const_defined? :C
-            puts "!! trouble loading #{title}: not a Camping app"
+            puts "!! trouble loading #{title}: not a Camping app, no #{title.capitalize} module found"
             @klass = nil
             return