Add create-embed-test-post script and fix support for various embeds

bin/create-embed-test-post.php

@@ -61,7 +61,7 @@
 	),
 	array(
 		'heading' => 'DailyMotion Embed',
-		'content' => 'http://www.dailymotion.com/embed/video/x6bacgf',
+		'content' => 'http://www.dailymotion.com/video/x6bacgf',
 	),
 	array(
 		'heading' => 'Facebook Post Embed',
@@ -81,7 +81,7 @@
 	),
 	array(
 		'heading' => 'Funny Or Die Video Embed',
-		'content' => 'http://FunnyOrDie.com/m/b1dn',
+		'content' => 'http://www.funnyordie.com/videos/2977012a20/i-still-haven-t-found-the-droids-i-m-looking-for',
 	),
 	array(
 		'heading' => 'Hulu Embed',
@@ -116,9 +116,21 @@
 		'content' => 'http://s1284.photobucket.com/user/adonchin/media/20171116_181841_zpsrjuop6u7.jpg.html',
 	),
 	array(
-		'heading' => 'Polldaddy Embed',
+		'heading' => 'Polldaddy Poll oEmbed',
 		'content' => 'https://polldaddy.com/poll/7012505/',
 	),
+	array(
+		'heading' => 'Polldaddy Survey oEmbed',
+		'content' => 'https://polldaddy.com/s/689f136963604d4f',
+	),
+	array(
+		'heading' => 'Polldaddy Poll Shortcode',
+		'content' => '[polldaddy poll=7012505 title="Custom poll title"]',
+	),
+	array(
+		'heading' => 'Polldaddy Survey Shortcode',
+		'content' => '[polldaddy survey=689f136963604d4f title="Custom survey title"]',
+	),
 	array(
 		'heading' => 'Reddit Embed',
 		'content' => 'https://www.reddit.com/r/Android/comments/7jbkub/google_maps_will_soon_tell_you_when_its_time_to/?ref=share&ref_source=link',

includes/class-amp-autoloader.php

@@ -80,7 +80,7 @@ class AMP_Autoloader {
 		'AMP_Image_Dimension_Extractor'                                  => 'includes/utils/class-amp-image-dimension-extractor',
 		'AMP_String_Utils'                                               => 'includes/utils/class-amp-string-utils',
 		'AMP_WP_Utils'                                                   => 'includes/utils/class-amp-wp-utils',
-		'WPCOM_AMP_Polldaddy_Embed'                                      => 'includes/wpcom/class-amp-polldaddy-embed',
+		'WPCOM_AMP_Polldaddy_Embed'                                      => 'wpcom/class-amp-polldaddy-embed',
 		'AMP_Test_Stub_Sanitizer'                                        => 'tests/stubs',
 		'AMP_Test_World_Sanitizer'                                       => 'tests/stubs',
 	);

includes/embeds/class-amp-soundcloud-embed.php

@@ -82,10 +82,10 @@ public function oembed( $matches, $attr, $url ) {
 	 * Filter oEmbed HTML for SoundCloud to convert to AMP.
 	 *
 	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL. Optional.
+	 * @param string $url   Embed URL.
 	 * @return string Embed.
 	 */
-	public function filter_embed_oembed_html( $cache, $url = null ) {
+	public function filter_embed_oembed_html( $cache, $url ) {
 		$parsed_url = wp_parse_url( $url );
 		if ( $url && false === strpos( $parsed_url['host'], 'soundcloud.com' ) ) {
 			return $cache;

includes/templates/class-amp-post-template.php

@@ -362,6 +362,7 @@ private function build_post_content() {
 				'AMP_Facebook_Embed_Handler' => array(),
 				'AMP_Pinterest_Embed_Handler' => array(),
 				'AMP_Gallery_Embed_Handler' => array(),
+				'WPCOM_AMP_Polldaddy_Embed' => array(),
 			), $this->post ),
 			apply_filters( 'amp_content_sanitizers', array(
 				'AMP_Style_Sanitizer'             => array(),

wpcom-helper.php

@@ -6,10 +6,12 @@
 // Disable admin menu
 add_filter( 'amp_options_menu_is_enabled', '__return_false', 9999 );
 
+/**
+ * Disable the_content filters for Jetpack.
+ *
+ * @param int $post_id Post ID.
+ */
 function jetpack_amp_disable_the_content_filters( $post_id ) {
-	// Shortcode overrides.
-	require_once( dirname( __FILE__ ) . '/wpcom/shortcodes.php' );
-
 	add_filter( 'post_flair_disable', '__return_true', 99 );
 	add_filter( 'videopress_show_2015_player', '__return_true' );
 	add_filter( 'protected_embeds_use_form_post', '__return_false' );

wpcom/class-amp-polldaddy-embed.php

@@ -1,26 +1,100 @@
 <?php
+/**
+ * Class WPCOM_AMP_Polldaddy_Embed
+ *
+ * @package AMP
+ */
 
+/**
+ * Class WPCOM_AMP_Polldaddy_Embed
+ */
 class WPCOM_AMP_Polldaddy_Embed extends AMP_Base_Embed_Handler {
+
+	/**
+	 * Register embed.
+	 */
 	public function register_embed() {
 		add_shortcode( 'polldaddy', array( $this, 'shortcode' ) );
+		add_filter( 'embed_oembed_html', array( $this, 'filter_embed_oembed_html' ), 10, 3 );
 	}
 
+	/**
+	 * Unregister embed.
+	 */
 	public function unregister_embed() {
 		remove_shortcode( 'polldaddy' );
+		remove_filter( 'embed_oembed_html', array( $this, 'filter_embed_oembed_html' ), 10 );
 	}
 
+	/**
+	 * Shortcode.
+	 *
+	 * @param array $attr Shortcode attributes.
+	 * @return string Shortcode.
+	 */
 	public function shortcode( $attr ) {
+		global $wp_embed;
+
+		$output = '';
 		$url = 'https://polldaddy.com/';
 		if ( ! empty( $attr['poll'] ) ) {
 			$url .= 'poll/' . $attr['poll'] . '/';
-			$name = ! empty( $attr['title'] ) ? $attr['title'] : __( 'View Poll', 'amp' );
-		} elseif ( ! empty( $attr['survey'] ) ) { // Surveys and Quizzes both use attr survey
+		} elseif ( ! empty( $attr['survey'] ) ) {
 			$url .= 's/' . $attr['survey'] . '/';
-			$name = ! empty( $attr['title'] ) ? $attr['title'] : __( 'View Survey', 'amp' );
-		} else {
-			return ''; // We can't embed anything useful for rating
 		}
 
-		return '<p><a href="' . esc_url( $url ) . '">' . esc_html( $name ) . '</a></p>';
+		if ( ! empty( $attr['title'] ) ) {
+			$output = $this->render_link( $url, $attr['title'] );
+		} elseif ( $url ) {
+			$output = $wp_embed->shortcode( $attr, $url );
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Filter oEmbed HTML for PollDaddy to for AMP output.
+	 *
+	 * @param string $cache Cache for oEmbed.
+	 * @param string $url   Embed URL.
+	 * @param array  $attr  Shortcode attributes.
+	 * @return string Embed.
+	 */
+	public function filter_embed_oembed_html( $cache, $url, $attr ) {
+		$parsed_url = wp_parse_url( $url );
+		if ( $url && false === strpos( $parsed_url['host'], 'polldaddy.com' ) ) {
+			return $cache;
+		}
+
+		$output = '';
+
+		// Poll oEmbed responses include noscript.
+		if ( preg_match( '#<noscript>(.+?)</noscript>#', $cache, $matches ) ) {
+			$output = $matches[1];
+		}
+
+		if ( empty( $output ) ) {
+			if ( ! empty( $attr['title'] ) ) {
+				$name = $attr['title'];
+			} elseif ( false !== strpos( $url, 'polldaddy.com/s' ) ) {
+				$name = __( 'View Survey', 'amp' );
+			} else {
+				$name = __( 'View Poll', 'amp' );
+			}
+			$output = $this->render_link( $url, $name );
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Render poll/survey link.
+	 *
+	 * @param string $url   Link URL.
+	 * @param string $title Link Text.
+	 * @return string Link.
+	 */
+	private function render_link( $url, $title ) {
+		return sprintf( '<p><a href="' . esc_url( $url ) . '">' . esc_html( $title ) . '</a></p>' );
 	}
 }

wpcom/shortcodes.php

@@ -5,16 +5,16 @@
  * @package AMP
  */
 
-add_filter( 'amp_content_embed_handlers', 'wpcom_amp_add_custom_embeds', 10, 2 );
+_deprecated_file( __FILE__, '0.6.0' );
 
 /**
  * Add custom embeds for WordPress.com.
  *
- * @param array   $embed_handler_classes Embed handler classes.
- * @param WP_Post $post                  Post.
+ * @deprecated Now PollDaddy is supported in core AMP.
+ * @param array $embed_handler_classes Embed handler classes.
  * @return mixed
  */
-function wpcom_amp_add_custom_embeds( $embed_handler_classes, $post ) {
-	$embed_handler_classes['WPCOM_AMP_Polldaddy_Embed'] = array();
+function wpcom_amp_add_custom_embeds( $embed_handler_classes ) {
+	_deprecated_function( __FUNCTION__, '0.6.0' );
 	return $embed_handler_classes;
 }