WP-API · danielbachhuber · May 19, 2015 · May 21, 2015 · May 21, 2015 · May 28, 2015
diff --git a/lib/endpoints/class-wp-rest-users-controller.php b/lib/endpoints/class-wp-rest-users-controller.php
@@ -28,6 +28,7 @@ public function register_routes() {
 					),
 				) ),
 			),
+			'schema'          => $this->get_item_schema(),
 		) );
 		register_rest_route( 'wp/v2', '/users/(?P<id>[\d]+)', array(
 			array(
@@ -56,6 +57,7 @@ public function register_routes() {
 					'reassign' => array(),
 				),
 			),
+			'schema'          => $this->get_item_schema(),
 		) );
 
 		register_rest_route( 'wp/v2', '/users/me', array(
@@ -64,12 +66,9 @@ public function register_routes() {
 			'args'            => array(
 				'context'          => array(),
 			),
+			'schema'          => $this->get_item_schema(),
 		));
 
-		register_rest_route( 'wp/v2', '/users/schema', array(
-			'methods'         => WP_REST_Server::READABLE,
-			'callback'        => array( $this, 'get_item_schema' ),
-		) );
 	}
 
 	/**
@@ -326,7 +325,7 @@ public function delete_item( $request ) {
 		if ( ! $result ) {
 			return new WP_Error( 'rest_cannot_delete', __( 'The user cannot be deleted.' ), array( 'status' => 500 ) );
 		}
-		
+
 		return $orig_user;
 	}
 

diff --git a/lib/infrastructure/class-wp-rest-server.php b/lib/infrastructure/class-wp-rest-server.php
@@ -590,6 +590,23 @@ public function get_namespaces() {
 		return array_keys( $this->namespaces );
 	}
 
+	/**
+	 * Get options specified at the route-level.
+	 *
+	 * This is typically things like the schema, which relates to the resource
+	 * rather than any endpoint callback in particular.
+	 *
+	 * @param string $route Route to fetch options for.
+	 * @return array|null Options map if set, otherwise null.
+	 */
+	public function get_route_options( $route ) {
+		if ( isset( $this->route_options[ $route ] ) ) {
+			return $this->route_options[ $route ];
+		}
+
+		return null;
+	}
+
 	/**
 	 * Match the request to a callback and call it
 	 *

diff --git a/plugin.php b/plugin.php
@@ -574,6 +574,10 @@ function rest_handle_options_request( $response, $handler, $request ) {
 	$response = new WP_REST_Response();
 
 	$accept = array();
+	$body = array(
+		'args'   => array(),
+		'schema' => null,
+	);
 
 	foreach ( $handler->get_routes() as $route => $endpoints ) {
 		$match = preg_match( '@^' . $route . '$@i', $request->get_route(), $args );
@@ -582,14 +586,44 @@ function rest_handle_options_request( $response, $handler, $request ) {
 			continue;
 		}
 
+		$opts = $handler->get_route_options( $route );
+		if ( isset( $opts['schema'] ) ) {
+			$body['schema'] = $opts['schema'];
+		}
+
 		foreach ( $endpoints as $endpoint ) {
 			$accept = array_merge( $accept, $endpoint['methods'] );
+
+			$methods = array_keys( $endpoint['methods'] );
+			$method = array_shift( $methods );
+
+			$args = array();
+			if ( ! empty( $endpoint['args'] ) ) {
+				foreach ( $endpoint['args'] as $key => $arg_opts ) {
+					$args[ $key ] = (object) array();
+
+					if ( isset( $arg_opts['description'] ) ) {
+						$args[ $key ]->description = $arg_opts['description'];
+					}
+
+					if ( isset( $arg_opts['type'] ) ) {
+						$args[ $key ]->type = $arg_opts['type'];
+					}
+
+					if ( isset( $arg_opts['default'] ) ) {
+						$args[ $key ]->default = $arg_opts['default'];
+					}
+				}
+			}
+
+			$body['args'][ $method ] = $args;
 		}
 		break;
 	}
 	$accept = array_keys( $accept );
 
 	$response->header( 'Accept', implode( ', ', $accept ) );
+	$response->set_data( (object) $body );
 
 	return $response;
 }

diff --git a/tests/test-rest-users-controller.php b/tests/test-rest-users-controller.php
@@ -714,12 +714,17 @@ public function test_delete_user_invalid_reassign_id() {
 		$this->assertErrorResponse( 'rest_user_invalid_reassign', $response, 400 );
 	}
 
-	public function test_get_item_schema() {
-		$request = new WP_REST_Request( 'GET', '/wp/v2/users/schema' );
+	public function test_options_request() {
+
+		$request = new WP_REST_Request( 'OPTIONS', '/wp/v2/users' );
 		$response = $this->server->dispatch( $request );
 		$data = $response->get_data();
-		$properties = $data['properties'];
 
+		$this->assertArrayHasKey( 'GET', $data['request_args'] );
+		$this->assertArrayHasKey( 'POST', $data['request_args'] );
+		$this->assertArrayNotHasKey( 'DELETE', $data['request_args'] );
+
+		$properties = $data['schema']['properties'];
 		$this->assertEquals( 16, count( $properties ) );
 		$this->assertArrayHasKey( 'avatar_url', $properties );
 		$this->assertArrayHasKey( 'capabilities', $properties );
@@ -736,10 +741,14 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'slug', $properties );
 		$this->assertArrayHasKey( 'url', $properties );
 		$this->assertArrayHasKey( 'username', $properties );
+
 	}
 
-	public function test_get_additional_field_registration() {
+	public function test_get_item_schema() {
+		/** Legacy while other controllers are converted over **/
+	}
 
+	public function test_get_additional_field_registration() {
 		$schema = array(
 			'type'        => 'integer',
 			'description' => 'Some integer of mine',
@@ -816,10 +825,10 @@ protected function check_user_data( $user, $data, $context ) {
 		$this->assertEquals( get_author_posts_url( $user->ID ), $data['link'] );
 
 		if ( 'view' === $context || 'edit' === $context ) {
-		$this->assertEquals( $user->first_name, $data['first_name'] );
-		$this->assertEquals( $user->last_name, $data['last_name'] );
-		$this->assertEquals( $user->nickname, $data['nickname'] );
-		$this->assertEquals( $user->user_nicename, $data['slug'] );
+			$this->assertEquals( $user->first_name, $data['first_name'] );
+			$this->assertEquals( $user->last_name, $data['last_name'] );
+			$this->assertEquals( $user->nickname, $data['nickname'] );
+			$this->assertEquals( $user->user_nicename, $data['slug'] );
 		}
 
 		if ( 'view' !== $context && 'edit' !== $context ) {