Changeset 38832

Timestamp:

10/20/2016 02:54:12 AM (10 years ago)

Author:

rachelbaker

Message:

REST API: Introduce the Content API endpoints.

REST API endpoints for your WordPress content. These endpoints provide machine-readable external access to your WordPress site with a clear, standards-driven interface, allowing new and innovative apps for interacting with your site. These endpoints support all of the following:

• Posts: Read and write access to all post data, for all types of post-based data, including pages and media.
• Comments: Read and write access to all comment data. This includes pingbacks and trackbacks.
• Terms: Read and write access to all term data.
• Users: Read and write access to all user data. This includes public access to some data for post authors.
• Meta: Read and write access to metadata for posts, comments, terms, and users, on an opt-in basis from plugins.
• Settings: Read and write access to settings, on an opt-in basis from plugins and core. This enables API management of key site content values that are technically stored in options, such as site title and byline.

Love your REST API, WordPress! The infrastructure says, "Let's do lunch!" but the content API endpoints say, "You're paying!"

Props rmccue, rachelbaker, danielbachhuber, joehoyle, adamsilverstein, afurculita, ahmadawais, airesvsg, alisspers, antisilent, apokalyptik, artoliukkonen, attitude, boonebgorges, bradyvercher, brianhogg, caseypatrickdriscoll, chopinbach, chredd, christianesperar, chrisvanpatten, claudiolabarbera, claudiosmweb, cmmarslender, codebykat, coderkevin, codfish, codonnell822, daggerhart, danielpunkass, davidbhayes, delphinus, desrosj, dimadin, dotancohen, DrewAPicture, Dudo1985, duncanjbrown, eherman24, eivhyl, eliorivero, elyobo, en-alis, ericandrewlewis, ericpedia, evansobkowicz, fjarrett, frozzare, georgestephanis, greatislander, guavaworks, hideokamoto, hkdobrev, hubdotcom, hurtige, iandunn, ircrash, ironpaperweight, iseulde, Japh, jaredcobb, JDGrimes, jdolan, jdoubleu, jeremyfelt, jimt, jjeaton, jmusal, jnylen0, johanmynhardt, johnbillion, jonathanbardo, jorbin, joshkadis, JPry, jshreve, jtsternberg, JustinSainton, kacperszurek, kadamwhite, kalenjohnson, kellbot, kjbenk, kokarn, krogsgard, kuchenundkakao, kuldipem, kwight, lgedeon, lukepettway, mantismamita, markoheijnen, matrixik, mattheu, mauteri, maxcutler, mayukojpn, michael-arestad, miyauchi, mjbanks, modemlooper, mrbobbybryant, NateWr, nathanrice, netweb, NikV, nullvariable, oskosk, oso96_2000, oxymoron, pcfreak30, pento, peterwilsoncc, Pezzab, phh, pippinsplugins, pjgalbraith, pkevan, pollyplummer, pushred, quasel, QWp6t, schlessera, schrapel, Shelob9, shprink, simonlampen, Soean, solal, tapsboy, tfrommen, tharsheblows, thenbrent, tierra, tlovett1, tnegri, tobych, Toddses, toro_unit, traversal, vanillalounge, vishalkakadiya, wanecek, web2style, webbgaraget, websupporter, westonruter, whyisjake, wonderboymusic, wpsmith, xknown, zyphonic.
Fixes #38373.

Location:

trunk

Files:

• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/js/wp-api.js (added)
• src/wp-includes/option.php (modified) (1 diff)
• src/wp-includes/post.php (modified) (3 diffs)
• src/wp-includes/rest-api.php (modified) (3 diffs)
• src/wp-includes/rest-api/endpoints (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (added)
• src/wp-includes/rest-api/fields (added)
• src/wp-includes/rest-api/fields/class-wp-rest-comment-meta-fields.php (added)
• src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php (added)
• src/wp-includes/rest-api/fields/class-wp-rest-post-meta-fields.php (added)
• src/wp-includes/rest-api/fields/class-wp-rest-term-meta-fields.php (added)
• src/wp-includes/rest-api/fields/class-wp-rest-user-meta-fields.php (added)
• src/wp-includes/script-loader.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (2 diffs)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/data/images/codeispoetry.png (added)
• tests/phpunit/includes/bootstrap.php (modified) (2 diffs)
• tests/phpunit/includes/testcase-rest-controller.php (added)
• tests/phpunit/includes/testcase-rest-post-type-controller.php (added)
• tests/phpunit/includes/utils.php (modified) (1 diff)
• tests/phpunit/tests/rest-api.php (modified) (2 diffs)
• tests/phpunit/tests/rest-api/rest-attachments-controller.php (added)
• tests/phpunit/tests/rest-api/rest-categories-controller.php (added)
• tests/phpunit/tests/rest-api/rest-comments-controller.php (added)
• tests/phpunit/tests/rest-api/rest-controller.php (added)
• tests/phpunit/tests/rest-api/rest-pages-controller.php (added)
• tests/phpunit/tests/rest-api/rest-post-meta-fields.php (added)
• tests/phpunit/tests/rest-api/rest-post-statuses-controller.php (added)
• tests/phpunit/tests/rest-api/rest-post-types-controller.php (added)
• tests/phpunit/tests/rest-api/rest-posts-controller.php (added)
• tests/phpunit/tests/rest-api/rest-request-validation.php (added)
• tests/phpunit/tests/rest-api/rest-revisions-controller.php (added)
• tests/phpunit/tests/rest-api/rest-settings-controller.php (added)
• tests/phpunit/tests/rest-api/rest-tags-controller.php (added)
• tests/phpunit/tests/rest-api/rest-taxonomies-controller.php (added)
• tests/phpunit/tests/rest-api/rest-test-controller.php (added)
• tests/phpunit/tests/rest-api/rest-users-controller.php (added)

trunk/src/wp-includes/default-filters.php

@@ -375 +375 @@
 // REST API actions.
 add_action( 'init',          'rest_api_init' );
-add_action( 'rest_api_init', 'rest_api_default_filters', 10, 1 );
+add_action( 'rest_api_init', 'rest_api_default_filters',   10, 1 );
+add_action( 'rest_api_init', 'register_initial_settings',  10 );
+add_action( 'rest_api_init', 'create_initial_rest_routes', 99 );
 add_action( 'parse_request', 'rest_api_loaded' );
 

trunk/src/wp-includes/functions.php

@@ -3431 +3431 @@
 
 /**
+ * Clean up an array, comma- or space-separated list of slugs.
+ *
+ * @since 4.7.0
+ *
+ * @param  array|string $list List of slugs.
+ * @return array Sanitized array of slugs.
+ */
+function wp_parse_slug_list( $list ) {
+        if ( ! is_array( $list ) ) {
+                $list = preg_split( '/[\s,]+/', $list );
+        }
+
+        foreach ( $list as $key => $value ) {
+                $list[ $key ] = sanitize_title( $value );
+        }
+
+        return array_unique( $list );
+}
+
+/**
  * Extract a slice of an array, given a list of keys.
  *

trunk/src/wp-includes/option.php

@@ -1709 +1709 @@
 
 /**
+ * Register default settings available in WordPress.
+ *
+ * The settings registered here are primarily useful for the REST API, so this
+ * does not encompass all settings available in WordPress.
+ *
+ * @since 4.7.0
+ */
+function register_initial_settings() {
+        register_setting( 'general', 'blogname', array(
+                'show_in_rest' => array(
+                        'name' => 'title',
+                ),
+                'type'         => 'string',
+                'description'  => __( 'Site title.' ),
+        ) );
+
+        register_setting( 'general', 'blogdescription', array(
+                'show_in_rest' => array(
+                        'name' => 'description',
+                ),
+                'type'         => 'string',
+                'description'  => __( 'Site description.' ),
+        ) );
+
+        register_setting( 'general', 'siteurl', array(
+                'show_in_rest' => array(
+                        'name'    => 'url',
+                        'schema'  => array(
+                                'format' => 'uri',
+                        ),
+                ),
+                'type'         => 'string',
+                'description'  => __( 'Site URL.' ),
+        ) );
+
+        register_setting( 'general', 'admin_email', array(
+                'show_in_rest' => array(
+                        'name'    => 'email',
+                        'schema'  => array(
+                                'format' => 'email',
+                        ),
+                ),
+                'type'         => 'string',
+                'description'  => __( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. The new address will not become active until confirmed.' ),
+        ) );
+
+        register_setting( 'general', 'timezone_string', array(
+                'show_in_rest' => array(
+                        'name' => 'timezone',
+                ),
+                'type'         => 'string',
+                'description'  => __( 'A city in the same timezone as you.' ),
+        ) );
+
+        register_setting( 'general', 'date_format', array(
+                'show_in_rest' => true,
+                'type'         => 'string',
+                'description'  => __( 'A date format for all date strings.' ),
+        ) );
+
+        register_setting( 'general', 'time_format', array(
+                'show_in_rest' => true,
+                'type'         => 'string',
+                'description'  => __( 'A time format for all time strings.' ),
+        ) );
+
+        register_setting( 'general', 'start_of_week', array(
+                'show_in_rest' => true,
+                'type'         => 'number',
+                'description'  => __( 'A day number of the week that the week should start on.' ),
+        ) );
+
+        register_setting( 'general', 'WPLANG', array(
+                'show_in_rest' => array(
+                        'name' => 'language',
+                ),
+                'type'         => 'string',
+                'description'  => __( 'WordPress locale code.' ),
+                'default'      => 'en_US',
+        ) );
+
+        register_setting( 'writing', 'use_smilies', array(
+                'show_in_rest' => true,
+                'type'         => 'boolean',
+                'description'  => __( 'Convert emoticons like :-) and :-P to graphics on display.' ),
+                'default'      => true,
+        ) );
+
+        register_setting( 'writing', 'default_category', array(
+                'show_in_rest' => true,
+                'type'         => 'number',
+                'description'  => __( 'Default category.' ),
+        ) );
+
+        register_setting( 'writing', 'default_post_format', array(
+                'show_in_rest' => true,
+                'type'         => 'string',
+                'description'  => __( 'Default post format.' ),
+        ) );
+
+        register_setting( 'reading', 'posts_per_page', array(
+                'show_in_rest' => true,
+                'type'         => 'number',
+                'description'  => __( 'Blog pages show at most.' ),
+                'default'      => 10,
+        ) );
+}
+
+/**
  * Register a setting and its data.
  *

trunk/src/wp-includes/post.php

@@ -34 +34 @@
                 'delete_with_user' => true,
                 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
+                'show_in_rest' => true,
+                'rest_base' => 'posts',
+                'rest_controller_class' => 'WP_REST_Posts_Controller',
         ) );
 
@@ -52 +55 @@
                 'delete_with_user' => true,
                 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
+                'show_in_rest' => true,
+                'rest_base' => 'pages',
+                'rest_controller_class' => 'WP_REST_Posts_Controller',
         ) );
 
@@ -77 +83 @@
                 'delete_with_user' => true,
                 'supports' => array( 'title', 'author', 'comments' ),
+                'show_in_rest' => true,
+                'rest_base' => 'media',
+                'rest_controller_class' => 'WP_REST_Attachments_Controller',
         ) );
         add_post_type_support( 'attachment:audio', 'thumbnail' );

trunk/src/wp-includes/rest-api.php

@@ -72 +72 @@
 
 /**
+ * Registers a new field on an existing WordPress object type.
+ *
+ * @since 4.7.0
+ *
+ * @global array $wp_rest_additional_fields Holds registered fields, organized
+ *                                          by object type.
+ *
+ * @param string|array $object_type Object(s) the field is being registered
+ *                                  to, "post"|"term"|"comment" etc.
+ * @param string $attribute         The attribute name.
+ * @param array  $args {
+ *     Optional. An array of arguments used to handle the registered field.
+ *
+ *     @type string|array|null $get_callback    Optional. The callback function used to retrieve the field
+ *                                              value. Default is 'null', the field will not be returned in
+ *                                              the response.
+ *     @type string|array|null $update_callback Optional. The callback function used to set and update the
+ *                                              field value. Default is 'null', the value cannot be set or
+ *                                              updated.
+ *     @type string|array|null $schema          Optional. The callback function used to create the schema for
+ *                                              this field. Default is 'null', no schema entry will be returned.
+ * }
+ */
+function register_rest_field( $object_type, $attribute, $args = array() ) {
+        $defaults = array(
+                'get_callback'    => null,
+                'update_callback' => null,
+                'schema'          => null,
+        );
+
+        $args = wp_parse_args( $args, $defaults );
+
+        global $wp_rest_additional_fields;
+
+        $object_types = (array) $object_type;
+
+        foreach ( $object_types as $object_type ) {
+                $wp_rest_additional_fields[ $object_type ][ $attribute ] = $args;
+        }
+}
+
+/**
  * Registers rewrite rules for the API.
  *
@@ -123 +165 @@
 
         add_filter( 'rest_pre_dispatch', 'rest_handle_options_request', 10, 3 );
+}
+
+/**
+ * Registers default REST API routes.
+ *
+ * @since 4.7.0
+ */
+function create_initial_rest_routes() {
+        foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
+                $class = ! empty( $post_type->rest_controller_class ) ? $post_type->rest_controller_class : 'WP_REST_Posts_Controller';
+
+                if ( ! class_exists( $class ) ) {
+                        continue;
+                }
+                $controller = new $class( $post_type->name );
+                if ( ! is_subclass_of( $controller, 'WP_REST_Controller' ) ) {
+                        continue;
+                }
+
+                $controller->register_routes();
+
+                if ( post_type_supports( $post_type->name, 'revisions' ) ) {
+                        $revisions_controller = new WP_REST_Revisions_Controller( $post_type->name );
+                        $revisions_controller->register_routes();
+                }
+        }
+
+        // Post types.
+        $controller = new WP_REST_Post_Types_Controller;
+        $controller->register_routes();
+
+        // Post statuses.
+        $controller = new WP_REST_Post_Statuses_Controller;
+        $controller->register_routes();
+
+        // Taxonomies.
+        $controller = new WP_REST_Taxonomies_Controller;
+        $controller->register_routes();
+
+        // Terms.
+        foreach ( get_taxonomies( array( 'show_in_rest' => true ), 'object' ) as $taxonomy ) {
+                $class = ! empty( $taxonomy->rest_controller_class ) ? $taxonomy->rest_controller_class : 'WP_REST_Terms_Controller';
+
+                if ( ! class_exists( $class ) ) {
+                        continue;
+                }
+                $controller = new $class( $taxonomy->name );
+                if ( ! is_subclass_of( $controller, 'WP_REST_Controller' ) ) {
+                        continue;
+                }
+
+                $controller->register_routes();
+        }
+
+        // Users.
+        $controller = new WP_REST_Users_Controller;
+        $controller->register_routes();
+
+        // Comments.
+        $controller = new WP_REST_Comments_Controller;
+        $controller->register_routes();
+
+        // Settings.
+        $controller = new WP_REST_Settings_Controller;
+        $controller->register_routes();
 }
 
@@ -684 +791 @@
         return array( $local, $utc );
 }
+
+/**
+ * Returns a contextual HTTP error code for authorization failure.
+ *
+ * @since 4.7.0
+ *
+ * @return integer 401 if the user is not logged in, 403 if the user is logged in.
+ */
+function rest_authorization_required_code() {
+        return is_user_logged_in() ? 403 : 401;
+}
+
+/**
+ * Validate a request argument based on details registered to the route.
+ *
+ * @since 4.7.0
+ *
+ * @param  mixed            $value
+ * @param  WP_REST_Request  $request
+ * @param  string           $param
+ * @return WP_Error|boolean
+ */
+function rest_validate_request_arg( $value, $request, $param ) {
+        $attributes = $request->get_attributes();
+        if ( ! isset( $attributes['args'][ $param ] ) || ! is_array( $attributes['args'][ $param ] ) ) {
+                return true;
+        }
+        $args = $attributes['args'][ $param ];
+
+        if ( ! empty( $args['enum'] ) ) {
+                if ( ! in_array( $value, $args['enum'], true ) ) {
+                        return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: list of valid values */ __( '%1$s is not one of %2$s.' ), $param, implode( ', ', $args['enum'] ) ) );
+                }
+        }
+
+        if ( 'integer' === $args['type'] && ! is_numeric( $value ) ) {
+                return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: type name */ __( '%1$s is not of type %2$s.' ), $param, 'integer' ) );
+        }
+
+        if ( 'boolean' === $args['type'] && ! rest_is_boolean( $value ) ) {
+                return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: type name */ __( '%1$s is not of type %2$s.' ), $value, 'boolean' ) );
+        }
+
+        if ( 'string' === $args['type'] && ! is_string( $value ) ) {
+                return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: type name */ __( '%1$s is not of type %2$s.' ), $param, 'string' ) );
+        }
+
+        if ( isset( $args['format'] ) ) {
+                switch ( $args['format'] ) {
+                        case 'date-time' :
+                                if ( ! rest_parse_date( $value ) ) {
+                                        return new WP_Error( 'rest_invalid_date', __( 'The date you provided is invalid.' ) );
+                                }
+                                break;
+
+                        case 'email' :
+                                if ( ! is_email( $value ) ) {
+                                        return new WP_Error( 'rest_invalid_email', __( 'The email address you provided is invalid.' ) );
+                                }
+                                break;
+                        case 'ipv4' :
+                                if ( ! rest_is_ip_address( $value ) ) {
+                                        return new WP_Error( 'rest_invalid_param', sprintf( __( '%s is not a valid IP address.' ), $value ) );
+                                }
+                                break;
+                }
+        }
+
+        if ( in_array( $args['type'], array( 'numeric', 'integer' ), true ) && ( isset( $args['minimum'] ) || isset( $args['maximum'] ) ) ) {
+                if ( isset( $args['minimum'] ) && ! isset( $args['maximum'] ) ) {
+                        if ( ! empty( $args['exclusiveMinimum'] ) && $value <= $args['minimum'] ) {
+                                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (exclusive)' ), $param, $args['minimum'] ) );
+                        } elseif ( empty( $args['exclusiveMinimum'] ) && $value < $args['minimum'] ) {
+                                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (inclusive)' ), $param, $args['minimum'] ) );
+                        }
+                } elseif ( isset( $args['maximum'] ) && ! isset( $args['minimum'] ) ) {
+                        if ( ! empty( $args['exclusiveMaximum'] ) && $value >= $args['maximum'] ) {
+                                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (exclusive)' ), $param, $args['maximum'] ) );
+                        } elseif ( empty( $args['exclusiveMaximum'] ) && $value > $args['maximum'] ) {
+                                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (inclusive)' ), $param, $args['maximum'] ) );
+                        }
+                } elseif ( isset( $args['maximum'] ) && isset( $args['minimum'] ) ) {
+                        if ( ! empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) {
+                                if ( $value >= $args['maximum'] || $value <= $args['minimum'] ) {
+                                        return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: minimum number, 3: maximum number */ __( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) );
+                                }
+                        } elseif ( empty( $args['exclusiveMinimum'] ) && ! empty( $args['exclusiveMaximum'] ) ) {
+                                if ( $value >= $args['maximum'] || $value < $args['minimum'] ) {
+                                        return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: minimum number, 3: maximum number */ __( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)' ), $param, $args['minimum'], $args['maximum'] ) );
+                                }
+                        } elseif ( ! empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) {
+                                if ( $value > $args['maximum'] || $value <= $args['minimum'] ) {
+                                        return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: minimum number, 3: maximum number */ __( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) );
+                                }
+                        } elseif ( empty( $args['exclusiveMinimum'] ) && empty( $args['exclusiveMaximum'] ) ) {
+                                if ( $value > $args['maximum'] || $value < $args['minimum'] ) {
+                                        return new WP_Error( 'rest_invalid_param', sprintf( /* translators: 1: parameter, 2: minimum number, 3: maximum number */ __( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)' ), $param, $args['minimum'], $args['maximum'] ) );
+                                }
+                        }
+                }
+        }
+
+        return true;
+}
+
+/**
+ * Sanitize a request argument based on details registered to the route.
+ *
+ * @since 4.7.0
+ *
+ * @param  mixed            $value
+ * @param  WP_REST_Request  $request
+ * @param  string           $param
+ * @return mixed
+ */
+function rest_sanitize_request_arg( $value, $request, $param ) {
+        $attributes = $request->get_attributes();
+        if ( ! isset( $attributes['args'][ $param ] ) || ! is_array( $attributes['args'][ $param ] ) ) {
+                return $value;
+        }
+        $args = $attributes['args'][ $param ];
+
+        if ( 'integer' === $args['type'] ) {
+                return (int) $value;
+        }
+
+        if ( 'boolean' === $args['type'] ) {
+                return rest_sanitize_boolean( $value );
+        }
+
+        if ( isset( $args['format'] ) ) {
+                switch ( $args['format'] ) {
+                        case 'date-time' :
+                                return sanitize_text_field( $value );
+
+                        case 'email' :
+                                /*
+                                 * sanitize_email() validates, which would be unexpected
+                                 */
+                                return sanitize_text_field( $value );
+
+                        case 'uri' :
+                                return esc_url_raw( $value );
+
+                        case 'ipv4' :
+                                return sanitize_text_field( $value );
+                }
+        }
+
+        return $value;
+}
+
+/**
+ * Parse a request argument based on details registered to the route.
+ *
+ * Runs a validation check and sanitizes the value, primarily to be used via
+ * the `sanitize_callback` arguments in the endpoint args registration.
+ *
+ * @since 4.7.0
+ *
+ * @param  mixed            $value
+ * @param  WP_REST_Request  $request
+ * @param  string           $param
+ * @return mixed
+ */
+function rest_parse_request_arg( $value, $request, $param ) {
+        $is_valid = rest_validate_request_arg( $value, $request, $param );
+
+        if ( is_wp_error( $is_valid ) ) {
+                return $is_valid;
+        }
+
+        $value = rest_sanitize_request_arg( $value, $request, $param );
+
+        return $value;
+}
+
+/**
+ * Determines if a IPv4 address is valid.
+ *
+ * Does not handle IPv6 addresses.
+ *
+ * @since 4.7.0
+ *
+ * @param  string $ipv4 IP 32-bit address.
+ * @return string|false The valid IPv4 address, otherwise false.
+ */
+function rest_is_ip_address( $ipv4 ) {
+        $pattern = '/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
+
+        if ( ! preg_match( $pattern, $ipv4 ) ) {
+                return false;
+        }
+
+        return $ipv4;
+}
+
+/**
+ * Changes a boolean-like value into the proper boolean value.
+ *
+ * @since 4.7.0
+ *
+ * @param bool|string|int $value The value being evaluated.
+ * @return boolean Returns the proper associated boolean value.
+ */
+function rest_sanitize_boolean( $value ) {
+        // String values are translated to `true`; make sure 'false' is false.
+        if ( is_string( $value )  ) {
+                $value = strtolower( $value );
+                if ( in_array( $value, array( 'false', '0' ), true ) ) {
+                        $value = false;
+                }
+        }
+
+        // Everything else will map nicely to boolean.
+        return (boolean) $value;
+}
+
+/**
+ * Determines if a given value is boolean-like.
+ *
+ * @since 4.7.0
+ *
+ * @param bool|string $maybe_bool The value being evaluated.
+ * @return boolean True if a boolean, otherwise false.
+ */
+function rest_is_boolean( $maybe_bool ) {
+        if ( is_bool( $maybe_bool ) ) {
+                return true;
+        }
+
+        if ( is_string( $maybe_bool ) ) {
+                $maybe_bool = strtolower( $maybe_bool );
+
+                $valid_boolean_values = array(
+                        'false',
+                        'true',
+                        '0',
+                        '1',
+                );
+
+                return in_array( $maybe_bool, $valid_boolean_values, true );
+        }
+
+        if ( is_int( $maybe_bool ) ) {
+                return in_array( $maybe_bool, array( 0, 1 ), true );
+        }
+
+        return false;
+}
+
+/**
+ * Retrieves the avatar urls in various sizes based on a given email address.
+ *
+ * @since 4.7.0
+ *
+ * @see get_avatar_url()
+ *
+ * @param string $email Email address.
+ * @return array $urls Gravatar url for each size.
+ */
+function rest_get_avatar_urls( $email ) {
+        $avatar_sizes = rest_get_avatar_sizes();
+
+        $urls = array();
+        foreach ( $avatar_sizes as $size ) {
+                $urls[ $size ] = get_avatar_url( $email, array( 'size' => $size ) );
+        }
+
+        return $urls;
+}
+
+/**
+ * Retrieves the pixel sizes for avatars.
+ *
+ * @since 4.7.0
+ *
+ * @return array List of pixel sizes for avatars. Default `[ 24, 48, 96 ]`.
+ */
+function rest_get_avatar_sizes() {
+        /**
+         * Filter the REST avatar sizes.
+         *
+         * Use this filter to adjust the array of sizes returned by the
+         * `rest_get_avatar_sizes` function.
+         *
+         * @since 4.4.0
+         *
+         * @param array $sizes An array of int values that are the pixel sizes for avatars.
+         *                     Default `[ 24, 48, 96 ]`.
+         */
+        return apply_filters( 'rest_avatar_sizes', array( 24, 48, 96 ) );
+}

trunk/src/wp-includes/script-loader.php

@@ -499 +499 @@
         $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
+
+        $scripts->add( 'wp-api', "/wp-includes/js/wp-api$suffix.js", array( 'jquery', 'backbone', 'underscore' ), false, 1 );
+        did_action( 'init' ) && $scripts->localize( 'wp-api', 'wpApiSettings', array(
+                'root'          => esc_url_raw( get_rest_url() ),
+                'nonce'         => wp_create_nonce( 'wp_rest' ),
+                'versionString' => 'wp/v2/',
+        ) );
 
         if ( is_admin() ) {

trunk/src/wp-includes/taxonomy.php

@@ -68 +68 @@
                         'assign_terms' => 'assign_categories',
                 ),
+                'show_in_rest' => true,
+                'rest_base' => 'categories',
+                'rest_controller_class' => 'WP_REST_Terms_Controller',
         ) );
 
@@ -84 +87 @@
                         'assign_terms' => 'assign_post_tags',
                 ),
+                'show_in_rest' => true,
+                'rest_base' => 'tags',
+                'rest_controller_class' => 'WP_REST_Terms_Controller',
         ) );
 

trunk/src/wp-settings.php

@@ -219 +219 @@
 require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' );
 require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-posts-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-attachments-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-post-types-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-post-statuses-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-revisions-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-taxonomies-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-terms-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-users-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-comments-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-settings-controller.php' );
+require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php' );
+require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-comment-meta-fields.php' );
+require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-post-meta-fields.php' );
+require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-term-meta-fields.php' );
+require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-user-meta-fields.php' );
 
 $GLOBALS['wp_embed'] = new WP_Embed();

trunk/tests/phpunit/includes/bootstrap.php

@@ -40 +40 @@
 define( 'WP_MEMORY_LIMIT', -1 );
 define( 'WP_MAX_MEMORY_LIMIT', -1 );
+
+define( 'REST_TESTS_IMPOSSIBLY_HIGH_NUMBER', 99999999 );
 
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
@@ -89 +91 @@
 require dirname( __FILE__ ) . '/testcase.php';
 require dirname( __FILE__ ) . '/testcase-rest-api.php';
+require dirname( __FILE__ ) . '/testcase-rest-controller.php';
+require dirname( __FILE__ ) . '/testcase-rest-post-type-controller.php';
 require dirname( __FILE__ ) . '/testcase-xmlrpc.php';
 require dirname( __FILE__ ) . '/testcase-ajax.php';

trunk/tests/phpunit/includes/utils.php

@@ -454 +454 @@
         return $i;
 }
+
+function test_rest_expand_compact_links( $links ) {
+        if ( empty( $links['curies'] ) ) {
+                return $links;
+        }
+        foreach ( $links as $rel => $links_array ) {
+                if ( ! strpos( $rel, ':' ) ) {
+                        continue;
+                }
+
+                $name = explode( ':', $rel );
+
+                $curie = wp_list_filter( $links['curies'], array( 'name' => $name[0] ) );
+                $full_uri = str_replace( '{rel}', $name[1], $curie[0]['href'] );
+                $links[ $full_uri ] = $links_array;
+                unset( $links[ $rel ] );
+        }
+        return $links;
+}

trunk/tests/phpunit/tests/rest-api.php

@@ -27 +27 @@
                 $this->assertTrue( class_exists( 'WP_REST_Request' ) );
                 $this->assertTrue( class_exists( 'WP_REST_Response' ) );
+                $this->assertTrue( class_exists( 'WP_REST_Posts_Controller' ) );
         }
 
@@ -35 +36 @@
         function test_init_action_added() {
                 $this->assertEquals( 10, has_action( 'init', 'rest_api_init' ) );
+        }
+
+        public function test_add_extra_api_taxonomy_arguments() {
+                $taxonomy = get_taxonomy( 'category' );
+                $this->assertTrue( $taxonomy->show_in_rest );
+                $this->assertEquals( 'categories', $taxonomy->rest_base );
+                $this->assertEquals( 'WP_REST_Terms_Controller', $taxonomy->rest_controller_class );
+
+                $taxonomy = get_taxonomy( 'post_tag' );
+                $this->assertTrue( $taxonomy->show_in_rest );
+                $this->assertEquals( 'tags', $taxonomy->rest_base );
+                $this->assertEquals( 'WP_REST_Terms_Controller', $taxonomy->rest_controller_class );
+        }
+
+        public function test_add_extra_api_post_type_arguments() {
+                $post_type = get_post_type_object( 'post' );
+                $this->assertTrue( $post_type->show_in_rest );
+                $this->assertEquals( 'posts', $post_type->rest_base );
+                $this->assertEquals( 'WP_REST_Posts_Controller', $post_type->rest_controller_class );
+
+                $post_type = get_post_type_object( 'page' );
+                $this->assertTrue( $post_type->show_in_rest );
+                $this->assertEquals( 'pages', $post_type->rest_base );
+                $this->assertEquals( 'WP_REST_Posts_Controller', $post_type->rest_controller_class );
+
+                $post_type = get_post_type_object( 'attachment' );
+                $this->assertTrue( $post_type->show_in_rest );
+                $this->assertEquals( 'media', $post_type->rest_base );
+                $this->assertEquals( 'WP_REST_Attachments_Controller', $post_type->rest_controller_class );
         }