Merge branch 'master' of https://github.com/ublaboo/datagrid-nette-database-data-source

# Conflicts:
#	composer.json

Author: paveljanda

composer.json

@@ -26,7 +26,7 @@
 	},
 	"require": {
 		"nette/application" : "^2.3|^2.4",
-		"ublaboo/datagrid" : "~2.3|~3.0",
+		"ublaboo/datagrid" : "~2.3|~3.0|~4.0",
 		"nette/database" : "^2.3|^2.4",
 		"nette/caching" : "^2.3|^2.4",
 		"greenlion/php-sql-parser" : "~4.0"

tests/Cases/NetteDatabaseDataSourceTest.phpt

@@ -16,8 +16,11 @@ use Ublaboo\DataGrid\Filter\FilterText;
 use Ublaboo\DataGrid\Filter\FilterDate;
 use Ublaboo\DataGrid\Filter\FilterDateRange;
 use Ublaboo\DataGrid\Filter\FilterRange;
+use Ublaboo;
 
 require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../Files/XTestingDataGridFactory.php';
+require __DIR__ . '/../Files/XTestingPresenter.php';
 
 final class NetteDatabaseDataSourceTest extends TestCase
 {
@@ -27,13 +30,21 @@ final class NetteDatabaseDataSourceTest extends TestCase
 	 */
 	private $db;
 
+	/**
+	 * @var Ublaboo\DataGrid\DataGrid
+	 */
+	private $grid;
+
 
 	public function setUp()
 	{
 		$connection = new Connection('.', NULL, NULL, ['lazy' => TRUE]);
 
 		$structure = new Structure($connection, new DevNullStorage);
 		$this->db = new Context($connection, $structure);
+
+		$factory = new Ublaboo\DataGrid\Tests\Files\XTestingDataGridFactory;
+		$this->grid = $factory->createXTestingDataGrid();
 	}
 
 
@@ -64,7 +75,7 @@ final class NetteDatabaseDataSourceTest extends TestCase
 	public function testApplyFilterSelect()
 	{
 		$s = new NetteDatabaseDataSource($this->db, 'SELECT * FROM user');
-		$filter = new FilterSelect('status', 'Status', [1 => 'Online', 0 => 'Offline'], 'user.status');
+		$filter = new FilterSelect($this->grid, 'status', 'Status', [1 => 'Online', 0 => 'Offline'], 'user.status');
 		$filter->setValue(1);
 
 		$s->applyFilterSelect($filter);
@@ -90,19 +101,19 @@ final class NetteDatabaseDataSourceTest extends TestCase
 
 		$s = new NetteDatabaseDataSource($this->db, $q, [3, 4]);
 
-		$filter1 = new FilterSelect('status', 'Status', [1 => 'Online', 0 => 'Offline'], 'user.status');
+		$filter1 = new FilterSelect($this->grid, 'status', 'Status', [1 => 'Online', 0 => 'Offline'], 'user.status');
 		$filter1->setValue(1);
 
-		$filter2 = new FilterText('name', 'Name or id', ['name', 'id']);
+		$filter2 = new FilterText($this->grid, 'name', 'Name or id', ['name', 'id']);
 		$filter2->setValue('text');
 
-		$filter3 = new FilterRange('range', 'Range', 'id', 'To');
+		$filter3 = new FilterRange($this->grid, 'range', 'Range', 'id', 'To');
 		$filter3->setValue(['from' => 2, 'to' => NULL]);
 
-		$filter4 = new FilterDateRange('date range', 'Date Range', 'created', '-');
+		$filter4 = new FilterDateRange($this->grid, 'date range', 'Date Range', 'created', '-');
 		$filter4->setValue(['from' => '1. 2. 2003', 'to' => '3. 12. 2149']);
 
-		$filter5 = new FilterDate('date', 'Date', 'date');
+		$filter5 = new FilterDate($this->grid, 'date', 'Date', 'date');
 		$filter5->setValue('12. 12. 2012');
 
 		$s->applyFilterSelect($filter1);

tests/Files/ExportTestingPresenter.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Ublaboo\DataGrid\Tests\Files;
+
+use Nette;
+use Ublaboo\DataGrid\DataGrid;
+
+final class ExportTestingPresenter extends Nette\Application\UI\Presenter
+{
+
+	protected function createComponentGrid($name)
+	{
+		$grid = new DataGrid(NULL, $name);
+		$grid->addExportCsv('export', 'export.csv');
+
+		return $grid;
+	}
+
+}

tests/Files/XTestingDataGridFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Ublaboo\DataGrid\Tests\Files;
+
+use Nette\Http,
+	Nette;
+
+class XTestingDataGridFactory
+{
+
+	public function createXTestingDataGrid($presenterName = 'XTesting')
+	{
+		$presenterFactory = new Nette\Application\PresenterFactory;
+		$presenterFactory->setMapping(['*' => 'Ublaboo\DataGrid\Tests\Files\*Presenter']);
+
+		$presenter = $presenterFactory->createPresenter($presenterName);
+
+		$url = new Http\UrlScript('localhost');
+		$request = new Http\Request($url);
+		$response = new Http\Response;
+		$session = new Http\Session($request, $response);
+
+		$presenter->injectPrimary(NULL, NULL, NULL, $request, $response, $session);
+
+		return $presenter->getComponent('grid');
+	}
+
+}

tests/Files/XTestingPresenter.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Ublaboo\DataGrid\Tests\Files;
+
+use Nette;
+use Ublaboo\DataGrid\DataGrid;
+
+final class XTestingPresenter extends Nette\Application\UI\Presenter
+{
+
+	/**
+	 * @var bool
+	 */
+	public $action_handeled = FALSE;
+
+
+	public function handleDoStuff($id)
+	{
+		$this->action_handeled = TRUE;
+	}
+
+
+	public function link($destination, $args = array())
+	{
+		return $destination . '?' . http_build_query($args);
+	}
+
+
+	protected function createRequest($component, $destination, array $args, $mode)
+	{
+		return ucFirst($component->getName()) . $this->link($destination, $args);
+	}
+
+	protected function createComponentGrid($name)
+	{
+		return new DataGrid($this, $name);
+	}
+
+}