Merge pull request #60 from aaronpk/htmlpurifier-update

switch to htmlpurifier master

composer.json

@@ -6,7 +6,7 @@
   "description": "X-Ray returns structured data from any URL",
   "require": {
     "mf2/mf2": "^0.3.2",
-    "ezyang/htmlpurifier": "4.*",
+    "ezyang/htmlpurifier": "dev-master#6d6d88512a8146939a9161bb03e95e3e97840439@dev",
     "indieweb/link-rel-parser": "0.1.*",
     "dg/twitter-php": "3.6.*",
     "p3k/timezone": "*",
@@ -38,5 +38,11 @@
       "controllers/Feeds.php",
       "controllers/Certbot.php"
     ]
-  }
+  },
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/ezyang/htmlpurifier.git"
+    }
+  ]
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "ee0b0e99a5aeee6e95f5d642f438cde2",
+    "content-hash": "bcdd53e30f9960f6b39b0aa2c74d5457",
     "packages": [
         {
             "name": "cebe/markdown",
@@ -110,17 +110,11 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.9.3",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "95e1bae3182efc0f3422896a3236e991049dac69"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69",
-                "reference": "95e1bae3182efc0f3422896a3236e991049dac69",
-                "shasum": ""
+                "reference": "6d6d88512a8146939a9161bb03e95e3e97840439"
             },
             "require": {
                 "php": ">=5.2"
@@ -137,7 +131,6 @@
                     "library/HTMLPurifier.composer.php"
                 ]
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL"
             ],
@@ -153,7 +146,7 @@
             "keywords": [
                 "html"
             ],
-            "time": "2017-06-03T02:28:16+00:00"
+            "time": "2017-12-30T05:23:44+00:00"
         },
         {
             "name": "facebook/graph-sdk",
@@ -2089,7 +2082,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "ezyang/htmlpurifier": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],

tests/FeedTest.php

@@ -314,4 +314,16 @@ class FeedTest extends PHPUnit_Framework_TestCase {
     $this->assertEquals('Sometimes my job requires me to listen to 55 minutes of an hour long phone call while I go for a long walk on a sunny morning and wait for my turn to give an update. Pretty nice!', $data->items[11]->content->text);
   }
 
-}
+  public function testAscraeus() {
+    $url = 'http://source.example.com/ascraeus';
+    $response = $this->parse(['url' => $url, 'expect' => 'feed']);
+
+    $body = $response->getContent();
+    $this->assertEquals(200, $response->getStatusCode());
+    $data = json_decode($body)->data;
+
+    $this->assertEquals('feed', $data->type);
+    $this->assertEquals(20, count($data->items));
+  }
+
+}

tests/ParseTest.php

@@ -613,6 +613,25 @@ class ParseTest extends PHPUnit_Framework_TestCase {
     $this->assertEquals('http://example.com/photo.jpg', $data['data']['photo'][0]);
   }
 
+  public function testInputIsParsedMf2WithHTML() {
+    $html = '<div class="h-entry"><p class="e-content p-name"><b>Hello</b> <i>World</i></p><img src="/photo.jpg"></p></div>';
+    $mf2 = Mf2\parse($html, 'http://example.com/entry');
+
+    $url = 'http://example.com/entry';
+    $response = $this->parse([
+      'url' => $url,
+      'body' => json_encode($mf2)
+    ]);
+
+    $body = $response->getContent();
+    $this->assertEquals(200, $response->getStatusCode());
+    $data = json_decode($body, true);
+
+    $this->assertEquals('Hello World', $data['data']['content']['text']);
+    $this->assertEquals('<b>Hello</b> <i>World</i>', $data['data']['content']['html']);
+    $this->assertEquals('http://example.com/photo.jpg', $data['data']['photo'][0]);
+  }
+
   public function testHApp() {
     $url = 'http://source.example.com/h-app';
     $response = $this->parse(['url' => $url]);