dawehner/amp-library

.travis.yml

@@ -12,3 +12,7 @@ before_script:
 
 script:
   - vendor/bin/phpunit tests
+
+matrix:
+  allow_failures:
+    - php: nightly

README.md

@@ -114,7 +114,7 @@ $ ./amp-console amp:convert sample-html/several_errors.html --full-document
 ```
 Note that you need to provide `--full-document` if you're providing a full html document file for conversion.
 
-Lets see the output output of the first example command above. The first few lines is the AMPized HTML provided by our library. The rest of the headings are self explanatory.
+Lets see the output of the first example command above. The first few lines is the AMPized HTML provided by our library. The rest of the headings are self explanatory.
 
 ```html
 $ cd <amp-php-library-repo-cloned-location>
@@ -161,18 +161,18 @@ FAIL
 
 <a style="color: red;" href="javascript:run();"> on line 1
 - The attribute 'style' may not appear in tag 'a'.
-   [code: DISALLOWED_ATTR  category: DISALLOWED_HTML]
+   [code: DISALLOWED_ATTR  category: DISALLOWED_HTML see: https://www.ampproject.org/docs/reference/spec.html#links]
    ACTION TAKEN: a.style attribute was removed due to validation issues.
 - Invalid URL protocol 'javascript:' for attribute 'href' in tag 'a'.
-   [code: INVALID_URL_PROTOCOL  category: DISALLOWED_HTML]
+   [code: INVALID_URL_PROTOCOL  category: DISALLOWED_HTML see: https://www.ampproject.org/docs/reference/spec.html#links]
    ACTION TAKEN: a.href attribute was removed due to validation issues.
 
 <a style="margin: 2px;" href="http://www.cnn.com" target="_parent"> on line 2
 - The attribute 'style' may not appear in tag 'a'.
-   [code: DISALLOWED_ATTR  category: DISALLOWED_HTML]
+   [code: DISALLOWED_ATTR  category: DISALLOWED_HTML see: https://www.ampproject.org/docs/reference/spec.html#links]
    ACTION TAKEN: a.style attribute was removed due to validation issues.
 - The attribute 'target' in tag 'a' is set to the invalid value '_parent'.
-   [code: INVALID_ATTR_VALUE  category: DISALLOWED_HTML]
+   [code: INVALID_ATTR_VALUE  category: DISALLOWED_HTML see: https://www.ampproject.org/docs/reference/spec.html#html-tags]
    ACTION TAKEN: a.target attribute was removed due to validation issues.
 
 <input type="submit" value="submit"> on line 5
@@ -182,7 +182,7 @@ FAIL
 
 <div onmouseover="hello();"> on line 6
 - The attribute 'onmouseover' may not appear in tag 'div'.
-   [code: DISALLOWED_ATTR  category: DISALLOWED_HTML]
+   [code: DISALLOWED_ATTR  category: DISALLOWED_HTML see: https://www.ampproject.org/docs/reference/spec.html#links]
    ACTION TAKEN: div.onmouseover attribute was removed due to validation issues.
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"> on line 8

src/AMP.php

@@ -58,6 +58,7 @@ class AMP
         'Lullabot\AMP\Pass\IframeVineTagTransformPass',
         'Lullabot\AMP\Pass\IframeDailymotionTagTransformPass',
         'Lullabot\AMP\Pass\IframeYouTubeTagTransformPass',
+        'Lullabot\AMP\Pass\IframeHuluTagTransformPass',
         'Lullabot\AMP\Pass\IframeTagTransformPass',
         'Lullabot\AMP\Pass\InstagramTransformPass',
         'Lullabot\AMP\Pass\PinterestTagTransformPass',
@@ -174,6 +175,17 @@ public function loadHtml($html, $options = [])
             $options['use_html5_parser'] = true;
         }
 
+        // By default the convertion of img into amp-anim is disabled (because of ressource cost)
+        //  => they will be converted into amp-img instead
+        if (!isset($options['use_img_anim_tag'])) {
+            $options['use_img_anim_tag'] = false;
+        }
+
+        // By default img that can't be converted are kept as it is and not removed
+        if (!isset($options['remove_non_converted_img_tag'])) {
+            $options['remove_non_converted_img_tag'] = false;
+        }
+
         $this->options = $options;
         $this->scope = !empty($options['scope']) ? $options['scope'] : Scope::BODY_SCOPE;
 

src/Pass/AmpImgFixPass.php

@@ -75,6 +75,17 @@ function pass()
                     $error->resolved = false;
                 }
             }
+            elseif (in_array($error->code, [ValidationErrorCode::MANDATORY_TAG_ANCESTOR_WITH_HINT]) &&
+                !$error->resolved &&
+                !empty($error->dom_tag) &&
+                strtolower($error->dom_tag->tagName) == 'img' &&
+                !empty($this->options['remove_non_converted_img_tag'])
+            ) {
+                 // Remove the offending tag
+                $error->dom_tag->parentNode->removeChild($error->dom_tag);
+                $error->addActionTaken(new ActionTakenLine('img', ActionTakenType::TAG_REMOVED));
+                $error->resolved = TRUE;
+            }
         }
     }
 }

src/Pass/BaseFacebookPass.php

@@ -0,0 +1,49 @@
+<?php
+/*
+ * Copyright 2016 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Lullabot\AMP\Pass;
+
+abstract class BaseFacebookPass extends BasePass
+{
+    /**
+     * Checks whether the given url is a valid facebook post url
+     *
+     * @param string $url
+     * @return bool
+     */
+    protected function isValidPostUrl($url)
+    {
+        return
+            // e.g. https://www.facebook.com/20531316728/posts/10154009990506729/
+            preg_match('&(*UTF8)facebook\.com/.*/posts/\d+/?&i', $url)
+            // e.g. https://www.facebook.com/photos/{photo-id}
+            // or https://www.facebook.com/SanAntonioVAMC/photos/a.411451129506.185409.351086129506/10154231221264507/?type=3&amp;theater
+            || preg_match('&(*UTF8)facebook\.com/.*photos.*&i', $url)
+            // e.g. https://www.facebook.com/photo.php?fbid={photo-id}
+            // or https://www.facebook.com/photo.php?v=10153655829445601
+            || preg_match('&(*UTF8)facebook\.com/photo\.php.*&i', $url);
+    }
+
+    protected function isValidVideoUrl($url)
+    {
+        return
+            // e.g https://www.facebook.com/facebook/videos/10153231379946729/
+            preg_match('&(*UTF8)facebook\.com/.*/videos/\d+/?&i', $url)
+            // e.g https://www.facebook.com/video.php?v=10153231379946729
+            || preg_match('&(*UTF8)facebook\.com/video\.php.*&i', $url);
+    }
+}

src/Pass/FacebookNonIframeTransformPass.php

@@ -38,7 +38,7 @@
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/amp-facebook.md
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/0.1/validator-amp-facebook.protoascii
  */
-class FacebookNonIframeTransformPass extends BasePass
+class FacebookNonIframeTransformPass extends BaseFacebookPass
 {
     const DEFAULT_WIDTH = 500;
     const DEFAULT_HEIGHT = 281;
@@ -109,17 +109,16 @@ protected function getFacebookEmbedAttrs(DOMQuery $el)
         }
 
         $card = true;
-        // e.g https://www.facebook.com/facebook/videos/10153231379946729/
-        if (preg_match('&(*UTF8)facebook\.com/.*/videos/\d+/?&i', $src)) {
+        if ($this->isValidVideoUrl($src)) {
             // A facebook video can be embedded as a post. Doing that enables the video "card" to display
             if ($el->attr('data-show-text') !== "false") {
                 $embed_as = 'post';
                 $card = true;
             } else {
                 $embed_as = 'video';
             }
-        } // e.g. https://www.facebook.com/20531316728/posts/10154009990506729/
-        else if (preg_match('&(*UTF8)facebook\.com/.*/posts/\d+/?&i', $src)) {
+        }
+        elseif ($this->isValidPostUrl($src)) {
             $embed_as = 'post';
         } else {
             return false;

src/Pass/IframeFacebookTagTransformPass.php

@@ -54,7 +54,7 @@
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/amp-facebook.md
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/0.1/validator-amp-facebook.protoascii
  */
-class IframeFacebookTagTransformPass extends BasePass
+class IframeFacebookTagTransformPass extends BaseFacebookPass
 {
     const DEFAULT_ASPECT_RATIO = 1.7778;
     const DEFAULT_WIDTH = 500;
@@ -108,16 +108,15 @@ protected function setStandardFacebookParameters(DOMQuery $el)
             return false;
         }
 
-        // e.g https://www.facebook.com/facebook/videos/10153231379946729/
-        if (preg_match('&(*UTF8)facebook\.com/facebook/videos/\d+/?&i', $query_arr['href'])) {
+        if ($this->isValidVideoUrl($query_arr['href'])) {
             // A facebook video can be embedded as a post. Doing that enables the video "card" to display
             if (isset($query_arr['show_text']) && $query_arr['show_text'] !== "false") {
                 $embed_as = 'post';
             } else {
                 $embed_as = 'video';
             }
-        } // e.g. https://www.facebook.com/20531316728/posts/10154009990506729/
-        else if (preg_match('&(*UTF8)facebook\.com/.*/posts/\d+/?&i', $query_arr['href'])) {
+        }
+        elseif ($this->isValidPostUrl($query_arr['href'])) {
             $embed_as = 'post';
         } else {
             return false;

src/Pass/IframeHuluTagTransformPass.php

@@ -0,0 +1,65 @@
+<?php
+/*
+ * Copyright 2016 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+namespace Lullabot\AMP\Pass;
+
+use QueryPath\DOMQuery;
+
+use Lullabot\AMP\Utility\ActionTakenLine;
+use Lullabot\AMP\Utility\ActionTakenType;
+
+/**
+ * Class IframeHuluTagTransformPass
+ * @package Lullabot\AMP\Pass
+ *
+ * Sample hulu embed code:
+ * <iframe width="854" height="480" frameborder="0" allowfullscreen="allowfullscreen" src="//www.hulu.com/embed.html?eid=_hHzwnAcj3RrXMJFDDvkuw"></iframe>
+ *
+ * @see https://www.ampproject.org/docs/reference/extended/amp-hulu.html
+ * @see https://ampbyexample.com/components/amp-hulu/
+ */
+class IframeHuluTagTransformPass extends BasePass
+{
+    function pass()
+    {
+        $all_iframes = $this->q->find('iframe:not(noscript iframe)');
+        /** @var DOMQuery $el */
+        foreach ($all_iframes as $el) {
+            /** @var \DOMElement $dom_el */
+            $dom_el = $el->get(0);
+            $lineno = $this->getLineNo($dom_el);
+
+            if ($eid = $this->getArtifactId($el, '&(*UTF8)hulu\.com/embed\.html\?eid=(\w+)&i')) {
+                $width = $el->attr('width') ?: 800;
+                $height = $el->attr('height') ?: 600;
+
+                $context_string = $this->getContextString($dom_el);
+
+                // width and height are intended to be aspect ratios here
+                $el->after('<amp-hulu width="' . $width . '" height="' . $height . '" layout="responsive" data-eid="' . $eid . '"></amp-hulu>');
+                $new_dom_el = $el->next()->get(0);
+
+                $el->removeChildren()->remove();
+                $this->addActionTaken(new ActionTakenLine('iframe', ActionTakenType::HULU_CONVERTED, $lineno, $context_string));
+                $this->context->addLineAssociation($new_dom_el, $lineno);
+            }
+        }
+
+        return $this->transformations;
+    }
+}

src/Pass/IframeYouTubeTagTransformPass.php

@@ -113,37 +113,25 @@ protected function isYouTubeIframe(DOMQuery $el)
      *
      * @param DOMQuery $el
      * @return string
+     *
      */
     protected function getYouTubeCode(DOMQuery $el)
     {
         $matches = [];
         $youtube_code = '';
         $href = $el->attr('src');
 
-        // @todo there seem to be a lot of ways to embed a youtube video. We probably need to capture all patterns here
-        // The next one is the embed code that youtube gives you
-        if (preg_match('&(*UTF8)/embed/([^/?]+)&i', $href, $matches)) {
-            if (!empty($matches[1])) {
-                $youtube_code = $matches[1];
-                return $youtube_code;
-            }
-        }
-
-        if (preg_match('&(*UTF8)youtu\.be/([^/?]+)&i', $href, $matches)) {
-            if (!empty($matches[1])) {
-                $youtube_code = $matches[1];
-                return $youtube_code;
-            }
-        }
-
-        if (preg_match('!(*UTF8)watch\?v=([^&]+)!i', $href, $matches)) {
-            if (!empty($matches[1])) {
+        // This regex is supposed to catch all possible way to embed youtube video
+        if (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $href, $matches))
+        {
+            if (!empty($matches[1]))
+            {
                 $youtube_code = $matches[1];
-                return $youtube_code;
+                return htmlspecialchars($youtube_code);
             }
         }
 
-        return $youtube_code;
+        return htmlspecialchars($youtube_code);
     }
 
     /**