Changeset 110

Timestamp:

06/08/2006 14:21:32 (2 years ago)

Author:

why

Message:

• lib/camping.rb: new Camping::Apps stores all app modules.
  
• examples/*: updated the postambles per zimbatm's #28.
  

Location:

trunk

Files:

• examples/blog/blog.rb (modified) (1 diff)
• examples/campsh/campsh.rb (modified) (1 diff)
• lib/camping-unabridged.rb (modified) (2 diffs)
• lib/camping.rb (modified) (2 diffs)

trunk/examples/blog/blog.rb

@@ -272 +272 @@
 
 if __FILE__ == $0
-  require 'mongrel/camping'
+  begin
+    require 'mongrel/camping'
+  rescue LoadError => e
+    abort "** Try running `camping #$0' instead."
+  end
 
   Blog::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'blog.db'

trunk/examples/campsh/campsh.rb

@@ -621 +621 @@
 
 if __FILE__ == $0
-  CampSh::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'campsh.db'
+  begin
+    require 'mongrel/camping'
+  rescue LoadError => e
+    abort "** Try running `camping #$0' instead."
+  end
+
+  CampSh::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'blog.db'
   CampSh::Models::Base.logger = Logger.new('camping.log')
+  CampSh::Models::Base.threaded_connections=false
   CampSh.create
-  puts CampSh.run
+
+  server = Mongrel::Camping::start("0.0.0.0",3002,"/",CampSh)
+  puts "** CampSh example is running at http://localhost:3002/"
+  server.run.join
 end

trunk/lib/camping-unabridged.rb

@@ -87 +87 @@
 # For more tips, see http://code.whytheluckystiff.net/camping/wiki/GiveUsTheCreateMethod.
 module Camping
+  # Stores an +Array+ of all Camping applications modules.  Modules are added
+  # automatically by +Camping.goes+.
+  #
+  #   Camping.goes :Blog
+  #   Camping.goes :Tepee
+  #   Camping::Apps # => [Blog, Tepee]
+  # 
+  Apps = []
   C = self
   F = __FILE__
@@ -548 +556 @@
     def goes(m)
         eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING)
+        Apps << const_get(m)
     end
 

trunk/lib/camping.rb

@@ -1 +1 @@
 %w[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 Camping;Apps=[];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,C.escape((a.__send__(a.class.primary_key
@@ -34 +34 @@
 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(
+eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING);Apps<<const_get(m);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('%'