feat: added ability to push image assets by parsing response for img with src and common extensions

JacobBennett · JacobBennett · commit 657c74cdc3a0 · 2016-07-30T21:37:46.000-05:00
diff --git a/src/Middleware/AddHttp2ServerPush.php b/src/Middleware/AddHttp2ServerPush.php
@@ -33,7 +33,7 @@ public function handle(Request $request, Closure $next)
             return $response;
         }
 
-        $this->fetchLinkableNodes($response);
+        $this->generateAndAttachLinkHeaders($response);
 
         return $response;
     }
@@ -43,20 +43,16 @@ public function handle(Request $request, Closure $next)
      *
      * @return $this
      */
-    protected function fetchLinkableNodes(Response $response)
+    protected function generateAndAttachLinkHeaders(Response $response)
     {
-        $crawler = $this->getCrawler($response);
-
-        $nodes = $crawler->filter('link, script[src]')->extract(['src', 'href']);
-
-        $headers = collect($nodes)->flatten(1)
-            ->filter()
+        $headers = $this->fetchLinkableNodes($response)
+            ->flatten(1)
             ->map(function ($url) {
                 return $this->buildLinkHeaderString($url);
             })->filter()
             ->implode(',');
 
-        if (! empty(trim($headers))) {
+        if (!empty(trim($headers))) {
             $this->addLinkHeader($response, $headers);
         }
 
@@ -80,26 +76,52 @@ protected function getCrawler(Response $response)
     }
 
     /**
+     * Get all nodes we are interested in pushing
+     *
+     * @param $response
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    protected function fetchLinkableNodes($response)
+    {
+        $crawler = $this->getCrawler($response);
+
+        return collect($crawler->filter('link, script[src], img[src]')->extract(['src', 'href']));
+    }
+
+    /**
+     * Build out header string based on asset extension
+     *
      * @param String $url
+     *
      * @return string
      */
     private function buildLinkHeaderString($url)
     {
         $linkTypeMap = [
-            'css' => 'style',
-            'js'  => 'script',
+            '.CSS'  => 'style',
+            '.JS'   => 'script',
+            '.BMP'  => 'image',
+            '.GIF'  => 'image',
+            '.JPG'  => 'image',
+            '.JPEG' => 'image',
+            '.PNG'  => 'image',
+            '.TIFF' => 'image',
         ];
 
-        $type = collect($linkTypeMap)->first(function($extension) use($url) {
-           return  str_contains($url, $extension);
+        $type = collect($linkTypeMap)->first(function ($extension) use ($url) {
+            return str_contains(strtoupper($url), $extension);
         });
 
         return is_null($type) ? null : "<{$url}>; rel=preload; as={$type}";
 
     }
 
     /**
+     * Add Link Header
+     *
      * @param Response $response
+     *
      * @param $link
      */
     private function addLinkHeader(Response $response, $link)
diff --git a/tests/AddHttp2ServerPushTest.php b/tests/AddHttp2ServerPushTest.php
@@ -10,12 +10,13 @@
 
 class AddHttp2ServerPushTest extends \PHPUnit_Framework_TestCase
 {
+
     public function setUp()
     {
         $this->middleware = new AddHttp2ServerPush();
     }
 
-//    /** @test */
+    /** @test */
     public function it_will_not_modify_a_response_with_no_server_push_assets()
     {
         $request = new Request();
@@ -47,6 +48,18 @@ public function it_will_return_a_js_link_header_for_js()
         $this->assertStringEndsWith("as=script", $response->headers->get('link'));
     }
 
+    /** @test */
+    public function it_will_return_a_image_link_header_for_images()
+    {
+        $request = new Request();
+
+        $response = $this->middleware->handle($request, $this->getNext('pageWithImages'));
+
+        $this->assertTrue($this->isServerPushResponse($response));
+        $this->assertStringEndsWith("as=image", $response->headers->get('link'));
+        $this->assertCount(6, explode(",", $response->headers));
+    }
+
     /** @test */
     public function it_returns_well_formatted_link_headers()
     {
diff --git a/tests/fixtures/pageWithImages.html b/tests/fixtures/pageWithImages.html
@@ -0,0 +1,16 @@
+<html>
+
+    <head>
+        <title>Page title</title>
+    </head>
+
+    <body>
+        <img src="/images/mspaint.bmp" alt="">
+        <img src="/images/cats.gif" alt="">
+        <img src="/images/photo.jpg" alt="">
+        <img src="/images/photo.jpeg" alt="">
+        <img src="/images/logo.png" alt="">
+        <img src="/images/noidea.tiff" alt="">
+    </body>
+
+</html>

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,13 @@`
`10`	`10`
`11`	`11`	`class AddHttp2ServerPushTest extends \PHPUnit_Framework_TestCase`
`12`	`12`	`{`
	`13`	`+`
`13`	`14`	`public function setUp()`
`14`	`15`	`{`
`15`	`16`	`$this->middleware = new AddHttp2ServerPush();`
`16`	`17`	`}`
`17`	`18`
`18`		`-// /** @test */`
	`19`	`+ /** @test */`
`19`	`20`	`public function it_will_not_modify_a_response_with_no_server_push_assets()`
`20`	`21`	`{`
`21`	`22`	`$request = new Request();`
`@@ -47,6 +48,18 @@ public function it_will_return_a_js_link_header_for_js()`
`47`	`48`	`$this->assertStringEndsWith("as=script", $response->headers->get('link'));`
`48`	`49`	`}`
`49`	`50`
	`51`	`+ /** @test */`
	`52`	`+ public function it_will_return_a_image_link_header_for_images()`
	`53`	`+ {`
	`54`	`+ $request = new Request();`
	`55`	`+`
	`56`	`+ $response = $this->middleware->handle($request, $this->getNext('pageWithImages'));`
	`57`	`+`
	`58`	`+ $this->assertTrue($this->isServerPushResponse($response));`
	`59`	`+ $this->assertStringEndsWith("as=image", $response->headers->get('link'));`
	`60`	`+ $this->assertCount(6, explode(",", $response->headers));`
	`61`	`+ }`
	`62`	`+`
`50`	`63`	`/** @test */`
`51`	`64`	`public function it_returns_well_formatted_link_headers()`
`52`	`65`	`{`