Address routr api changes & Handle POST

docs/page-api.md

@@ -10,7 +10,7 @@ A binding of URL paths to a Page class that can render the results for those URL
 
 * The HTTP method(s) that are acceptable.
 
-* Default: “get”
+* Default: [“get”, "head"]
 
 `page: Page`
 * The page to render

packages/react-server-cli/src/compileClient.js

@@ -291,14 +291,17 @@ module.exports = {
 	for (let routeName of Object.keys(routes.routes)) {
 		let route = routes.routes[routeName];
 
+		// if the route doesn't have a method, we'll assume it's ["get", "head"]. routr doesn't
+		// have a default (method is required), so we set it here.
+		if (!route.method) {
+			route.method = ["get", "head"];
+		}
+
 		routesOutput.push(`
 		${routeName}: {`);
 		routesOutput.push(`
-			path: ${JSON.stringify(route.path)},`);
-		// if the route doesn't have a method, we'll assume it's "get". routr doesn't
-		// have a default (method is required), so we set it here.
-		routesOutput.push(`
-			method: "${route.method || "get"}",`);
+			path: ${JSON.stringify(route.path)},
+			method: ${JSON.stringify(route.method)},`);
 
 		let formats = normalizeRoutesPage(route.page);
 		routesOutput.push(`

packages/react-server/core/__tests__/context/navigator/DumbPage.js

@@ -0,0 +1,6 @@
+export default class DumbPage {
+	getElements() {
+		const routeName = this.getRequest().getRouteName();
+		return <div id="routeName">{routeName}</div>;
+	}
+}

packages/react-server/core/__tests__/context/navigator/NavigatorRoutes.js

@@ -0,0 +1,34 @@
+import DumbPage from "./DumbPage";
+
+// This wrapper is taken from the compileClient function that writes the routes_(client|server).js file
+const pageWrapper = {
+	default: () => {
+		return {
+			done: (cb) => { cb(DumbPage); },
+		};
+	},
+};
+
+const Routes = {
+	"BasicPage": {
+		"path": ["/basicPage"],
+		"page": pageWrapper,
+	},
+	"BasicPageCaps": {
+		"path": ["/basicPageCaps"],
+		"page": pageWrapper,
+		"method": "GET", // this should be all caps because the req.getMethod() will return 'get'.
+	},
+	"PostPage": {
+		"path": ["/postPage"],
+		"page": pageWrapper,
+		"method": "post",
+	},
+	"GetAndPostPage": {
+		"path": ["/getAndPostPage"],
+		"page": pageWrapper,
+		"method": ["get", "post"],
+	},
+};
+
+export default Routes;

packages/react-server/core/__tests__/context/navigator/NavigatorSpec.js

@@ -0,0 +1,140 @@
+import Navigator from "../../../context/Navigator";
+import History from "../../../components/History";
+import ExpressServerRequest from "../../../ExpressServerRequest";
+import NavigatorRoutes from "./NavigatorRoutes";
+
+class RequestContextStub {
+	constructor(options) {
+		this.navigator = new Navigator(this, options);
+	}
+	navigate (request, type) {
+		this.navigator.navigate(request, type);
+	}
+	framebackControllerWillHandle() { return false; }
+	getMobileDetect() { return null; }
+}
+
+
+describe("Navigator", () => {
+	let requestContext;
+	const options = {
+		routes: NavigatorRoutes,
+	};
+
+	beforeEach(() => {
+		//requestContext = new RequestContext(options);
+		requestContext = new RequestContextStub(options);
+	});
+	afterEach(() => {
+		requestContext = null;
+	});
+
+	it("routes to a basic page using an unspecified method get", (done) => {
+		const req = {
+			method: "get",
+			protocol: "http",
+			secure: false,
+			hostname: "localhost",
+			url: "/basicPage",
+		};
+		const expressRequest = new ExpressServerRequest(req);
+
+		requestContext.navigator.on('page', () => {
+			expect(expressRequest.getRouteName() === 'BasicPage');
+			done();
+		});
+
+		requestContext.navigate(expressRequest, History.events.PAGELOAD);
+	});
+
+	it("routes to a basic page using an unspecified method HEAD", (done) => {
+		const req = {
+			method: "head",
+			protocol: "http",
+			secure: false,
+			hostname: "localhost",
+			url: "/basicPage",
+		};
+		const expressRequest = new ExpressServerRequest(req);
+
+		requestContext.navigator.on('page', () => {
+			expect(expressRequest.getRouteName() === 'BasicPage');
+			done();
+		});
+
+		requestContext.navigate(expressRequest, History.events.PAGELOAD);
+	});
+
+	it("routes to a page using a method GET (caps)", (done) => {
+		const req = {
+			method: "get",
+			protocol: "http",
+			secure: false,
+			hostname: "localhost",
+			url: "/basicPageCaps",
+		};
+		const expressRequest = new ExpressServerRequest(req);
+
+		requestContext.navigator.on('page', () => {
+			expect(expressRequest.getRouteName() === 'BasicPageCaps');
+			done();
+		});
+
+		requestContext.navigate(expressRequest, History.events.PAGELOAD);
+	});
+
+	it("routes to a page using a method POST", (done) => {
+		const req = {
+			method: "post",
+			protocol: "http",
+			secure: false,
+			hostname: "localhost",
+			url: "/postPage",
+		};
+		const expressRequest = new ExpressServerRequest(req);
+
+		requestContext.navigator.on('page', () => {
+			expect(expressRequest.getRouteName() === 'PostPage');
+			done();
+		});
+
+		requestContext.navigate(expressRequest, History.events.PAGELOAD);
+	});
+
+
+	it("routes to a page that can handle GET and POST using a method GET", (done) => {
+		const req = {
+			method: "get",
+			protocol: "http",
+			secure: false,
+			hostname: "localhost",
+			url: "/getAndPostPage",
+		};
+		const expressRequest = new ExpressServerRequest(req);
+
+		requestContext.navigator.on('page', () => {
+			expect(expressRequest.getRouteName() === 'GetAndPostPage');
+			done();
+		});
+
+		requestContext.navigate(expressRequest, History.events.PAGELOAD);
+	});
+
+	it("routes to a page that can handle GET and POST using a method POST", (done) => {
+		const req = {
+			method: "post",
+			protocol: "http",
+			secure: false,
+			hostname: "localhost",
+			url: "/getAndPostPage",
+		};
+		const expressRequest = new ExpressServerRequest(req);
+
+		requestContext.navigator.on('page', () => {
+			expect(expressRequest.getRouteName() === 'GetAndPostPage');
+			done();
+		});
+
+		requestContext.navigate(expressRequest, History.events.PAGELOAD);
+	});
+});

packages/react-server/core/context/Navigator.js

@@ -50,7 +50,7 @@ class Navigator extends EventEmitter {
 
 		this._haveInitialized = true;
 
-		var route = this.router.getRoute(request.getUrl(), {navigate: {path:request.getUrl(), type:type}});
+		var route = this.router.getRoute(request.getUrl(), {method: request.getMethod()});
 
 		if (route) {
 			logger.debug(`Mapped ${request.getUrl()} to route ${route.name}`);