Changeset 175

Timestamp:

10/24/2006 09:32:07 (2 years ago)

Author:

zimbatm

Message:

* Rakefile : Clean the generated test.log in test/, new test task.
* lib/camping[-unabridged].rb : Fixes #102. The layout wasn't captured in Mab.
* test/test_xhtml_trans.rb : The test case for #102. You'll need mosquito to

be able to run it.

Location:

trunk

Files:

• Rakefile (modified) (3 diffs)
• lib/camping-unabridged.rb (modified) (1 diff)
• lib/camping.rb (modified) (1 diff)
• test (added)
• test/test_xhtml_trans.rb (added)

trunk/Rakefile

@@ -3 +3 @@
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
+require 'rake/testtask'
 require 'fileutils'
 include FileUtils
@@ -9 +10 @@
 REV = File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
 VERS = ENV['VERSION'] || ("1.5" + (REV ? ".#{REV}" : ""))
-CLEAN.include ['**/.*.sw?', '*.gem', '.config']
+CLEAN.include ['**/.*.sw?', '*.gem', '.config', 'test/test.log']
 RDOC_OPTS = ['--quiet', '--title', "Camping, the Documentation",
     "--opname", "index.html",
@@ -88 +89 @@
   sh %{sudo gem uninstall #{NAME}}
 end
+
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/test_*.rb']
+#  t.warning = true
+#  t.verbose = true
+end

trunk/lib/camping-unabridged.rb

@@ -338 +338 @@
       m=Mab.new({},self)
       s=m.capture{send(*a,&b)}
-      s=m.layout{s} if /^_/!~a[0].to_s and m.respond_to?:layout
+      s=m.capture{send(:layout){s}} if /^_/!~a[0].to_s and m.respond_to?:layout
       s
     end

trunk/lib/camping.rb

@@ -8 +8 @@
 }if o.errors.any?end end;module Base;include Helpers;attr_accessor:input,
 :cookies,:env,:headers,:body,:status,:root;def method_missing*a,&b
-a.shift if a[0]==:render;m=Mab.new({},self);s=m.capture{send(*a,&b)};s=m.layout{s}if
-/^_/!~a[0].to_s and m.respond_to?:layout;s end;def r s,b,h={};@status=s;@headers. 
-merge!h;@body=b end;def redirect*a;r 302,'','Location'=>URL(*a)end;Z="\r\n"
+a.shift if a[0]==:render;m=Mab.new({},self);s=m.capture{send(*a,&b)}
+s=m.capture{send(:layout){s}} if /^_/!~a[0].to_s and m.respond_to?:layout
+s end;def r s,b,h={};@status=s;@headers.merge!h;@body=b end
+def redirect*a;r 302,'','Location'=>URL(*a)end;Z="\r\n"
 def initialize r,e,m;e=H[e.to_hash];@status,@method,@env,@headers,@root=200,m.
 downcase,e,{'Content-Type'=>"text/html"},e.SCRIPT_NAME.sub(/\/$/,'')