Changeset 180

Timestamp:

01/06/2007 12:45:38 (23 months ago)

Author:

why

Message:

• lib/camping.rb: added query-string building to R().
  
• lib/camping-unabridged.rb: ditto.
  
• lib/camping/reloader.rb: that sqlite3 message is appearing when other drivers are used with the reloader.
  

Location:

trunk/lib

Files:

• camping-unabridged.rb (modified) (1 diff)
• camping.rb (modified) (1 diff)
• camping/reloader.rb (modified) (1 diff)

trunk/lib/camping-unabridged.rb

@@ -204 +204 @@
     #
     def R(c,*g)
-      p=/\(.+?\)/
-      g.inject(c.urls.find{|x|x.scan(p).size==g.size}.dup){|s,a|
+      p,h=/\(.+?\)/,g.grep(Hash)
+      (g-=h).inject(c.urls.find{|x|x.scan(p).size==g.size}.dup){|s,a|
         s.sub p,C.escape((a[a.class.primary_key]rescue a))
-      }
+      }+(h.any?? "?"+h[0].map{|x|x.map{|z|C.escape z}*"="}*"&": "")
     end
 

trunk/lib/camping.rb

@@ -1 +1 @@
 %w[active_support markaby tempfile uri].map{|l|require l}
 module Camping;Apps=[];C=self;S=IO.read(__FILE__).sub(/S=I.+$/,'')
-P="Cam\ping Problem!";module Helpers;def R c,*g;p=/\(.+?\)/;g.inject(c.
-urls.find{|x|x.scan(p).size==g.size}.dup){|s,a|s.sub p,C.escape((a[
-a.class.primary_key]rescue a))}end;def URL c='/',*a;c=R(c,*a)if c.
+P="Cam\ping Problem!";module Helpers;def R(c,*g);p,h=/\(.+?\)/,g.grep(Hash)
+(g-=h).inject(c.urls.find{|x|x.scan(p).size==g.size}.dup){|s,a|s.sub p,C.
+escape((a[a.class.primary_key]rescue a))}+(h.any?? "?"+h[0].map{|x|x.map{|z|C.
+escape z}*"="}*"&": "")end;def URL c='/',*a;c=R(c,*a)if c.
 respond_to?:urls;c=self/c;c="//"+@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}

trunk/lib/camping/reloader.rb

@@ -147 +147 @@
                 end
 
-                begin
-                    Camping::Models::Session.create_schema
-                rescue MissingSourceFile
-                    puts "** #$0 stopped: SQLite3 not found, please install."
-                    puts "** See http://code.whytheluckystiff.net/camping/wiki/BeAlertWhenOnSqlite3 for instructions."
-                    exit
-                end
+                Camping::Models::Session.create_schema
 
                 if @database and @database[:adapter] == 'sqlite3'