Merge pull request #17 from indieweb/accept-header

Accept header

Author: pfefferle

.travis.yml

@@ -9,7 +9,7 @@ cache:
   directories:
     - vendor
     - $HOME/.composer/cache
-after_success: 
+after_success:
 env:
   matrix:
   - WP_VERSION=latest WP_MULTISITE=0
@@ -43,13 +43,9 @@ before_script:
         echo "Using PHPUnit 6.x"
         composer global require "phpunit/phpunit:^6"
         ;;
-      5.6|5.5|5.4|5.3)
-        echo "Using PHPUnit 4.x"
-        composer global require "phpunit/phpunit:^4"
-        ;;
-      5.2)
-        # Do nothing, use default PHPUnit 3.6.x
-        echo "Using default PHPUnit, hopefully 3.6"
+      5.6)
+        echo "Using PHPUnit 5.x"
+        composer global require "phpunit/phpunit:^5"
         ;;
       *)
         echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"

includes/class-mf2-feed-entry.php

@@ -127,6 +127,8 @@ public function jf2_to_mf2( $entry ) {
 					$items[] = $this->jf2_to_mf2( $item );
 				}
 				$value = $items;
+			} elseif ( wp_is_numeric_array( $value ) && ! is_array( $value[0] ) ) {
+				$value = $value;
 			} elseif ( ! wp_is_numeric_array( $value ) ) {
 				$value = array( $value );
 			} else {

languages/mf2-feed.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the MIT.
 msgid ""
 msgstr ""
-"Project-Id-Version: MF2 Feed 3.0.0\n"
+"Project-Id-Version: MF2 Feed 3.1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mf2-feed\n"
-"POT-Creation-Date: 2020-01-20 08:57:09+00:00\n"
+"POT-Creation-Date: 2020-12-09 11:04:57+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

mf2-feed.php

@@ -3,7 +3,7 @@
  * Plugin Name: MF2 Feed
  * Plugin URI: http://github.com/indieweb/wordpress-mf2-feed/
  * Description: Adds a Microformats2 JSON feed for every entry
- * Version: 3.0.0
+ * Version: 3.1.0
  * Author: IndieWeb WordPress Outreach Club
  * Author URI: https://indieweb.org/WordPress_Outreach_Club
  * License: MIT
@@ -35,6 +35,8 @@ public static function init() {
 
 		add_action( 'wp_head', array( 'Mf2Feed', 'add_html_header' ), 5 );
 		add_filter( 'feed_content_type', array( 'Mf2Feed', 'feed_content_type' ), 10, 2 );
+
+		add_filter( 'template_include', array( 'Mf2Feed', 'render_json_template' ), 100 );
 	}
 
 	public static function activate() {
@@ -92,6 +94,52 @@ public static function do_feed_jf2( $for_comments ) {
 		}
 	}
 
+	/**
+	 * Return a MF2/JF2 JSON version of an author, post or page.
+	 *
+	 * @param  string $template The path to the template object.
+	 *
+	 * @return string The new path to the JSON template.
+	 */
+	public static function render_json_template( $template ) {
+		if ( ! is_singular() ) {
+			return $template;
+		}
+
+		global $wp_query;
+
+		if ( ! isset( $_SERVER['HTTP_ACCEPT'] ) ) {
+			return $template;
+		}
+
+		$accept_header = $_SERVER['HTTP_ACCEPT'];
+
+		if (
+			stristr( $accept_header, 'application/mf2+json' )
+		) {
+			return dirname( __FILE__ ) . '/includes/feed-mf2-comments.php';;
+		} elseif (
+			stristr( $accept_header, 'application/jf2+json' )
+		) {
+			return dirname( __FILE__ ) . '/includes/feed-jf2-comments.php';
+		}
+
+		// Accept header as an array.
+		$accept = explode( ',', trim( $accept_header ) );
+
+		if (
+			in_array( 'application/mf2+json', $accept, true )
+		) {
+			return dirname( __FILE__ ) . '/includes/feed-mf2-comments.php';;
+		} elseif (
+			in_array( 'application/jf2+json', $accept, true )
+		) {
+			return dirname( __FILE__ ) . '/includes/feed-jf2-comments.php';
+		}
+
+		return $template;
+	}
+
 	/**
 	 * adds "mf2" content-type
 	 *

readme.md

@@ -3,8 +3,8 @@
 **Donate link:** https://opencollective.com/indieweb  
 **Tags:** microformats, mf2, jf2, rel-alternate, indieweb  
 **Requires at least:** 5.2  
-**Tested up to:** 5.3.2  
-**Stable tag:** 3.0.0  
+**Tested up to:** 5.6  
+**Stable tag:** 3.1.0  
 **Requires PHP:** 5.6  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
@@ -80,7 +80,12 @@ To install a WordPress Plugin manually:
 
 Project actively developed on Github at [indieweb/wordpress-mf2-feed](https://github.com/indieweb/wordpress-mf2-feed). Please file support issues there.
 
+### 3.1.0 ###
+
+* Support Content Negotiation
+
 ### 3.0.0 ###
+
 * Refactored to match the configuration of feeds built into WordPress
 * Bumped PHP Version requirement to PHP5.6 to match WordPress 5.3
 * Bumped minimum WordPress version to 5.2 as this allows for the version of get_content that includes a $post parameter

readme.txt

@@ -3,8 +3,8 @@ Contributors: pfefferle, dshanske, indieweb
 Donate link: https://opencollective.com/indieweb
 Tags: microformats, mf2, jf2, rel-alternate, indieweb
 Requires at least: 5.2
-Tested up to: 5.3.2
-Stable tag: 3.0.0
+Tested up to: 5.6
+Stable tag: 3.1.0
 Requires PHP: 5.6
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -80,7 +80,12 @@ To install a WordPress Plugin manually:
 
 Project actively developed on Github at [indieweb/wordpress-mf2-feed](https://github.com/indieweb/wordpress-mf2-feed). Please file support issues there.
 
+= 3.1.0 =
+
+* Support Content Negotiation
+
 = 3.0.0 =
+
 * Refactored to match the configuration of feeds built into WordPress
 * Bumped PHP Version requirement to PHP5.6 to match WordPress 5.3
 * Bumped minimum WordPress version to 5.2 as this allows for the version of get_content that includes a $post parameter