Instiki 0.16.3: Rails 2.3.0

Instiki now runs on the Rails 2.3.0 Candidate Release.
Among other improvements, this means that it now 
automagically selects between WEBrick and Mongrel.

Just run

    ./instiki --daemon

vendor/plugins/rack/test/spec_rack_recursive.rb

@@ -0,0 +1,77 @@
+require 'test/spec'
+
+require 'rack/recursive'
+require 'rack/urlmap'
+require 'rack/response'
+require 'rack/mock'
+
+context "Rack::Recursive" do
+  setup do
+
+    @app1 = lambda { |env|
+      res = Rack::Response.new
+      res["X-Path-Info"] = env["PATH_INFO"]
+      res["X-Query-String"] = env["QUERY_STRING"]
+      res.finish do |res|
+        res.write "App1"
+      end
+    }
+
+    @app2 = lambda { |env|
+      Rack::Response.new.finish do |res|
+        res.write "App2"
+        _, _, body = env['rack.recursive.include'].call(env, "/app1")
+        body.each { |b|
+          res.write b
+        }
+      end
+    }
+
+    @app3 = lambda { |env|
+      raise Rack::ForwardRequest.new("/app1")
+    }
+
+    @app4 = lambda { |env|
+      raise Rack::ForwardRequest.new("http://example.org/app1/quux?meh")
+    }
+
+  end
+
+  specify "should allow for subrequests" do
+    res = Rack::MockRequest.new(Rack::Recursive.new(
+                                  Rack::URLMap.new("/app1" => @app1,
+                                                   "/app2" => @app2))).
+      get("/app2")
+
+    res.should.be.ok
+    res.body.should.equal "App2App1"    
+  end
+
+  specify "should raise error on requests not below the app" do
+    app = Rack::URLMap.new("/app1" => @app1,
+                           "/app" => Rack::Recursive.new(
+                              Rack::URLMap.new("/1" => @app1,
+                                               "/2" => @app2)))
+
+    lambda {
+      Rack::MockRequest.new(app).get("/app/2")
+    }.should.raise(ArgumentError).
+      message.should =~ /can only include below/
+  end
+
+  specify "should support forwarding" do
+    app = Rack::Recursive.new(Rack::URLMap.new("/app1" => @app1,
+                                               "/app3" => @app3,
+                                               "/app4" => @app4))
+
+    res = Rack::MockRequest.new(app).get("/app3")
+    res.should.be.ok
+    res.body.should.equal "App1"
+
+    res = Rack::MockRequest.new(app).get("/app4")
+    res.should.be.ok
+    res.body.should.equal "App1"
+    res["X-Path-Info"].should.equal "/quux"
+    res["X-Query-String"].should.equal "meh"
+  end
+end