Fixed blog post caching

- Some incorrect logic was preventing caching of posts.
- The console tooling needed updating to use the ServiceManager instead of the
  homegrown service implementation.
- The CachePosts console tooling needed updating to use the DisplayPost
  middleware, and to set the 'id' attribute on the request before invoking it.
- Removed the obsolete `Blog\CachingMiddlewareFactory` and `Blog\Middleware`
  classes.

.gitignore

@@ -1,5 +1,5 @@
 config/autoload/*local.php
-data/cache/posts/*.html
+data/cache/posts/*
 data/comics/*.html
 data/comics.mustache
 data/feeds/*.xml

bin/mwop.net.php

@@ -5,15 +5,20 @@
 use Zend\Console\Console;
 use Zend\Feed\Reader\Reader as FeedReader;
 use Zend\Http\Client as HttpClient;
+use Zend\ServiceManager\Config;
+use Zend\ServiceManager\ServiceManager;
 use ZF\Console\Application;
 
 chdir(__DIR__ . '/../');
+error_reporting(-1);
+ini_set('display_errors', 1);
 require_once 'vendor/autoload.php';
 
 define('VERSION', '0.0.1');
 
 $config   = include 'config/config.php';
-$services = createServiceContainer($config);
+$services = new ServiceManager(new Config($config['services']));
+$services->setService('Config', $config);
 
 $routes = [
     [

config/autoload/global.php

@@ -102,7 +102,7 @@
         ],
     ],
     'services' => [
-        'delegator_factories' => [
+        'delegators' => [
             'Mwop\Blog\DisplayPostMiddleware' => [
                 'Mwop\Blog\CachingDelegatorFactory',
             ],

src/Blog/CachingMiddleware.php

@@ -54,7 +54,7 @@ public function __invoke($req, $res, $next)
         }
 
         // Result represents an error response; cannot cache.
-        if (300 >= $result->getStatusCode()) {
+        if (300 <= $result->getStatusCode()) {
             return $result;
         }
 

src/CachePosts.php

@@ -11,7 +11,7 @@ class CachePosts
 {
     private $blogMiddleware;
 
-    public function __construct(Blog\Middleware $blog)
+    public function __construct(callable $blog)
     {
         $this->blogMiddleware = $blog;
     }
@@ -45,10 +45,9 @@ public function __invoke($route, $console)
             $console->write($message, Color::BLUE);
 
             $canonical = $baseUri->withPath(sprintf('/blog/%s.html', $entry->getId()));
-            $request   = new Request(new PsrRequest([], [], $canonical, 'GET'));
-
-            $uri = $canonical->withPath(sprintf('/%s.html', $entry->getId()));
-            $request = $request->withUri($uri);
+            $request   = (new Request(new PsrRequest([], [], $canonical, 'GET')))
+                ->withUri($canonical)
+                ->withAttribute('id', $entry->getId());
 
             $failed = false;
             $middleware($request, new Response(), $done);

src/Factory/CachePosts.php

@@ -7,6 +7,6 @@ class CachePosts
 {
     public function __invoke($services)
     {
-        return new Command($services->get('Mwop\Blog\Middleware'));
+        return new Command($services->get('Mwop\Blog\DisplayPostMiddleware'));
     }
 }