v1.3.1 bump and code style tweaks

Author: unfulvio

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.3.1 (03 Oct 2016)
+ * Tweak: The `object_slug` property is now available to get the slug for relative URLs - props @Fahrradflucht
+
 #### 1.3.0 (25 Feb 2016)
  * Fix (V2): Nodes duplication in sublevel menu items, see https://github.com/unfulvio/wp-api-menus/pull/22 - props @bpongvh
  * Fix (V2): The items array was empty because it was looking for "ID" key instead of "id" - props @Dobbler

composer.json

@@ -2,7 +2,7 @@
   "name": "unfulvio/wp-api-menus",
   "description": "Extends WordPress WP API with menu routes.",
   "type": "wordpress-plugin",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "keywords": ["wordpress", "wp", "wp-api", "wp-rest-api", "api", "json"],
   "homepage": "https://github.com/unfulvio/wp-api-menus",
   "license": "GPLv2.0+",

includes/wp-api-menus-v1.php

@@ -64,8 +64,9 @@ public static function get_menus() {
 			$json_url = get_json_url() . '/menus/';
 			$wp_menus = wp_get_nav_menus();
 
-			$i = 0;
+			$i          = 0;
 			$json_menus = array();
+
 			foreach ( $wp_menus as $wp_menu ) :
 
 				$menu = (array) $wp_menu;
@@ -81,6 +82,7 @@ public static function get_menus() {
 				$json_menus[ $i ]['meta']['links']['self']       = $json_url . $menu['term_id'];
 
 				$i ++;
+
 			endforeach;
 
 			return $json_menus;
@@ -112,7 +114,9 @@ public function get_menu( $id ) {
 				$json_menu['count']         = abs( $menu['count'] );
 
 				$json_menu_items = array();
+
 				foreach ( $wp_menu_items as $item_object ) {
+
 					$json_menu_items[] = $this->format_menu_item( $item_object );
 				}
 
@@ -171,7 +175,9 @@ public static function get_menu_locations() {
 		public function get_menu_location( $location ) {
 
 			$locations = get_nav_menu_locations();
+
 			if ( ! isset( $locations[ $location ] ) ) {
+
 				return array();
 			}
 
@@ -181,9 +187,12 @@ public function get_menu_location( $location ) {
 			$sorted_menu_items = $top_level_menu_items = $menu_items_with_children = array();
 
 			foreach ( (array) $menu_items as $menu_item ) {
+
 				$sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
 			}
+
 			foreach ( $sorted_menu_items as $menu_item ) {
+
 				if ( (int) $menu_item->menu_item_parent !== 0 ) {
 					$menu_items_with_children[ $menu_item->menu_item_parent ] = true;
 				} else {
@@ -192,19 +201,23 @@ public function get_menu_location( $location ) {
 			}
 
 			$menu = array();
+
 			while ( $sorted_menu_items ) :
 
 				$i = 0;
+
 				foreach ( $top_level_menu_items as $top_item ) :
 
 					$menu[ $i ] = $this->format_menu_item( $top_item, false );
+
 					if ( isset( $menu_items_with_children[ $top_item->ID ] ) ) {
 						$menu[ $i ]['children'] = $this->get_nav_menu_item_children( $top_item->ID, $menu_items, false );
 					} else {
 						$menu[ $i ]['children'] = array();
 					}
 
 					$i++;
+
 				endforeach;
 
 				break;
@@ -235,7 +248,9 @@ public function get_nav_menu_item_children( $parent_id, $nav_menu_items, $depth
 					$nav_menu_item_list[] = $this->format_menu_item( $nav_menu_item, true, $nav_menu_items );
 
 					if ( $depth ) {
+
 						if ( $children = $this->get_nav_menu_item_children( $nav_menu_item->ID, $nav_menu_items ) ) {
+
 							$nav_menu_item_list = array_merge( $nav_menu_item_list, $children );
 						}
 					}
@@ -280,6 +295,7 @@ public function format_menu_item( $menu_item, $children = false, $menu = array()
 			);
 
 			if ( $children === true && ! empty( $menu ) ) {
+
 				$menu_item['children'] = $this->get_nav_menu_item_children( $item['ID'], $menu );
 			}
 

includes/wp-api-menus-v2.php

@@ -49,7 +49,6 @@ public static function get_plugin_namespace() {
          * Register menu routes for WP API v2.
          *
          * @since  1.2.0
-         * @return array
          */
         public function register_routes() {
 
@@ -85,7 +84,6 @@ public function register_routes() {
                     'callback' => array( $this, 'get_menu_location' ),
                 )
             ) );
-
         }
 
 
@@ -278,9 +276,11 @@ public function get_menu_location( $request ) {
 			 * from the ground up
 			 */
 			$rev_items = array_reverse ( $menu_items );
-			$rev_menu = array();
-			$cache = array();
+			$rev_menu  = array();
+			$cache     = array();
+
 			foreach ( $rev_items as $item ) :
+
 				$formatted = array(
 					'ID'          => abs( $item->ID ),
 					'order'       => (int) $item->menu_order,
@@ -298,24 +298,28 @@ public function get_menu_location( $request ) {
 					'type_label'  => $item->type_label,
 					'children'    => array(),
 				);
-				// Pickup my children
-				if ( array_key_exists ( $item->ID , $cache ) ) {
-					$formatted['children'] = array_reverse ( $cache[ $item->ID ] );
+
+				if ( array_key_exists( $item->ID , $cache ) ) {
+					$formatted['children'] = array_reverse( $cache[ $item->ID ] );
 				}
 
             	$formatted = apply_filters( 'rest_menus_format_menu_item', $formatted );
 
 				if ( $item->menu_item_parent != 0 ) {
-					// Wait for parent to pick me up
-					if ( array_key_exists ( $item->menu_item_parent , $cache ) ) {
+
+					if ( array_key_exists( $item->menu_item_parent , $cache ) ) {
 						array_push( $cache[ $item->menu_item_parent ], $formatted );
 					} else {
 						$cache[ $item->menu_item_parent ] = array( $formatted, );
 					}
+
 				} else {
+
 					array_push( $rev_menu, $formatted );
 				}
+
 			endforeach;
+
 			return array_reverse ( $rev_menu );
         }
 
@@ -327,7 +331,7 @@ public function get_menu_location( $request ) {
          * @param int   $parent_id      The parent nav_menu_item ID
          * @param array $nav_menu_items Navigation menu items
          * @param bool  $depth          Gives all children or direct children only
-         * @return  array   returns filtered array of nav_menu_items
+         * @return array	returns filtered array of nav_menu_items
          */
         public function get_nav_menu_item_children( $parent_id, $nav_menu_items, $depth = true ) {
 
@@ -360,7 +364,7 @@ public function get_nav_menu_item_children( $parent_id, $nav_menu_items, $depth
          * @param  object|array $menu_item  The menu item
          * @param  bool         $children   Get menu item children (default false)
          * @param  array        $menu       The menu the item belongs to (used when $children is set to true)
-         * @return array   a formatted menu item for REST
+         * @return array	a formatted menu item for REST
          */
         public function format_menu_item( $menu_item, $children = false, $menu = array() ) {
 
@@ -379,7 +383,7 @@ public function format_menu_item( $menu_item, $children = false, $menu = array()
                 'description' => $item['description'],
                 'object_id'   => abs( $item['object_id'] ),
                 'object'      => $item['object'],
-                'object_slug' => get_post($item['object_id'])->post_name,
+                'object_slug' => get_post( $item['object_id'] )->post_name,
                 'type'        => $item['type'],
                 'type_label'  => $item['type_label'],
             );

package.json

@@ -2,7 +2,7 @@
   "name": "wp-api-menus",
   "title": "WP API Menus",
   "description": "Extends the WordPress JSON REST WP API with new routes pointing to WordPress menus.",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "license": "GPL-2.0+",
   "homepage": "https://wordpress.org/plugins/wp-api-menus",
   "repository": {

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: wp-api, wp-rest-api, json-rest-api, json, menus, rest, api, menu-routes
 Requires at least: 3.6.0
 Tested up to: 4.4.2
-Stable tag: 1.3.0
+Stable tag: 1.3.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -58,6 +58,9 @@ Nothing to show really, this plugin has no settings or frontend, it just extends
 
 == Changelog ==
 
+= 1.3.1 =
+* Tweak: The `object_slug` property is now available to get the slug for relative URLs - props @Fahrradflucht
+
 = 1.3.0 =
 * Fix (V2): Nodes duplication in sublevel menu items, see https://github.com/unfulvio/wp-api-menus/pull/22 - props @bpongvh
 * Fix (V2): The items array was empty because it was looking for "ID" key instead of "id" - props @Dobbler

wp-api-menus.php

@@ -4,7 +4,7 @@
  * Plugin URI:  https://github.com/nekojira/wp-api-menus
  * Description: Extends WP API with WordPress menu routes.
  *
- * Version:     1.3.0
+ * Version:     1.3.1
  *
  * Author:      Fulvio Notarstefano
  * Author URI:  https://github.com/unfulvio
@@ -46,18 +46,17 @@
 	 *
 	 * @since 1.0.0
 	 */
-    function wp_rest_menus_init() {
-
-        if ( ! defined( 'JSON_API_VERSION' ) &&
-             ! in_array( 'json-rest-api/plugin.php', get_option( 'active_plugins' ) ) ) {
-							 $class = new WP_REST_Menus();
-							 add_filter( 'rest_api_init', array( $class, 'register_routes' ) );
-        } else {
-            $class = new WP_JSON_Menus();
-            add_filter( 'json_endpoints', array( $class, 'register_routes' ) );
-        }
-    }
-
-    add_action( 'init', 'wp_rest_menus_init' );
+	function wp_rest_menus_init() {
+
+        if ( ! defined( 'JSON_API_VERSION' ) && ! in_array( 'json-rest-api/plugin.php', get_option( 'active_plugins' ) ) ) {
+			$class = new WP_REST_Menus();
+			 add_filter( 'rest_api_init', array( $class, 'register_routes' ) );
+		} else {
+			$class = new WP_JSON_Menus();
+			add_filter( 'json_endpoints', array( $class, 'register_routes' ) );
+		}
+	}
+
+	add_action( 'init', 'wp_rest_menus_init' );
 
 endif;