gordonbanderson / weboftalent-gridrows

tests/GridRowsExtensionTest.php

Doc Comments +4 added lines

@@ -92,6 +92,10 @@
     }
 
 
+    /**
+     * @param integer $maxWidth
+     * @param integer $amount
+     */
     private function checkGrid($grid, $maxWidth, $amount) {
     	$items = 0;
     	$rows = 0;

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
         $controller = new GridRowItemPageTO_Controller();
         $controller->setDataModel($page);
 
-        for ($columns=1; $columns < 15; $columns++) {
+        for ($columns = 1; $columns < 15; $columns++) {
         	$grid = $controller->SplitDataListIntoGridRows(
         		'GridRowItemsTHISMETHODDOESNOTEXIST', // method from model
 				$columns
@@ -44,7 +44,7 @@ 
         $controller = new GridRowItemPageTO_Controller();
         $controller->setDataModel($page);
 
-        for ($columns=1; $columns < 15; $columns++) {
+        for ($columns = 1; $columns < 15; $columns++) {
         	$grid = $controller->SplitDataListIntoGridRows(
         		'GridRowItems', // method from model
 				$columns
@@ -59,7 +59,7 @@ 
     	$page->doPublish();
         $controller = new GridRowItemPageTO_Controller();
         $controller->setDataModel($page);
-        for ($columns=1; $columns < 15; $columns++) {
+        for ($columns = 1; $columns < 15; $columns++) {
         	$grid = $controller->SplitDataListIntoGridRows(
         		'GridItems', // method from controller
 				$columns
@@ -78,14 +78,14 @@ 
     	$page->doPublish();
         $controller = new Page_Controller();
         $controller->setDataModel($page);
-        for ($columns=1; $columns < 15; $columns++) {
-        	for ($i=1; $i < 15; $i++) {
+        for ($columns = 1; $columns < 15; $columns++) {
+        	for ($i = 1; $i < 15; $i++) {
 	        	$grid = $controller->SplitClassNameDataListIntoGridRows(
 	        		'GridRowItemTO',
 					$columns,
 					$i,
 					$sort = 'LastEdited DESC');
-	        	$amount = $i > 12 ? 12: $i;
+	        	$amount = $i > 12 ? 12 : $i;
 	        	$this->checkGrid($grid, $columns, $amount);
 	        }
         }

Indentation +71 added lines, -71 removed lines

@@ -2,69 +2,69 @@ 
 
 class GridRowsExtensionTest extends FunctionalTest
 {
-	protected static $fixture_file = 'GridRowsExtensionTest.yml';
+  protected static $fixture_file = 'GridRowsExtensionTest.yml';
 
-	protected $extraDataObjects = array(
+  protected $extraDataObjects = array(
         'GridRowItemTO'
     );
 
     public function setUp() {
-    	$this->requiredExtensions = array(
-    		'GridRowItemTO' => array('GridRowsExtension')
-    	);
+      $this->requiredExtensions = array(
+        'GridRowItemTO' => array('GridRowsExtension')
+      );
 
-    	parent::setUp();
+      parent::setUp();
     }
 
 
     public function testSplitDataListMethodDoesNotExist()
     {
-    	$message = 'Method not found.  A grid cannot be formed from the method'
-    			 . ' GridRowItemsTHISMETHODDOESNOTEXIST';
-    	$this->setExpectedException('InvalidArgumentException', $message);
+      $message = 'Method not found.  A grid cannot be formed from the method'
+            . ' GridRowItemsTHISMETHODDOESNOTEXIST';
+      $this->setExpectedException('InvalidArgumentException', $message);
 
-    	$page = $this->objFromFixture('GridRowItemPageTO', 'page001');
-    	$page->doPublish();
+      $page = $this->objFromFixture('GridRowItemPageTO', 'page001');
+      $page->doPublish();
         $controller = new GridRowItemPageTO_Controller();
         $controller->setDataModel($page);
 
         for ($columns=1; $columns < 15; $columns++) {
-        	$grid = $controller->SplitDataListIntoGridRows(
-        		'GridRowItemsTHISMETHODDOESNOTEXIST', // method from model
-				$columns
-			);
-        	$this->checkGrid($grid, $columns, 10);
+          $grid = $controller->SplitDataListIntoGridRows(
+            'GridRowItemsTHISMETHODDOESNOTEXIST', // method from model
+        $columns
+      );
+          $this->checkGrid($grid, $columns, 10);
         }
     }
 
-	public function testSplitDataListFromModelIntoGridRows()
+  public function testSplitDataListFromModelIntoGridRows()
     {
-    	$page = $this->objFromFixture('GridRowItemPageTO', 'page001');
-    	$page->doPublish();
+      $page = $this->objFromFixture('GridRowItemPageTO', 'page001');
+      $page->doPublish();
         $controller = new GridRowItemPageTO_Controller();
         $controller->setDataModel($page);
 
         for ($columns=1; $columns < 15; $columns++) {
-        	$grid = $controller->SplitDataListIntoGridRows(
-        		'GridRowItems', // method from model
-				$columns
-			);
-        	$this->checkGrid($grid, $columns, 10);
+          $grid = $controller->SplitDataListIntoGridRows(
+            'GridRowItems', // method from model
+        $columns
+      );
+          $this->checkGrid($grid, $columns, 10);
         }
     }
 
     public function testSplitDataListFromControllerIntoGridRows()
     {
-    	$page = $this->objFromFixture('GridRowItemPageTO', 'page001');
-    	$page->doPublish();
+      $page = $this->objFromFixture('GridRowItemPageTO', 'page001');
+      $page->doPublish();
         $controller = new GridRowItemPageTO_Controller();
         $controller->setDataModel($page);
         for ($columns=1; $columns < 15; $columns++) {
-        	$grid = $controller->SplitDataListIntoGridRows(
-        		'GridItems', // method from controller
-				$columns
-			);
-        	$this->checkGrid($grid, $columns, 10);
+          $grid = $controller->SplitDataListIntoGridRows(
+            'GridItems', // method from controller
+        $columns
+      );
+          $this->checkGrid($grid, $columns, 10);
         }
     }
 
@@ -74,67 +74,67 @@ 
      */
     public function testSplitClassNameDataListIntoGridRows()
     {
-    	$page = $this->objFromFixture('GridRowItemPageTO', 'page001');
-    	$page->doPublish();
+      $page = $this->objFromFixture('GridRowItemPageTO', 'page001');
+      $page->doPublish();
         $controller = new Page_Controller();
         $controller->setDataModel($page);
         for ($columns=1; $columns < 15; $columns++) {
-        	for ($i=1; $i < 15; $i++) {
-	        	$grid = $controller->SplitClassNameDataListIntoGridRows(
-	        		'GridRowItemTO',
-					$columns,
-					$i,
-					$sort = 'LastEdited DESC');
-	        	$amount = $i > 12 ? 12: $i;
-	        	$this->checkGrid($grid, $columns, $amount);
-	        }
+          for ($i=1; $i < 15; $i++) {
+            $grid = $controller->SplitClassNameDataListIntoGridRows(
+              'GridRowItemTO',
+          $columns,
+          $i,
+          $sort = 'LastEdited DESC');
+            $amount = $i > 12 ? 12: $i;
+            $this->checkGrid($grid, $columns, $amount);
+          }
         }
     }
 
 
     private function checkGrid($grid, $maxWidth, $amount) {
-    	$items = 0;
-    	$rows = 0;
-    	$widths = array();
-    	foreach ($grid->getIterator() as $row) {
-    		$rows++;
-    		$width = 0;
-    		foreach ($row->Columns->getIterator() as $column) {
-    			$items++;
-    			$width++;
-    		}
-    		array_push($widths, $width);
-    	}
-
-    	// last value will be <= max width
-    	$lastVal = array_pop($widths);
-		$this->assertLessThanOrEqual($maxWidth, $lastVal);
-
-    	// All but the last row should equal the expected width, $maxWidth
-    	foreach ($widths as $width) {
-    		$this->assertEquals($maxWidth, $width);
-    	}
-    	$this->assertEquals($amount, $items);
+      $items = 0;
+      $rows = 0;
+      $widths = array();
+      foreach ($grid->getIterator() as $row) {
+        $rows++;
+        $width = 0;
+        foreach ($row->Columns->getIterator() as $column) {
+          $items++;
+          $width++;
+        }
+        array_push($widths, $width);
+      }
+
+      // last value will be <= max width
+      $lastVal = array_pop($widths);
+    $this->assertLessThanOrEqual($maxWidth, $lastVal);
+
+      // All but the last row should equal the expected width, $maxWidth
+      foreach ($widths as $width) {
+        $this->assertEquals($maxWidth, $width);
+      }
+      $this->assertEquals($amount, $items);
     }
 }
 
 
 class GridRowItemTO extends DataObject implements TestOnly {
-	private static $db = array('Name' => 'Varchar');
+  private static $db = array('Name' => 'Varchar');
 
-	private static $has_one = array('GridRowItemPage' => 'GridRowItemPageTO');
+  private static $has_one = array('GridRowItemPage' => 'GridRowItemPageTO');
 }
 
 class GridRowItemPageTO extends Page implements TestOnly {
-	private static $has_many = array('GridRowItems' => 'GridRowItemTO');
+  private static $has_many = array('GridRowItems' => 'GridRowItemTO');
 }
 
 class GridRowItemPageTO_Controller extends Page_Controller implements TestOnly {
 
-	/*
+  /*
 	This is a test method on the *controller*
 	 */
-	public function GridItems() {
-		return $this->model->GridRowItems();
-	}
+  public function GridItems() {
+    return $this->model->GridRowItems();
+  }
 }

code/GridRowsExtension.php

Indentation +54 added lines, -54 removed lines

@@ -5,7 +5,7 @@ 
  */
 class GridRowsExtension extends DataExtension
 {
-	/*
+  /*
 	If you are laying out using some form of grid, e.g. HTML table (ugh) or
 	bootstraps span classes it is useful to have the DataList split by row.
 	Here the DataList is generated from a method accessible to the current
@@ -14,33 +14,33 @@ 
 	See README.md for a worked example
 
 	*/
-	public function SplitDataListIntoGridRows($itemsInGridMethod, $numberOfCols)
-	{
-		$methodFound = false;
+  public function SplitDataListIntoGridRows($itemsInGridMethod, $numberOfCols)
+  {
+    $methodFound = false;
 
-		$itemsInGrid = null;
+    $itemsInGrid = null;
 
-		// Check first the controller and then the model for the method to call
-		if ($this->owner->hasMethod($itemsInGridMethod)) {
-			$itemsInGrid = $this->owner->$itemsInGridMethod();
-			$methodFound = true;
-		}
+    // Check first the controller and then the model for the method to call
+    if ($this->owner->hasMethod($itemsInGridMethod)) {
+      $itemsInGrid = $this->owner->$itemsInGridMethod();
+      $methodFound = true;
+    }
 
-		if (!$methodFound && $this->owner->model->hasMethod($itemsInGridMethod)) {
-			$itemsInGrid = $this->owner->model->$itemsInGridMethod();
-			$methodFound = true;
-		}
+    if (!$methodFound && $this->owner->model->hasMethod($itemsInGridMethod)) {
+      $itemsInGrid = $this->owner->model->$itemsInGridMethod();
+      $methodFound = true;
+    }
 
-		if ($itemsInGrid == null) {
-			$message = 'Method not found.  A grid cannot be formed from the '
-					 . 'method ' . $itemsInGridMethod;
-			throw new InvalidArgumentException($message);
-		}
+    if ($itemsInGrid == null) {
+      $message = 'Method not found.  A grid cannot be formed from the '
+            . 'method ' . $itemsInGridMethod;
+      throw new InvalidArgumentException($message);
+    }
 
-		return $this->createGrid($itemsInGrid, $numberOfCols);
-	}
+    return $this->createGrid($itemsInGrid, $numberOfCols);
+  }
 
-	/*
+  /*
 	If you are laying out using some form of grid, e.g. HTML table (ugh) or
 	bootstraps span classes it is useful to have the DataList split by row.
 	This is what this method does.
@@ -48,40 +48,40 @@ 
 	See USAGE.md for a worked example
 
 	*/
-	public function SplitClassNameDataListIntoGridRows(
-		$className, $numberOfCols, $limit = 10, $sort = 'LastEdited DESC')
-	{
-		$clazz = Injector::inst()->create($className);
-		$itemsInGrid = $clazz->get()->limit($limit)->sort($sort);
-		return $this->createGrid($itemsInGrid, $numberOfCols);
-	}
+  public function SplitClassNameDataListIntoGridRows(
+    $className, $numberOfCols, $limit = 10, $sort = 'LastEdited DESC')
+  {
+    $clazz = Injector::inst()->create($className);
+    $itemsInGrid = $clazz->get()->limit($limit)->sort($sort);
+    return $this->createGrid($itemsInGrid, $numberOfCols);
+  }
 
-	/*
+  /*
 	The actual method that splits the DataList into an ArrayList of rows that
 	contain an ArrayList of Columns
 	*/
-	private function createGrid($itemsInGrid, $numberOfCols)
-	{
-		$position = 1;
-		$columns = new ArrayList();
-		$result = new ArrayList();
-		foreach ($itemsInGrid as $key => $item) {
-			$columns->push($item);
-			if (($position) >= $numberOfCols) {
-				$position = 1;
-				$row = new ArrayList();
-				$row->Columns = $columns;
-				$result->push($row);
-				$columns = new ArrayList();
-			} else {
-				$position = $position + 1;
-			}
-		}
-		if ($columns->Count() > 0) {
-			$row = new ArrayList();
-			$row->Columns = $columns;
-			$result->push($row);
-		}
-		return $result;
-	}
+  private function createGrid($itemsInGrid, $numberOfCols)
+  {
+    $position = 1;
+    $columns = new ArrayList();
+    $result = new ArrayList();
+    foreach ($itemsInGrid as $key => $item) {
+      $columns->push($item);
+      if (($position) >= $numberOfCols) {
+        $position = 1;
+        $row = new ArrayList();
+        $row->Columns = $columns;
+        $result->push($row);
+        $columns = new ArrayList();
+      } else {
+        $position = $position + 1;
+      }
+    }
+    if ($columns->Count() > 0) {
+      $row = new ArrayList();
+      $row->Columns = $columns;
+      $result->push($row);
+    }
+    return $result;
+  }
 }