more updates for the reporting - export functionality complete. There…

…'s a sample HTML template in there.
enygma · Nov 16, 2010 · 2cc8c01 · 2cc8c01
1 parent f42f0aa
commit 2cc8c01
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 29 deletions.
diff --git a/frisk b/frisk
@@ -30,6 +30,7 @@ set_include_path(get_include_path().
 	PATH_SEPARATOR.__DIR__.'/lib/Exceptions');
 
 HelperArguments::execute($_SERVER['argv']);
+HelperConfig::setConfigValue('basedir',__DIR__);
 
 // See if they just need help
 if(HelperArguments::getArgument('help')){

diff --git a/inc/report_templates/HtmlTemplate.txt b/inc/report_templates/HtmlTemplate.txt
@@ -8,6 +8,7 @@
 <body>
 <table cellpadding="3" cellspacing="0" border="1">
 
+[report_table_body]
 
 </table>
 </body>

diff --git a/lib/Helper/HelperReporting.php b/lib/Helper/HelperReporting.php
@@ -9,6 +9,9 @@
 class HelperReporting extends Helper
 {
 
+	private static $reportTemplateDir 	= '';
+	private static $reportExportDir		= '';
+
 	/**
 	 * Local container for testing results
 	 */
@@ -23,11 +26,22 @@ class HelperReporting extends Helper
 	 */
 	public function execute($testingResults,$outputType = 'html')
 	{
-		self::$testingResults=$testingResults;
+		self::$reportTemplateDir 	= HelperConfig::getConfigValue('basedir').'/inc/report_templates';
+		self::$reportExportDir 		= Helperconfig::getConfigValue('basedir').'/inc/report_export';
+		self::$testingResults		= $testingResults;
+
+		// Be sure the directories exist!
+		if(!is_dir(self::$reportTemplateDir)){
+			throw new Exception('Report template directory does not exist! ('.self::$reportTemplateDir.')');
+		}
+		if(!is_dir(self::$reportExportDir)){
+			throw new Exception('Report export directory does not exist! ('.self::$reportExportDir.')');
+		}
 
 		$methodName = 'report'.ucwords(strtolower($outputType));
 		if(method_exists(__CLASS__,$methodName)){
-			self::$methodName($testingResults);
+			$reportData = self::$methodName($testingResults);
+			self::exportReport($reportData,$outputType);
 		}else{
 			throw new Exception(ucwords(strtolower($outputType)).' reporting not allowed.');
 		}
@@ -41,8 +55,8 @@ public function execute($testingResults,$outputType = 'html')
 	 */
 	public function loadReportTemplate($reportType = 'html')
 	{
-		$reportData = '';
+		$filePath = self::$reportTemplateDir.'/'.ucwords(strtolower($reportType)).'Template.txt';
-		return $reportData;	
+		return (is_file($filePath)) ? file_get_contents($filePath) : null;
 	}
 
 	/**
@@ -52,10 +66,28 @@ public function loadReportTemplate($reportType = 'html')
 	 * @param array $reportData Test run results
 	 * @return templated results
 	 */
-	public function applyReportTemplate($reportType = 'html')
+	public function applyReportTemplate($reportType = 'html',$reportData)
 	{
 		$template = self::loadReportTemplate($reportType);
-		return null;
+		$replaceKeys = array_keys($reportData);
+		foreach($replaceKeys as $index => $key){
+			$replaceKeys[$index]='['.$key.']';	
+		}
+		$template = str_replace($replaceKeys,array_values($reportData),$template);
+
+		return $template;
+	}
+
+	/**
+	 * Export report data to the export directory by: date.type_ext
+	 *
+	 * @param string $reportData string of data resulting from applyTemplate
+	 * @return void
+	 */
+	public function exportReport($reportData,$outputType)
+	{
+		$filePath = self::$reportExportDir.'/'.date('YmdHis').'.'.strtolower($outputType);
+		file_put_contents($filePath,$reportData);
 	}
 
 	/**
@@ -68,19 +100,7 @@ public function applyReportTemplate($reportType = 'html')
 	 */
 	public function reportHtml($results)
 	{
-		// conver this over with the two methods above
+		$html='';
-		$html=sprintf('
-			<html>
-			<head>
-				<style>
-				span.pass { background-color: #08DD08; }
-				span.fail { background-color: #BB1111; }
-				</style>
-			</head>
-			<body>
-			<table cellpadding="3" cellspacing="0" border="1">
-		');
-		// output the results in a single HTML file
 		foreach($results as $testName => $tests){
 			$html.='<tr><td colspan="">'.$testName.'</tr>'."\n";
 			foreach($tests as $methodName => $methods){
@@ -94,16 +114,8 @@ public function reportHtml($results)
 				}
 			}
 		}
-
+		$templateData = array('report_table_body'=>$html);
-		$html.=sprintf('
+		return self::applyReportTemplate('html',$templateData);
-			</table>
-			</body>
-			</html>
-		');
-
-		echo $html;
-
-		return $html;
 	}
 }