Fixed GH-12

Author: Rafael Grigorian

src/app/code/JetRails/Varnish/Console/Command/Purge/Url.php

@@ -5,6 +5,7 @@
 	use JetRails\Varnish\Console\Command\AbstractCommand;
 	use Symfony\Component\Console\Input\InputArgument;
 	use Symfony\Component\Console\Input\InputInterface;
+	use Symfony\Component\Console\Input\InputOption;
 
 	/**
 	 * Url.php - This class inherits from the AbstractCommand.  This command takes in a url and asks
@@ -35,7 +36,8 @@ protected function configure () {
 			// Register the command and set the arguments
 			$this->setName ("varnish:purge:url")
 			->setDescription ("Purge specific url from varnish cache")
-			->addArgument ( "url", InputArgument::REQUIRED, "What URL do you want to purge?" );
+			->addArgument ( "url", InputArgument::REQUIRED, "What URL do you want to purge?" )
+			->addOption ( "substring", null, InputOption::VALUE_NONE, "Purge all URLs that contain the given URL" );
 		}
 
 		/**
@@ -51,12 +53,14 @@ protected function runCommand ( InputInterface $input ) {
 			$url = $this->_purger->validateUrl ( $url );
 			// If an object was returned, then it was a valid url
 			if ( gettype ( $url ) == "object" ) {
+				// Check to see if purge type is substring
+				$purgeType = $input->getOption ("substring") ? "purgeStore" : "purgeUrl";
 				// Initialize the accounting variables and payload array
 				$total = 0;
 				$success = 0;
 				$payload = [];
 				// Ask to purge and iterate over responses
-				foreach ( $this->_purger->purgeUrl ( $url ) as $response ) {
+				foreach ( $this->_purger->{ $purgeType } ( $url ) as $response ) {
 					// Log what we are trying to do
 					$message = [
 						"status" => $response->status,
@@ -96,4 +100,4 @@ protected function runCommand ( InputInterface $input ) {
 			return [ "status" => false, "message" => $url ];
 		}
 
-	}
+	}

src/app/code/JetRails/Varnish/Controller/Adminhtml/Purge/Url.php

@@ -66,10 +66,12 @@ public function execute () {
 				// Load passed url parameter and validate it
 				$url = $this->getRequest ()->getParam ("url");
 				$url = $this->_purger->validateUrl ( $url );
+				// Set they purge type based on passed value
+				$isSubString = $this->getRequest ()->getParam ("type") === "substring";
 				// If an object was returned, then it was a valid url
 				if ( gettype ( $url ) == "object" ) {
 					// Ask to purge and iterate over responses
-					foreach ( $this->_purger->purgeUrl ( $url ) as $response ) {
+					foreach ( $this->_purger->{ $isSubString ? "purgeStore" : "purgeUrl" } ( $url ) as $response ) {
 						// Log what we are trying to do
 						$message = [
 							"status" => $response->status,
@@ -111,4 +113,4 @@ public function execute () {
 			return $redirect->setPath ("adminhtml/cache/index");
 		}
 
-	}
+	}

src/app/code/JetRails/Varnish/view/adminhtml/templates/adminhtml/cache/index/cache_management.phtml

@@ -12,6 +12,11 @@
 		<span>Purge By URL:</span>
 		<input type="text" placeholder="URL" name="url" />
 		<button type="submit" ><span>Purge</span></button>
+		<br>
+		<select name="type" class="admin__control-select add-left-space" >
+			<option value="exact" selected="selected" >Exact Match</option>
+			<option value="substring" >Sub-String</option>
+		</select>
 	</form>
 	<form method="post" action="<?= $block->getUrl ('varnish/purge/store') ?>" >
 		<span>Purge By Store:</span>
@@ -26,4 +31,4 @@
 		<span style="margin-right: 324px;" >Purge All:</span>
 		<button type="submit" ><span>Purge</span></button>
 	</form>
-</div>
+</div>

src/app/code/JetRails/Varnish/view/adminhtml/web/css/cache_management.css

@@ -1,27 +1,32 @@
 div.varnish-cache-management {
-	padding-bottom:                                                             15px;
+	padding-bottom: 15px;
 }
 
 div.varnish-cache-management > form {
-	margin-bottom:                                                              10px;
+	margin-bottom: 10px;
 }
 
 div.varnish-cache-management > form > span {
-	position:                                                                   relative;
-	display:                                                                    inline;
-	float:                                                                      left;
-	width:                                                                      125px;
-	line-height:                                                                33px;
-	margin:                                                                     0;
+	position: relative;
+	display: inline;
+	float: left;
+	width: 125px;
+	line-height: 33px;
+	margin: 0;
 }
 
 div.varnish-cache-management > form > input[type=text] {
-	min-width:                                                                  300px;
-	margin-right:                                                               20px;
-	padding:                                                                    5px 10px;
+	min-width: 300px;
+	margin-right: 20px;
+	padding: 5px 10px;
+}
+
+div.varnish-cache-management > form > select.add-left-space {
+	margin-left: 125px;
+	margin-top: 10px;
 }
 
 div.varnish-cache-management > form > select {
-	min-width:                                                                  300px;
-	margin-right:                                                               20px;
-}
+	min-width: 300px;
+	margin-right: 20px;
+}