camping 2.1 → 2.1.467

data/Rakefile

@@ -1,97 +1,38 @@
 $:.unshift 'extras'
 require 'rake'
 require 'rake/clean'
-require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'tempfile'
 require 'open3'
 
-task :default => :check
-
-## Constants
-NAME = "camping"
-BRANCH = "2.1"
-GIT = ENV['GIT'] || "git"
-REV = `#{GIT} rev-list HEAD`.strip.split.length
-VERS = ENV['VERSION'] || (REV.zero? ? BRANCH : [BRANCH, REV] * '.')
+require File.expand_path('../constants', __FILE__)
 
 CLEAN.include ['**/.*.sw?', '*.gem', '.config', 'test/test.log', '.*.pt']
-RDOC_OPTS = ["--line-numbers", "--quiet", "--main", "README"]
-    
-## Packaging
-spec =
-  Gem::Specification.new do |s|
-    s.name = NAME
-    s.version = VERS
-    s.platform = Gem::Platform::RUBY
-    s.has_rdoc = true
-    s.extra_rdoc_files = FileList["README", "CHANGELOG", "COPYING", "book/*"].to_a
-    s.rdoc_options += RDOC_OPTS + ['--exclude', '^(examples|extras)\/', '--exclude', 'lib/camping.rb']
-    s.summary = "minature rails for stay-at-home moms"
-    s.author = "why the lucky stiff"
-    s.email = 'why@ruby-lang.org'
-    s.homepage = 'http://camping.rubyforge.org/'
-    s.rubyforge_project = 'camping'
-    s.executables = ['camping']
-
-    s.add_dependency('rack', '>=1.0')
-    s.required_ruby_version = '>= 1.8.2'
-
-    s.files = %w(COPYING README Rakefile) +
-    Dir.glob("{bin,doc,test,lib,extras,book}/**/*") + 
-    Dir.glob("ext/**/*.{h,c,rb}") +
-    Dir.glob("examples/**/*.rb") +
-    Dir.glob("tools/*.rb")
-
-    s.require_path = "lib"
-    s.bindir = "bin"
-  end                   
-
-omni =
-  Gem::Specification.new do |s|
-    s.name = "camping-omnibus"
-    s.version = VERS
-    s.platform = Gem::Platform::RUBY
-    s.summary = "the camping meta-package for updating ActiveRecord, Mongrel and SQLite3 bindings"
-    %w[author email homepage rubyforge_project].each { |x| s.__send__("#{x}=", spec.__send__(x)) }
-
-    s.add_dependency('camping', "=#{VERS}")
-    s.add_dependency('activerecord')
-    s.add_dependency('sqlite3-ruby', '>=1.1.0.1')
-    s.add_dependency('mongrel')
-    s.add_dependency('RedCloth')
-    s.add_dependency('markaby')
-  end
-  
+
+task :default => :check
+
 ## RDoc
 
 begin
-  gem 'rdoc', '~> 2.4.0'
+  gem 'rdoc', '~>3.9.0'
 rescue LoadError
-  # Don't complain yet.
-end
-
-require 'rdoc/rdoc'
-require 'rake/rdoctask'
-
-Rake::RDocTask.new(:docs) do |rdoc|
-  if defined?(RDoc::VERSION) && RDoc::VERSION[0,3] == "2.4"
+  task :docs do
+    puts "** Camping needs RDoc 3.9 in order to use the Flipbook template."
+  end
+else
+  require 'rdoc/task'
+  RDoc::Task.new(:docs) do |rdoc|
     # We have a recent version of RDoc, so let's use flipbook.
     require 'rdoc/generator/singledarkfish'
     rdoc.options += ['-f', 'singledarkfish', *RDOC_OPTS]
     rdoc.template = "flipbook"
-  else
-    # Use whatever template is available, and give a little warning.
-    task :docs do
-      puts "** Camping needs RDoc 2.4 in order to use the Flipbook template."
-    end
+    
+    rdoc.rdoc_dir = 'doc'
+    rdoc.title = "Camping, a Microframework"
+    rdoc.rdoc_files.add ['README', 'lib/camping-unabridged.rb', 'lib/camping/**/*.rb', 'book/*']
   end
-  
-  rdoc.inline_source = false # --inline-source is deprecated
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title = "Camping, a Microframework"
-  rdoc.rdoc_files.add ['README', 'lib/camping-unabridged.rb', 'lib/camping/**/*.rb', 'book/*']
 end
+
   
 task :rubygems_docs do
   require 'rubygems/doc_manager'
@@ -105,29 +46,10 @@ end
 desc "Packages Camping."
 task :package => :clean
 
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true
-  p.gem_spec = spec
-end
-
-Rake::GemPackageTask.new(omni) do |p|
-  p.gem_spec = omni
-end
-
-task :install => :package do
-  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
 ## Tests
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.test_files = FileList['test/app_*.rb']
-#  t.warning = true
-#  t.verbose = true
 end
 
 ## Diff
@@ -153,11 +75,16 @@ end
 error = false
 
 ## Check
-task :check => ["test", "check:valid", "check:size", "check:lines", "check:exit"]
+task :check => ["test", "check:valid", "check:equal", "check:size", "check:lines", "check:exit"]
 namespace :check do
 
   desc "Check source code validity"
   task :valid do
+    sh "ruby -c lib/camping.rb"
+  end
+
+  desc "Check equality between mural and unabridged"
+  task :equal do
     require 'ruby_parser'
     u = RubyParser.new.parse(File.read("lib/camping-unabridged.rb"))
     m = RubyParser.new.parse(File.read("lib/camping.rb"))

data/extras/rdoc/generator/template/flipbook/js/camping.js

@@ -1,5 +1,16 @@
 // I know, I know.
 $(function() {
+    // #M0001 -> $(the section + the method body)
+    function m(name) {
+      var base = $(name);
+      return base.parent().add(base.next());
+    }
+    
+    // #class-something -> $(the section below)
+    function s(name) {
+      return $(name).next();
+    }
+
   $('.source-link a').click(function() {
     var link = $(this);
     var code = link.parent().next();
@@ -64,16 +75,6 @@ $(function() {
       }
     });
     
-    // #M0001 -> $(the section + the method body)
-    function m(name) {
-      var base = $(name);
-      return base.parent().add(base.next());
-    }
-    
-    // #class-something -> $(the section below)
-    function s(name) {
-      return $(name).next();
-    }
   }
   
 });

data/lib/camping-unabridged.rb

@@ -82,6 +82,24 @@ module Camping
     end
     undef id, type if ?? == 63
   end
+
+  class Cookies < H
+    attr_accessor :_p
+    #
+    # Cookies that are set at this response
+    def _n; @n ||= {} end
+
+    alias _s []=
+
+    def set(k, v, o = {})
+      _s(j=k.to_s, v)
+      _n[j] = {:value => v, :path => _p}.update(o)
+    end
+
+    def []=(k, v)
+      set k, v, v.is_a?(Hash) ? v : {}
+    end
+  end
   
   # Helpers contains methods available in your controllers and views. You may
   # add methods of your own to this module, including many helper methods from
@@ -234,7 +252,7 @@ module Camping
   # it saves code for all the glue to stay in one place. Forgivable,
   # considering that it's only really a handful of methods and accessors.
   #
-  # Everything in this module is accessable inside your controllers.
+  # Everything in this module is accessible inside your controllers.
   module Base
     attr_accessor :env, :request, :root, :input, :cookies, :state,
                   :status, :headers, :body
@@ -250,6 +268,7 @@ module Camping
     def lookup(n)
       T.fetch(n.to_sym) do |k|
         t = Views.method_defined?(k) ||
+          (t = O[:_t].keys.grep(/^#{n}\./)[0]and Template[t].new{O[:_t][t]}) ||
           (f = Dir[[O[:views] || "views", "#{n}.*"]*'/'][0]) &&
           Template.new(f, O[f[/\.(\w+)$/, 1].to_sym] || {})
         
@@ -271,17 +290,17 @@ module Camping
     #
     def render(v, *a, &b)
       if t = lookup(v)
-        o = Hash === a[-1] ? a.pop : {}
+        r, @_r = @_r, 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 = render(L, o.merge(L => false)) { s } if o[L] or o[L].nil? && lookup(L) && (!r && v.to_s[0] != ?_)
         s
       else
-        raise "Can't find template #{v}"
+        raise "no template: #{v}"
       end
     end
 
-    # You can directly return HTML form your controller for quick debugging
-    # by calling this method and pass some Markaby to it.
+    # You can directly return HTML from your controller for quick debugging
+    # by calling this method and passing some Markaby to it.
     # 
     #   module Nuts::Controllers
     #     class Info
@@ -367,6 +386,12 @@ module Camping
     def r501(m)
       P % "#{m.upcase} not implemented"
     end
+
+    # Serves the string +c+ with the MIME type of the filename +p+.
+    def serve(p, c)
+      t = Rack::Mime.mime_type(p[/\..*$/], nil) and @headers['Content-Type'] = t
+      c
+    end
     
     # Turn a controller into a Rack response. This is designed to be used to
     # pipe controllers into the <tt>r</tt> method. A great way to forward your
@@ -382,9 +407,7 @@ module Camping
     def to_a
       @env['rack.session'] = Hash[@state]
       r = Rack::Response.new(@body, @status, @headers)
-      @cookies.each do |k, v|
-        next if @old_cookies[k] == v
-        v = { :value => v, :path => self / "/" } if String === v
+      @cookies._n.each do |k, v|
         r.set_cookie(k, v)
       end
       r.to_a
@@ -395,8 +418,9 @@ module Camping
       @root, @input, @cookies, @state,
       @headers, @status, @method =
       r.script_name.sub(/\/$/,''), n(r.params),
-      H[@old_cookies = r.cookies], H[r.session],
+      Cookies[r.cookies], H[r.session.to_hash],
       {}, m =~ /r(\d+)/ ? $1.to_i : 200, m
+      @cookies._p = self/"/"
     end
     
     def n(h) # :nodoc:
@@ -504,11 +528,6 @@ module Camping
   module Controllers
     @r = []
     class << self
-      # An array containing the various controllers available for dispatch.
-      def r #:nodoc:
-        @r
-      end
-      
       # Add routes to a controller class by piling them into the R method.
       # 
       # The route is a regexp which will match the request path. Anything
@@ -544,7 +563,8 @@ module Camping
       # So, define your catch-all controllers last.
       def D(p, m, e)
         p = '/' if !p || !p[0]
-        r.map { |k|
+        a=O[:_t].find{|n,_|n==p} and return [I, :serve, *a]
+        @r.map { |k|
           k.urls.map { |x|
             return (k.method_defined?(m)) ?
               [k, m, *$~[1..-1]] : [I, 'r501', m] if p =~ /^#{x}\/?$/
@@ -573,7 +593,7 @@ module Camping
         constants.map { |c|
           k = const_get(c)
           k.send :include,C,X,Base,Helpers,Models
-          @r=[k]+r if r-[k]==r
+          @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
@@ -598,7 +618,11 @@ module Camping
     #
     # All the applications will be available in Camping::Apps.
     def goes(m)
-      Apps << eval(S.gsub(/Camping/,m.to_s), TOPLEVEL_BINDING)
+      Apps << a = eval(S.gsub(/Camping/,m.to_s), TOPLEVEL_BINDING)
+      caller[0]=~/:/
+      IO.read(a.set:__FILE__,$`)=~/^__END__/ &&
+      (b=$'.split(/^@@\s*(.+?)\s*\r?\n/m)).shift rescue nil
+      a.set :_t,H[*b||[]]
     end
     
     # Ruby web servers use this method to enter the Camping realm. The +e+
@@ -732,8 +756,9 @@ module Camping
   # Models cannot be referred to in Views at this time.
   module Models
     autoload :Base,'camping/ar'
+    Helpers.send(:include, X, self)
   end
- 
+
   autoload :Mab, 'camping/mab'
   autoload :Template, 'camping/template'
   C

data/lib/camping.rb

@@ -2,44 +2,54 @@ 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;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=
+to_s]:super end;undef id,type if ??==63 end;class Cookies<H;attr_accessor :_p;
+def _n;@n||={}end;alias :_s :[]=;def set k,v,o={};_s(j=k.to_s,v);_n[j]=
+{:value=>v,:path=>_p}.update o;end;def []=(k,v)set(k,v,v.is_a?(Hash)?v:{})end
+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.
-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?(
+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;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.
+method_defined?(k)||(t=O[:_t].keys.grep(/^#{n}\./)[0]and Template[t].new{
+O[:_t][t]})||(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{
+def render v,*a,&b;if t=lookup(v);r,@_r=@_r,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[
+}if o[L]or o[L].nil?&&lookup(L)&&!r&&v.to_s[0]!=?_;s;else;raise"no 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 serve(p,c)
+(t=Rack::Mime.mime_type p[/\..*$/],nil)&&@headers["Content-Type"]=t;c;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]=
+@cookies._n.each{|k,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),Cookies[r.cookies],
+H[r.session.to_hash],{},m=~/r(\d+)/?$1.to_i: 200,m;@cookies._p=self/"/" 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
+end end;module Controllers;@r=[];class<<self;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];(a=O[:_t].find{|n,_|n==p}) and return [I,:serve,*a]
+@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<<a=eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING);caller[0]=~/:/
+IO.read(a.set:__FILE__,$`)=~/^__END__/&&(b=$'.split /^@@\s*(.+?)\s*\r?\n/m).shift rescue nil
+a.set :_t,H[*b||[]];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
+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)
+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
+module Views;include X,Helpers end;module Models;autoload:Base,'camping/ar'
+Helpers.send:include,X,self end;autoload:Mab,'camping/mab'
+autoload:Template,'camping/template';C end

data/lib/camping/reloader.rb

@@ -53,6 +53,10 @@ module Camping
       # Loads the apps availble in this script.  Use <tt>apps</tt> to get
       # the loaded apps.
       def load_apps
+        @requires.each do |path|
+          $LOADED_FEATURES.delete(path)
+        end
+
         all_requires = $LOADED_FEATURES.dup
         all_apps = Camping::Apps.dup
         
@@ -122,7 +126,7 @@ module Camping
       def full_path(req)
         dir = $LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) }
         if dir 
-          File.join(File.expand_path(dir), req)
+          File.expand_path(req, File.expand_path(dir))
         else
           req
         end

data/test/app_cookies.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+require 'camping'
+
+Camping.goes :Cookies
+
+module Cookies::Controllers
+  class One
+    def get
+      @cookies.simple = '42'
+      @cookies.set :complex, '43'
+      @cookies.set :past, 'past', :expires => Time.now - 5
+      render :show
+    end
+  end
+
+  class Two
+    def get
+      render :show
+    end
+  end
+
+  class Old
+    def get
+      @cookies.simple = '42'
+      @cookies.complex = { :value => '43' }
+      @cookies.past = { :value => 'past', :expires => Time.now - 5 }
+      @cookies.past.class.name
+    end
+  end
+end
+
+module Cookies::Views
+  def show
+    @cookies.values_at('simple', 'complex', 'past').inspect
+  end
+end
+
+class Cookies::Test < TestCase
+  def test_cookies
+    get '/one'
+    assert_body '["42", "43", "past"]'
+
+    get '/two'
+    assert_body '["42", "43", nil]'
+  end
+
+  def test_backward_compatible
+    get '/old'
+    assert_body 'Hash'
+
+    get '/two'
+    assert_body '["42", "43", nil]'
+  end
+
+  def test_path
+    get '/one', {}, 'SCRIPT_NAME' => '/mnt'
+    assert_body '["42", "43", "past"]'
+    assert_equal 3, last_response.headers["Set-Cookie"].scan('path=/mnt/').size
+  end
+end
+

data/test/app_file.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+require 'camping'
+
+Camping.goes :FileSource
+
+module FileSource::Controllers
+  class Index
+    def get
+      FileSource.options[:__FILE__]
+    end
+  end
+end
+
+class FileSource::Test < TestCase
+  def test_source
+    get '/'
+    assert_body __FILE__
+  end
+
+  def test_file
+    get '/style.css'
+    assert_body "* { margin: 0; padding: 0 }"
+    assert_equal "text/css", last_response.headers['Content-Type']
+
+    get '/test.foo'
+    assert_body "Hello"
+    assert_equal "text/html", last_response.headers['Content-Type']
+
+    get '/test'
+    assert_body "No extension"
+    assert_equal "text/html", last_response.headers['Content-Type']
+  end
+end
+
+__END__
+
+@@ /style.css
+* { margin: 0; padding: 0 }
+
+@@ /test.foo
+Hello
+
+@@ /test
+No extension
+

data/test/app_helpers.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+require 'camping'
+
+Camping.goes :Helpers
+
+module Helpers::Helpers
+  def frontpage
+    R(Index)
+  end
+
+  def current_user
+    User.new
+  end
+end
+
+module Helpers::Models
+  class User
+    def name
+      'Bob'
+    end
+  end
+end
+
+module Helpers::Controllers
+  class Index
+    def get
+      current_user.name
+    end
+  end
+
+  class Users
+    def get
+      frontpage
+    end
+  end
+end
+
+class Helpers::Test < TestCase
+  def test_models
+    get '/'
+    assert_body "Bob"
+  end
+
+  def test_controllers
+    get '/users'
+    assert_body "/"
+  end
+end
+

data/test/app_inline_templates.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+require 'camping'
+
+Camping.goes :Inline
+
+module Inline::Controllers
+  class Index
+    def get
+      @world = "World"
+      render :index
+    end
+  end
+
+  class UserX
+    def get(name)
+      @name = name
+      render :user
+    end
+  end
+end
+
+class Inline::Test < TestCase
+  def test_inline
+    get '/'
+    assert_body "Hello World"
+
+    get '/user/Bluebie'
+    assert_body "My name is Bluebie"
+  end
+end
+
+__END__
+
+@@ index.erb
+Hello <%= @world %>
+
+@@ user.erb
+My name is <%= @name %>
+

data/test/app_partials.rb

@@ -0,0 +1,118 @@
+require 'test_helper'
+require 'camping'
+
+Camping.goes :Partials
+Camping.goes :TiltPartials
+
+module Partials::Controllers
+  class Index
+    def get
+      render :index
+    end
+  end
+
+  class Partial
+    def get
+      render :_partial
+    end
+  end
+
+  class Nolayout
+    def get
+      render :index, :layout => false
+    end
+  end
+
+  class Forcelayout
+    def get
+      render :_partial, :layout => true
+    end
+  end
+
+  class Nested
+    def get
+      render :nested
+    end
+  end
+end
+
+# Copy over all controllers
+module TiltPartials::Controllers
+  Partials::Controllers.constants.each do |const|
+    const_set(const, Partials::Controllers.const_get(const).dup)
+  end
+end
+
+module Partials::Views
+  def layout
+    body do
+      yield
+    end
+  end
+
+  def index
+    h1 "Index"
+    _partial
+  end
+
+  def _partial
+    p "Partial"
+  end
+
+  def nested
+    h1 "Nested"
+    regular
+  end
+
+  def regular
+    p "Regular"
+  end
+end
+
+class Partials::Test < TestCase
+  def test_underscore_partial
+    get '/'
+    assert_body "<body><h1>Index</h1><p>Partial</p></body>"
+  end
+
+  def test_underscore_partial_only
+    get '/partial'
+    assert_body "<p>Partial</p>"
+  end
+
+  def test_nolayout
+    get '/nolayout'
+    assert_body "<h1>Index</h1><p>Partial</p>"
+  end
+
+  def test_forcelayout
+    get '/forcelayout'
+    assert_body "<body><p>Partial</p></body>"
+  end
+
+  def test_netsted
+    get '/nested'
+    assert_body "<body><h1>Nested</h1><p>Regular</p></body>"
+  end
+end
+
+class TiltPartials::Test < Partials::Test
+end
+
+
+__END__
+@@ layout.str
+<body>#{yield.strip}</body>
+
+@@ index.str
+<h1>Index</h1>#{render(:_partial).strip}
+
+@@ _partial.str
+<p>Partial</p>
+
+@@ nested.str
+<h1>Nested</h1>#{render(:regular).strip}
+
+@@ regular.str
+<p>Regular</p>
+

data/test/app_sessions.rb

@@ -36,11 +36,7 @@ class Sessions::Test < TestCase
   def test_session
     get '/one'
     follow_redirect!
-    
-    get '/two'
     follow_redirect!
-    
-    get '/three'
     assert_body "[42, 56, 99]"
   end
 end

data/test/test_helper.rb

@@ -5,7 +5,12 @@ begin
 rescue LoadError
 end
 
-require 'camping-unabridged'
+if ENV['ABRIDGED']
+  require 'camping'
+else
+  require 'camping-unabridged'
+end
+
 require 'test/unit'
 require 'rack/test'
 
@@ -36,9 +41,9 @@ class TestCase < Test::Unit::TestCase
   def assert_body(str)
     case str
     when Regexp
-      assert_match(str, last_response.body)
+      assert_match(str, last_response.body.strip)
     else
-      assert_equal(str.to_s, last_response.body)
+      assert_equal(str.to_s, last_response.body.strip)
     end
   end
   

metadata

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: camping
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 1
-  version: "2.1"
+  version: 2.1.467
+  prerelease: 
 platform: ruby
 authors: 
 - why the lucky stiff
@@ -13,22 +10,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +02:00
-default_executable: 
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
 description: 
 email: why@ruby-lang.org
 executables: 
@@ -47,7 +63,12 @@ files:
 - README
 - Rakefile
 - bin/camping
+- test/app_cookies.rb
+- test/app_file.rb
+- test/app_helpers.rb
+- test/app_inline_templates.rb
 - test/app_markup.rb
+- test/app_partials.rb
 - test/app_route_generating.rb
 - test/app_sessions.rb
 - test/app_simple.rb
@@ -93,7 +114,6 @@ files:
 - book/51_upgrading
 - examples/blog.rb
 - CHANGELOG
-has_rdoc: true
 homepage: http://camping.rubyforge.org/
 licenses: []
 
@@ -110,25 +130,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 2
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: camping
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: minature rails for stay-at-home moms