v0.10.0: Bug fixes

CHANGELOG.md

@@ -1,21 +1,28 @@
+# v0.10.0
+## 3/11/2018
+
+1. [](#bugfix)
+    * Fixed bug in RollingCurl where `prunePendingRequestQueue` was limiting the generation count ([#24](https://github.com/barrymode/grav-plugin-blackhole/issues/24))
+    * Fixed bug with the simultaneous limit where manual entry was returning an error
+
 # v0.9.2
 ## 11/29/2017
 
 1. [](#new)
-    * Set how many files will be generated simultaneously.
+    * Set how many files will be generated simultaneously
 
 # v0.9.1
 ## 10/23/2017
 
 1. [](#bugfix)
-    * Fixed bug where only the home page was generated when -r wasn't set.
+    * Fixed bug where only the home page was generated when -r wasn't set
 
 # v0.9.0
 ## 10/23/2017
 
 1. [](#new)
-    * Force option allows for users to overwrite previously generated files.
-    * Routes option allows the user to choose which pages get generated.
+    * Force option allows for users to overwrite previously generated files
+    * Routes option allows the user to choose which pages get generated
 1. [](#improved)
     * Separate the admin plugin settings from the CLI
 
@@ -71,7 +78,7 @@
 ## 6/18/2017
 
 1. [](#new)
-    * Feature: only render pages that have changed/been modified. ([#12](https://github.com/barrymode/grav-plugin-blackhole/issues/12))
+    * Feature: only render pages that have changed/been modified ([#12](https://github.com/barrymode/grav-plugin-blackhole/issues/12))
 
 # v0.6.0
 ## 6/18/2017

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 BarryMode
+Copyright (c) 2018 BarryMode
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -57,7 +57,7 @@ bin/plugin blackhole generate http://localhost/grav
   ```
 
 - **Simultaneous Limit** `--simultaneous` or `-s`
-  Set how many files to generate at the same time (default: 10)
+  Set how many files to generate at the same time (default: 10, must be greater than 1)
 
   ```bash
   --simultaneous 10

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Blackhole
-version: 0.9.2
+version: 0.10.0
 description: Static site generator for Grav
 icon: circle
 author:

cli/GenerateCommand.php

@@ -121,7 +121,7 @@ function generate($bh_route, $bh_file_path, $grav_page_data) {
         $request->bh_file_path = preg_replace('/\/\/+/', '/', $request->bh_route . '/index.html');
         $request->input_url = $input_url;
         $request->output_url = $output_url;
-        $request->simultaneous = $simultaneous;
+        $request->simultaneous = (int)$simultaneous;
         $request->force = $force;
         $rollingCurl->add($request);
       }

vendor/RollingCurl/RollingCurl.php

@@ -345,8 +345,8 @@ private function prepareRequestOptions(Request $request)
     }
 
     /**
-     * Define a callable to handle the response. 
-     * 
+     * Define a callable to handle the response.
+     *
      * It can be an anonymous function:
      *
      *     $rc = new RollingCurl();
@@ -365,7 +365,7 @@ private function prepareRequestOptions(Request $request)
      *         // Cannot be private or protected
      *         public function callback($request, $rolling_curl) {
      *             // process
-     *         } 
+     *         }
      *     }
      *
      * The called code should expect two parameters: \RollingCurl\Request $request, \RollingCurl\RollingCurl $rollingCurl
@@ -538,7 +538,8 @@ public function getCompletedRequests()
     private function getNextPendingRequests($limit = 1)
     {
         $requests = array();
-        while ($limit--) {
+        $countPending = $limit <= 0 ? $this->countPending() : $limit;
+        while ($countPending--) {
             if (!isset($this->pendingRequests[$this->pendingRequestsPosition])) {
                 break;
             }