@@ -203,10 +203,10 @@ module Camping # </div> # 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 # Shows AR validation errors for the object passed. lib/camping-unabridged.rb @@ -1,8 +1,9 @@ %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} }if o.errors.any?end end;module Base;include Helpers;attr_accessor:input, lib/camping.rb @@ -146,13 +146,7 @@ class Reloader Camping::Models::Base.logger = Logger.new(@log == "-" ? STDOUT : @log) 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' begin lib/camping/reloader.rb 864472ec690caf06a30f7ce56c8c4e7fd930fe83 _why why@whytheluckystiff.net http://github.com/judofyr/camping/commit/696e702fffcc2bd93ab5471ac378c5b4ae063586 696e702fffcc2bd93ab5471ac378c5b4ae063586 2007-01-06T10:45:38-08:00 2007-01-06T10:45:38-08:00 * 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. eb773bb1ca5527ae0fc74e237da52c54764a1c6c _why why@whytheluckystiff.net