camping 2.0 → 2.1

data/CHANGELOG

@@ -1,3 +1,14 @@
+= 2.1
+=== 19th Aug, 2010 (whyday)
+* Helpers#R now calls to_param on any object it passes in
+* Fix route generation issue with routes including "." (#22)
+* Improved tests
+* Improved 1.9 support
+* Camping::Server is now built upon Rack::Server
+* Add support for ERB, Haml etc through Tilt
+* Introducing Camping.options and Camping#set
+* Camping::Server only loads ActiveRecord when needed
+
 = 2.0
 === 9th Apr, 2010
 * Speed-up of Camping::Mab (thanks zimbatm!)

data/Rakefile

@@ -10,7 +10,7 @@ task :default => :check
 
 ## Constants
 NAME = "camping"
-BRANCH = "2.0"
+BRANCH = "2.1"
 GIT = ENV['GIT'] || "git"
 REV = `#{GIT} rev-list HEAD`.strip.split.length
 VERS = ENV['VERSION'] || (REV.zero? ? BRANCH : [BRANCH, REV] * '.')
@@ -60,6 +60,7 @@ omni =
     s.add_dependency('sqlite3-ruby', '>=1.1.0.1')
     s.add_dependency('mongrel')
     s.add_dependency('RedCloth')
+    s.add_dependency('markaby')
   end
   
 ## RDoc
@@ -123,7 +124,8 @@ end
 
 ## Tests
 Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['test/test_*.rb']
+  t.libs << "test"
+  t.test_files = FileList['test/app_*.rb']
 #  t.warning = true
 #  t.verbose = true
 end
@@ -139,14 +141,19 @@ task :diff do
   u << Ruby2Ruby.new.process(RubyParser.new.parse(File.read("lib/camping.rb")))
   m << Ruby2Ruby.new.process(RubyParser.new.parse(File.read("lib/camping-unabridged.rb")))
   
+  u.flush
+  m.flush
+  
   sh "diff -u #{u.path} #{m.path} | less"
   
   u.delete
   m.delete
 end
 
+error = false
+
 ## Check
-task :check => ["check:valid", "check:size", "check:lines"]
+task :check => ["test", "check:valid", "check:size", "check:lines", "check:exit"]
 namespace :check do
 
   desc "Check source code validity"
@@ -155,8 +162,13 @@ namespace :check do
     u = RubyParser.new.parse(File.read("lib/camping-unabridged.rb"))
     m = RubyParser.new.parse(File.read("lib/camping.rb"))
     
+    u.reject! do |sexp|
+      sexp.is_a?(Sexp) and sexp[1] == s(:gvar, :$LOADED_FEATURES)
+    end
+    
     unless u == m
       STDERR.puts "camping.rb and camping-unabridged.rb are not synchronized."
+      error = true
     end
   end
 
@@ -169,6 +181,7 @@ namespace :check do
     end
     if File.size("lib/camping.rb") > SIZE_LIMIT
       STDERR.puts "lib/camping.rb: file is too big (> #{SIZE_LIMIT})"
+      error = true
     end
   end
 
@@ -177,10 +190,15 @@ namespace :check do
     i = 1
     File.open("lib/camping.rb").each_line do |line|
       if line.size > 81 # 1 added for \n
+        error = true
         STDERR.puts "lib/camping.rb:#{i}: line too long (#{line[-10..-1].inspect})"
       end
       i += 1
     end
   end
+  
+  task :exit do
+    exit 1 if error
+  end
 
 end

data/bin/camping

@@ -1,97 +1,14 @@
 #!/usr/bin/env ruby
 
-trap("INT") { exit }
-require 'optparse'
-require 'ostruct'
-require 'stringio'
-require 'yaml'
-
 $:.unshift File.dirname(__FILE__) + "/../lib"
+
 require 'camping'
 require 'camping/server'
 
-conf = OpenStruct.new(:host => '0.0.0.0', :port => 3301)
-
-# Setup paths
-if home = ENV['HOME'] # POSIX
-  db_path = File.join(home, '.camping.db')
-  rc_path = File.join(home, '.campingrc')
-elsif home = ENV['APPDATA'] # MSWIN
-  db_path = File.join(home, 'Camping.db')
-  rc_path = File.join(home, 'Campingrc')
-end
-
-# Parse options
-opts = OptionParser.new do |opts|
-  opts.banner = "Usage: camping app1.rb, app2.rb..."
-  opts.define_head "#{File.basename($0)}, the microframework ON-button for ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  opts.separator ""
-  opts.separator "Specific options:"
-
-  opts.on("-h", "--host HOSTNAME", "Host for web server to bind to (default is all IPs)") { |val| conf.host = val }
-  opts.on("-p", "--port NUM", "Port for web server (defaults to #{conf.port})") { |val| conf.port = val }
-  opts.on("-d", "--database FILE", "SQLite3 database path (defaults to #{db_path ? db_path : '<none>'})") { |db_path| conf.database = {:adapter => 'sqlite3', :database => db_path} }
-  opts.on("-C", "--console", "Run in console mode with IRB") { conf.server = "console" }
-  server_list = ["mongrel", "webrick", "console"]
-  opts.on("-s", "--server NAME", server_list, "Server to force (#{server_list.join(', ')})") { |val| conf.server = val }
-
-  opts.separator ""
-  opts.separator "Common options:"
-
-  # No argument, shows at tail.  This will print an options summary.
-  # Try it and see!
-  opts.on_tail("-?", "--help", "Show this message") do
-    puts opts
-    exit
-  end
-
-  # Another typical switch to print the version.
-  opts.on_tail("-v", "--version", "Show version") do
-    puts Gem.loaded_specs['camping'].version
-    exit
-  end
-end
-
 begin
-  opts.parse! ARGV
+  Camping::Server.start
 rescue OptionParser::ParseError => ex
   STDERR.puts "!! #{ex.message}"
   puts "** use `#{File.basename($0)} --help` for more details..."
   exit 1
 end
-
-if ARGV.length < 1
-  puts opts
-  exit 1
-end
-
-# Load configuration if any
-if rc_path and File.exists?(rc_path)
-  YAML.load_file(rc_path).each do |k,v|
-    conf.send("#{k}=", v) unless conf.send(k)
-  end 
-  puts "** conf file #{rc_path} loaded"
-end
-
-# Default db
-if conf.database.nil? and db_path
-  conf.database = { :adapter => 'sqlite3', :database => db_path }
-end
-
-
-# get a copy of the paths to pass to the server
-paths = ARGV.dup
-
-# Check that mongrel exists 
-if conf.server.nil? || conf.server == "mongrel"
-  begin
-    require 'mongrel'
-    conf.server = "mongrel"
-  rescue LoadError 
-    puts "!! Could not load mongrel. Falling back to webrick."
-    conf.server = "webrick"
-  end
-end
-
-server = Camping::Server.new(conf, paths)
-server.start

data/book/51_upgrading

@@ -1,5 +1,22 @@
 = Appendix I: Upgrade Notes
 
+This document includes everything needed in order to *upgrade* your
+applications. If you're looking for all the new features in a version, please
+have a look at the CHANGELOG in the Camping source.
+
+
+== From 2.0 to 2.1
+=== Options
+
+In Camping 2.1 there is now a built-in way to store options and settings. If
+you use cookie session, it means that you'll now have to change to:
+
+  module Nuts
+    set :secret, "Very secret text, which no-one else should know!"
+    include Camping::Session
+  end
+
+
 == From 1.5 to 2.0
 === Rack
 

data/lib/camping-unabridged.rb

@@ -12,6 +12,8 @@
 require "uri"
 require "rack"
 
+$LOADED_FEATURES << "camping.rb"
+
 class Object #:nodoc:
   def meta_def(m,&b) #:nodoc:
     (class<<self;self end).send(:define_method,m,&b)
@@ -46,6 +48,7 @@ module Camping
   S = IO.read(__FILE__) rescue nil
   P = "<h1>Cam\ping Problem!</h1><h2>%s</h2>"
   U = Rack::Utils
+  O = {}
   Apps = []
   # An object-like Hash.
   # All Camping query string and cookie variables are loaded as this.
@@ -183,7 +186,7 @@ module Camping
       raise "bad route" unless u = c.urls.find{|x|
         break x if x.scan(p).size == g.size && 
           /^#{x}\/?$/ =~ (x=g.inject(x){|x,a|
-            x.sub p,U.escape((a[a.class.primary_key]rescue a))})
+            x.sub p,U.escape((a.to_param rescue a))}.gsub(/\\(.)/){$1})
       }
       h.any?? u+"?"+U.build_query(h[0]) : u
     end
@@ -195,7 +198,7 @@ module Camping
     #   self / "styles.css" #=> "styles.css"
     #   self / R(Edit, 1)   #=> "/blog/edit/1"
     #
-    def /(p); p[0]==?/?@root+p:p end
+    def /(p); p[0] == ?/ ? @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.
@@ -235,7 +238,25 @@ module Camping
   module Base
     attr_accessor :env, :request, :root, :input, :cookies, :state,
                   :status, :headers, :body
-
+    
+    T = {}
+    L = :layout
+    
+    # Finds a template, returning either:
+    # 
+    #   false             # => Could not find template
+    #   true              # => Found template in Views
+    #   instance of Tilt  # => Found template in a file
+    def lookup(n)
+      T.fetch(n.to_sym) do |k|
+        t = Views.method_defined?(k) ||
+          (f = Dir[[O[:views] || "views", "#{n}.*"]*'/'][0]) &&
+          Template.new(f, O[f[/\.(\w+)$/, 1].to_sym] || {})
+        
+        O[:dynamic_templates] ? t : T[k] = t
+      end
+    end
+    
     # Display a view, calling it by its method name +v+.  If a <tt>layout</tt>
     # method is found in Camping::Views, it will be used to wrap the HTML.
     #
@@ -248,8 +269,15 @@ module Camping
     #     end
     #   end
     #
-    def render(v,*a,&b)
-      mab(/^_/!~v.to_s){send(v,*a,&b)}
+    def render(v, *a, &b)
+      if t = lookup(v)
+        o = Hash === a[-1] ? a.pop : {}
+        s = (t == true) ? mab{ send(v, *a, &b) } : t.render(self, o[:locals] || {}, &b)
+        s = render(L, o.merge(L => false)) { s } if v.to_s[0] != ?_ && o[L] != false && lookup(L)
+        s
+      else
+        raise "Can't find template #{v}"
+      end
     end
 
     # You can directly return HTML form your controller for quick debugging
@@ -262,11 +290,8 @@ module Camping
     #   end
     #
     # You can also pass true to use the :layout HTML wrapping method
-    def mab(l=nil,&b)
-      m=Mab.new({},self)
-      s=m.capture(&b)
-      s=m.capture{layout{s}} if l && m.respond_to?(:layout)
-      s
+    def mab(&b)
+      (@mab ||= Mab.new({},self)).capture(&b)
     end
     
     # A quick means of setting this controller's status, body and headers
@@ -355,7 +380,7 @@ module Camping
     #     end
     #   end
     def to_a
-      @env['rack.session'] = @state
+      @env['rack.session'] = Hash[@state]
       r = Rack::Response.new(@body, @status, @headers)
       @cookies.each do |k, v|
         next if @old_cookies[k] == v
@@ -517,11 +542,11 @@ module Camping
       # * Classes with routes are searched in order of their creation.
       #
       # So, define your catch-all controllers last.
-      def D(p, m)
+      def D(p, m, e)
         p = '/' if !p || !p[0]
         r.map { |k|
           k.urls.map { |x|
-            return (k.instance_method(m) rescue nil) ?
+            return (k.method_defined?(m)) ?
               [k, m, *$~[1..-1]] : [I, 'r501', m] if p =~ /^#{x}\/?$/
           }
         }
@@ -547,9 +572,9 @@ module Camping
         end
         constants.map { |c|
           k = const_get(c)
-          k.send :include,C,Base,Helpers,Models
+          k.send :include,C,X,Base,Helpers,Models
           @r=[k]+r if r-[k]==r
-          k.meta_def(:urls){["/#{c.scan(/.[^A-Z]*/).map(&N.method(:[]))*'/'}"]}if !k.respond_to?:urls
+          k.meta_def(:urls){["/#{c.to_s.scan(/.[^A-Z]*/).map(&N.method(:[]))*'/'}"]}if !k.respond_to?:urls
         }
       end
     end
@@ -584,7 +609,7 @@ module Camping
     def call(e)
       X.M
       p = e['PATH_INFO'] = U.unescape(e['PATH_INFO'])
-      k,m,*a=X.D p,e['REQUEST_METHOD'].downcase
+      k,m,*a=X.D p,e['REQUEST_METHOD'].downcase,e
       k.new(e,m).service(*a).to_a
     rescue
       r500(:I, k, m, $!, :env => e).to_a
@@ -627,6 +652,20 @@ module Camping
       m = a.shift.new(method(:call), *a, &b)
       meta_def(:call) { |e| m.call(e) }
     end
+    
+    # A hash where you can set different settings.
+    def options
+      O
+    end
+    
+    # Shortcut for setting options:
+    # 
+    #   module Blog
+    #     set :secret, "Hello!"
+    #   end
+    def set(k, v)
+      O[k] = v
+    end
   end
   
   # Views is an empty module for storing methods which create HTML. The HTML
@@ -696,6 +735,7 @@ module Camping
   end
  
   autoload :Mab, 'camping/mab'
+  autoload :Template, 'camping/template'
   C
 end
 

data/lib/camping.rb

@@ -1,40 +1,45 @@
 require "uri";require "rack";class Object;def meta_def m,&b;(class<<self;self
 end).send:define_method,m,&b end end;module Camping;C=self;S=IO.read(__FILE__
-)rescue nil;P="<h1>Cam\ping Problem!</h1><h2>%s</h2>";U=Rack::Utils;Apps=[]
+)rescue nil;P="<h1>Cam\ping Problem!</h1><h2>%s</h2>";U=Rack::Utils;O={};Apps=[]
 class H<Hash;def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.
 to_s]:super end;undef id,type if ??==63;end;module Helpers;def R c,*g;p,h=
 /\(.+?\)/,g.grep(Hash);g-=h;raise"bad route"unless u=c.urls.find{|x|break x if
-x.scan(p).size==g.size&&/^#{x}\/?$/=~(x=g.inject(x){|x,a|x.sub p,U.escape((a[
-a.class.primary_key]rescue a))})};h.any?? u+"?"+U.build_query(h[0]):u end;def
+x.scan(p).size==g.size&&/^#{x}\/?$/=~(x=g.inject(x){|x,a|x.sub p,U.escape((a.
+to_param rescue a))}.gsub(/\\(.)/){$1})};h.any?? u+"?"+U.build_query(h[0]):u end;def
 / p;p[0]==?/?@root + p : p end;def URL c='/',*a;c=R(c, *a) if c.respond_to?(
 :urls);c=self/c;c=@request.url[/.{8,}?(?=\/)/]+c if c[0]==?/;URI c end end
 module Base;attr_accessor:env,:request,:root,:input,:cookies,:state,:status,
-:headers,:body;def render v,*a,&b;mab(/^_/!~v.to_s){send(v,*a,&b)} end;def
-mab l=nil,&b;m=Mab.new({},self);s=m.capture(&b);s=m.capture{layout{s}} if l &&
-m.respond_to?(:layout);s end;def r s,b,h={};b,h=h,b if Hash===b;@status=s;
-@headers.merge!(h);@body=b;end;def redirect *a;r 302,'','Location'=>URL(*a).
-to_s;end;def r404 p;P%"#{p} not found"end;def r500 k,m,e;raise e;end;def r501 m
-P%"#{m.upcase} not implemented"end;def to_a;@env['rack.session']=@state;r=Rack::
-Response.new(@body,@status,@headers);@cookies.each{|k,v|next if @old_cookies[
-k]==v;v={:value=>v,:path=>self/"/"} if String===v;r.set_cookie(k,v)};r.to_a;end
-def initialize(env,m) r=@request=Rack::Request.new(@env=env);@root,@input,
-@cookies,@state,@headers,@status,@method=r.script_name.sub(/\/$/,''),n(r.params
-),H[@old_cookies = r.cookies],H[r.session],{},m=~/r(\d+)/?$1.to_i: 200,m end;def
-n h;Hash===h ?h.inject(H[]){|m,(k,v)|m[k]=n(v);m}: h end;def service *a;r=catch(
-:halt){send(@method,*a)};@body||=r;self;end;end;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 D p,m;p='/'if !p||!p[0];r.map{|k|k.urls.map{|x|return(k.
-instance_method(m)rescue nil)?[k,m,*$~[1..-1]]:[I,'r501',m]if p=~/^#{x}\/?$/}}
-[I,'r404',p] end;N=H.new{|_,x|x.downcase}.merge! "N"=>'(\d+)',"X"=>'([^/]+)',
-"Index"=>'';def M;def M;end;constants.map{|c|k=const_get(c);k.send:include,C,
-Base,Helpers,Models;@r=[k]+r if r-[k]==r;k.meta_def(:urls){ [ "/#{c.scan(
-/.[^A-Z]*/).map(&N.method(:[]))*'/'}"]}if !k.respond_to?:urls}end end;I=R()
-end;X=Controllers;class<<self;def goes m;Apps<<eval(S.gsub(/Camping/,m.to_s),
-TOPLEVEL_BINDING) end;def call e;X.M;p=e['PATH_INFO']=U.unescape(e['PATH_INFO'])
-k,m,*a=X.D p,e['REQUEST_METHOD'].downcase;k.new(e,m).service(*a).to_a;rescue
-r500(:I,k,m,$!,:env=>e).to_a;end;def method_missing m,c,*a;X.M;h=Hash===a[-1]?
-a.pop: {};e=H[Rack::MockRequest.env_for('',h.delete(:env)||{})];k=X.const_get(c
-).new(e,m.to_s);h.each{|i,v|k.send"#{i}=",v};k.service(*a);end;def use*a,&b;m=a.
-shift.new(method(:call),*a,&b);meta_def(:call){|e|m.call(e)}end end;module Views
-include X,Helpers end;module Models;autoload:Base,
-'camping/ar';end;autoload:Mab,'camping/mab';C end
+:headers,:body;T={};L=:layout;def lookup n;T.fetch(n.to_sym){|k|t=Views.
+method_defined?(k)||(f=Dir[[O[:views]||"views","#{n}.*"]*'/'][0])&&Template.
+new(f,O[f[/\.(\w+)$/,1].to_sym]||{});O[:dynamic_templates]?t:T[k]=t} end
+def render(v,*a,&b)if t=lookup(v);o=Hash===a[-1]?a.pop: {};s=(t==true)?mab{
+send v,*a,&b}: t.render(self,o[:locals]||{},&b);s=render(L,o.merge(L=>false)){s
+}if v.to_s[0]!=?_&&o[L]!=false&&lookup(L);s;else;raise"Can't find template #{v}"end
+end;def mab &b;(@mab||=Mab.new({},self)).capture(&b) end;def r s,b,h={};b,h=h,
+b if Hash===b;@status=s;@headers.merge!(h);@body=b;end;def redirect *a;r 302,'',
+'Location'=>URL(*a).to_s;end;def r404 p;P%"#{p} not found"end;def r500 k,m,e
+raise e;end;def r501 m;P%"#{m.upcase} not implemented"end;def to_a;@env[
+'rack.session']=Hash[@state];r=Rack::Response.new(@body,@status,@headers)
+@cookies.each{|k,v|next if @old_cookies[k]==v;v={:value=>v,:path=>self/"/"} if
+String===v;r.set_cookie(k,v)};r.to_a;end;def initialize(env,m) r=@request=Rack::
+Request.new(@env=env);@root,@input,@cookies,@state,@headers,@status,@method=r.
+script_name.sub(/\/$/,''),n(r.params),H[@old_cookies = r.cookies],H[r.session],
+{},m=~/r(\d+)/?$1.to_i: 200,m end;def n h;Hash===h ?h.inject(H[]){|m,(k,v)|m[k]=
+n(v);m}: h end;def service *a;r=catch(:halt){send(@method,*a)};@body||=r;self
+end;end;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 D p,m,e;p='/'if !p||
+!p[0];r.map{|k|k.urls.map{|x|return(k.method_defined? m)?[k,m,*$~[1..-1]]:[I,
+'r501',m]if p=~/^#{x}\/?$/}};[I,'r404',p] end;N=H.new{|_,x|x.downcase}.merge!(
+"N"=>'(\d+)',"X"=>'([^/]+)',"Index"=>'');def M;def M;end;constants.map{|c|k=
+const_get(c);k.send:include,C,X,Base,Helpers,Models;@r=[k]+r if r-[k]==r
+k.meta_def(:urls){ [ "/#{c.to_s.scan(/.[^A-Z]*/).map(&N.method(:[]))*'/'}"]}if !k.
+respond_to?:urls}end end;I=R();end;X=Controllers;class<<self;def goes m;Apps<<
+eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING) end;def call e;X.M
+p=e['PATH_INFO']=U.unescape(e['PATH_INFO']);k,m,*a=X.D p,e['REQUEST_METHOD'].
+downcase,e;k.new(e,m).service(*a).to_a;rescue;r500(:I,k,m,$!,:env=>e).to_a;end
+def method_missing m,c,*a;X.M;h=Hash===a[-1]?a.pop: {};e=H[Rack::MockRequest.
+env_for('',h.delete(:env)||{})];k=X.const_get(c).new(e,m.to_s);h.each{|i,v|k.
+send"#{i}=",v};k.service(*a);end;def use*a,&b;m=a.shift.new(method(:call),*a,&b)
+meta_def(:call){|e|m.call(e)}end;def options;O end;def set k,v;O[k]=v end end
+module Views;include X,Helpers end;module Models;autoload:Base,'camping/ar';end
+autoload:Mab,'camping/mab';autoload:Template,'camping/template';C end