Fixed GH-15

Author: Rafael Grigorian

src/app/code/JetRails/Varnish/Observer/AutoPurge.php

@@ -32,12 +32,14 @@ abstract class AutoPurge implements ObserverInterface {
 		 * @var         ManagerInterface    _messageManager     Instance of the ManagerInterface
 		 * @var         Purger              _purger             Instance of the Purger helper class
 		 * @var         StoreManager        _storeManager       Instance of the StoreManager
+		 * @var         Array               _messages           Saved messages for dumping together
 		 */
 		protected $_data;
 		protected $_logger;
 		protected $_messageManager;
 		protected $_purger;
 		protected $_storeManager;
+		protected $_messages;
 
 		/**
 		 * This constructor is overloaded from the parent class in order to use dependency injection
@@ -61,6 +63,7 @@ public function __construct (
 			$this->_messageManager = $messageManager;
 			$this->_purger = $purger;
 			$this->_storeManager = $storeManager;
+			$this->_messages = [];
 		}
 
 		/**
@@ -98,7 +101,6 @@ protected function _purgeOnAllServers ( $target, $purgeChildren = false ) {
 			return $noErrors;
 		}
 
-
 		/**
 		 * This method takes in a route and it looks through the rewrites table for all urls that lead
 		 * to said url. It uses a passed store object to determine the base url to use.
@@ -121,14 +123,26 @@ protected function _purgeUsingStoreObject ( $route, $store ) {
 				$success &= $this->_purgeOnAllServers ( rtrim ( $target, "/" ) . "?", true );
 				if ( $success ) {
 					// Add success response message
-					$targetHtml = "<font color='#79A22E' ><b>$target</b></font>";
-					$serverHtml = "<font color='#79A22E' ><b>all varnish servers</b></font>";
-					$message = "Successfully purged varnish cache for $targetHtml on $serverHtml";
-					$this->_messageManager->addSuccess ( $message );
+					array_push ( $this->_messages, $target );
 				}
 			}
 		}
 
+		/**
+		 * This method takes in some header text and appends all the saved messages to it. It then
+		 * uses the message manager to send the message together.
+		 * @param       String              header              The header to append to the message\
+		 * @return      void
+		 */
+		protected function _dumpCombinedMessages ( $header ) {
+			if ( count ( $this->_messages ) > 0 ) {
+				$header = "<font color='#79A22E' ><b>$header</b></font>";
+				array_unshift ( $this->_messages, $header );
+				$this->_messageManager->addSuccess ( implode ( "</br>", $this->_messages ) );
+				$this->_messages = [];
+			}
+		}
+
 		/**
 		 * This method takes in a route and determines if the current scope is the "All Stores Scope".
 		 * If it is, then all store views are purged, otherwise just the current one is purged.

src/app/code/JetRails/Varnish/Observer/AutoPurge/Category.php

@@ -32,6 +32,7 @@ public function execute ( Observer $observer ) {
 				$cid = $observer->getCategory ()->getId ();
 				if ( $cid !== null ) {
 					$this->_purgeUsingRoute ("catalog/category/view/id/$cid");
+					$this->_dumpCombinedMessages ("Purged varnish cache on all configured servers:");
 				}
 			}
 		}

src/app/code/JetRails/Varnish/Observer/AutoPurge/Page.php

@@ -31,6 +31,7 @@ public function execute ( Observer $observer ) {
 				$pid = $observer->getPage ()->getId ();
 				if ( $pid !== null ) {
 					$this->_purgeUsingRoute ("cms/page/view/page_id/$pid");
+					$this->_dumpCombinedMessages ("Purged varnish cache on all configured servers:");
 				}
 			}
 		}

src/app/code/JetRails/Varnish/Observer/AutoPurge/Product.php

@@ -35,6 +35,7 @@ public function execute ( Observer $observer ) {
 					foreach ( $observer->getProduct ()->getCategoryIds () as $cid ) {
 						$this->_purgeUsingRoute ("catalog/category/view/id/$cid");
 					}
+					$this->_dumpCombinedMessages ("Purged varnish cache on all configured servers:");
 				}
 			}
 		}

src/app/code/JetRails/Varnish/etc/adminhtml/system.xml

@@ -28,6 +28,17 @@
 				showInStore="1" >
 				<label>General Configuration</label>
 				<attribute type="expanded" >1</attribute>
+				<field
+					id="version"
+					translate="label"
+					type="label"
+					sortOrder="0"
+					showInDefault="1"
+					showInWebsite="1"
+					showInStore="1" >
+					<label>Version</label>
+					<comment>Currently installed extension version</comment>
+				</field>
 				<field
 					id="status"
 					translate="label"

src/app/code/JetRails/Varnish/etc/config.xml

@@ -6,6 +6,7 @@
 	<default>
 		<jetrails_varnish>
 			<general_configuration>
+				<version>1.1.5</version>
 				<status>0</status>
 				<debug>0</debug>
 				<servers>127.0.0.1:80</servers>