Merge branch 'develop'

.gitignore

@@ -1,3 +1,3 @@
 .idea/
 vendor
-composer.lock
+composer.lock

.travis.yml

@@ -15,4 +15,4 @@ before_script:
   - composer self-update
   - composer install --no-interaction --prefer-source --dev
 
-script: VERBOSE=true sh ./tests/run-tests.sh -s tests/DKTests/
+script: VERBOSE=true sh ./tests/run-tests.sh -s tests/DKTests/

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 David Kudera
+Copyright (c) 2014 - 2015 David Kudera
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

README.md

@@ -93,6 +93,19 @@ class BasePresenter extends Nette\Application\UI\Presenter
 {control menu}
 ```
 
+## Render sitemap.xml 
+
+Router
+```
+$router[] = new Route('sitemap.xml', 'Homepage:sitemap');
+```
+
+Homepage/sitemap.latte
+```
+{extends none}
+{control menu:sitemapXml}
+```
+
 ## Authorization
 
 You can hide some links for example for users without specific role, guest users, actions in other module or when
@@ -122,6 +135,12 @@ menu:
 						allow:
 							parameters:
 								[allowed: maybe]
+					Authors:
+						target: Authors:default
+						allow:
+							acl:
+								resource: authors
+								permission: view #optional - 'view' is default permission
 ```
 
 or whole menu can be allowed for example just logged users:
@@ -336,6 +355,10 @@ class BookPresenter extends BasePresenter
 
 ## Changelog
 
+* 1.1.0
+	+ Support for ACL permissions (thanks [whipsterCZ](https://github.com/whipsterCZ))
+	+ Support for generating sitemap (thanks [whipsterCZ](https://github.com/whipsterCZ))
+
 * 1.0.4
 	+ Added `hasIcon` and `hasCounter` methods
 	+ Support for "absolute" targets [#6](https://github.com/sakren/nette-menu/issues/6)
@@ -351,4 +374,4 @@ class BookPresenter extends BasePresenter
 	+ Added support for translatable titles [#2](https://github.com/sakren/nette-menu/issues/2)
 
 * 1.0.0
-	+ First version
+	+ First version

src/DK/Menu/Container.php

@@ -130,4 +130,4 @@ public function getCurrentItem()
 		return null;
 	}
 
-} 
+}

src/DK/Menu/DI/Extension.php

@@ -38,6 +38,7 @@ class Extension extends CompilerExtension
 			'roles' => array(),
 			'module' => null,
 			'parameters' => array(),
+			'acl' => array(),
 		),
 		'items' => array(),
 	);
@@ -189,6 +190,16 @@ private static function addItemsToParent(Container $parent, array $items)
 			if (count($data['allow']['parameters']) > 0) {
 				$item->setAllowedForParameters($data['allow']['parameters']);
 			}
+
+			if (count($data['allow']['acl']) >0) {
+				if ( isset($data['allow']['acl']['resource']) ) {
+					$permission = null;
+					if ( isset($data['allow']['acl']['permission'])) {
+						$permission = $data['allow']['acl']['permission'];
+					}
+					$item->setAllowedForAcl($data['allow']['acl']['resource'], $permission);
+				}
+			}
 
 			if (count($data['items']) > 0) {
 				self::addItemsToParent($item, $data['items']);
@@ -207,4 +218,4 @@ public static function register(Configurator $configurator)
 		};
 	}
 
-} 
+}

src/DK/Menu/InvalidArgumentException.php

@@ -9,4 +9,4 @@
 class InvalidArgumentException extends \InvalidArgumentException
 {
 
-} 
+}

src/DK/Menu/Item.php

@@ -20,6 +20,8 @@ class Item extends Container
 
 	const ALLOWED_FOR_PARAMETERS = 'parameters';
 
+	const ALLOWED_FOR_ACL = 'acl';
+
 
 	/** @var \DK\Menu\Menu */
 	private $menu;
@@ -45,11 +47,13 @@ class Item extends Container
 	/** @var array  */
 	private $allowedFor = array(
 		self::ALLOWED_FOR_LOGGED_IN => null,
+		self::ALLOWED_FOR_ACL => array(),
 		self::ALLOWED_FOR_ROLES => array(),
 		self::ALLOWED_FOR_MODULE => null,
 		self::ALLOWED_FOR_PARAMETERS => array(),
 	);
-
+
+	private $defaultAclPermission = 'view';
 
 	/** @var bool */
 	private $allowed;
@@ -380,7 +384,7 @@ public function getLink()
 	public function hasAllowedForLoggedIn()
 	{
 		return $this->allowedFor[self::ALLOWED_FOR_LOGGED_IN] !== null;
-	}
+	}	
 
 
 	/**
@@ -430,7 +434,7 @@ public function setAllowedForRoles(array $roles)
 		$this->allowedFor[self::ALLOWED_FOR_ROLES] = $roles;
 		return $this;
 	}
-
+	
 
 	/**
 	 * @return bool
@@ -488,6 +492,54 @@ public function setAllowedForParameters(array $parameters)
 		$this->allowedFor[self::ALLOWED_FOR_PARAMETERS] = $parameters;
 		return $this;
 	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasAllowedForAcl()
+	{
+		return count($this->allowedFor[self::ALLOWED_FOR_ACL]) > 0;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getAllowedForAcl()
+	{
+		return $this->allowedFor[self::ALLOWED_FOR_ACL];
+	}
+
+
+	/**
+	 * @param string $resource
+	 * @param string $permission
+	 * @return \DK\Menu\Item
+	 */
+	public function setAllowedForAcl($resource, $permission = null)
+	{
+		$this->allowedFor[self::ALLOWED_FOR_ACL]['resource'] = $resource;
+		if ( $permission) {
+			$this->allowedFor[self::ALLOWED_FOR_ACL]['permission'] = $permission;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param array $acl
+	 * @return bool
+	 */
+	public function isAllowedForAcl($acl)
+	{
+		if (count($acl) === 0) {
+			return true;
+		}
+		$resource = $acl['resource'];
+		$permission = isset($acl['permission']) ? $acl['permission'] : $this->defaultAclPermission;
+		return $this->getMenu()->getUser()->isAllowed($resource, $permission);
+
+	}
 
 
 	/**
@@ -541,7 +593,7 @@ public function isAllowedForModule($module)
 
 		return mb_substr($name, 0, $pos) === ucfirst($module);
 	}
-
+	
 
 	/**
 	 * @param array $parameters
@@ -570,11 +622,12 @@ public function isAllowedForParameters(array $parameters)
 	public function isAllowed()
 	{
 		if ($this->allowed === null) {
-			if (!$this->hasAllowedForLoggedIn() && !$this->hasAllowedForRoles() && !$this->hasAllowedForModule() && !$this->hasAllowedForParameters()) {
+			if (!$this->hasAllowedForAcl() && !$this->hasAllowedForLoggedIn() && !$this->hasAllowedForRoles() && !$this->hasAllowedForModule() && !$this->hasAllowedForParameters()) {
 				return $this->allowed = true;
 			}
 
 			$this->allowed =
+				$this->isAllowedForAcl($this->getAllowedForAcl()) &&
 				$this->isAllowedForLoggedIn($this->getAllowedForLoggedIn()) &&
 				$this->isAllowedForRoles($this->getAllowedForRoles()) &&
 				(
@@ -636,4 +689,4 @@ public function isActive()
 		return $this->active;
 	}
 
-} 
+}

src/DK/Menu/Menu.php

@@ -146,4 +146,4 @@ public function getLastCurrentItem()
 		return $item === false ? null : $item;
 	}
 
-} 
+}

src/DK/Menu/UI/Control.php

@@ -13,13 +13,13 @@ class Control extends BaseControl
 {
 
 
-	/** @var \DK\Menu\Menu  */
+	/** @var \DK\Menu\Menu */
 	private $menu;
 
-	/** @var string  */
+	/** @var string */
 	private $menuTemplate;
 
-	/** @var string  */
+	/** @var string */
 	private $breadcrumbTemplate;
 
 
@@ -32,8 +32,8 @@ public function __construct(Menu $menu)
 
 		$this->menu = $menu;
 
-		$this->menuTemplate = __DIR__. '/menu.latte';
-		$this->breadcrumbTemplate = __DIR__. '/breadcrumb.latte';
+		$this->menuTemplate = __DIR__ . '/menu.latte';
+		$this->breadcrumbTemplate = __DIR__ . '/breadcrumb.latte';
 	}
 
 
@@ -101,4 +101,10 @@ public function renderBreadcrumb()
 		$this->template->render();
 	}
 
-} 
+	public function renderSitemapXml()
+	{
+		$this->template->setFile(__DIR__. '/sitemapXml.latte');
+		$this->template->menu = $this->menu;
+		$this->template->render();
+	}
+}

src/DK/Menu/UI/IControlFactory.php

@@ -15,4 +15,4 @@ interface IControlFactory
 	 */
 	public function create();
 
-} 
+}

src/DK/Menu/UI/breadcrumb.latte

@@ -1,3 +1,3 @@
 {foreach $menu->getPath() as $item}
 	<a href="{$item->getLink()}">{$item->getTranslatedTitle()}</a>{sep} / {/sep}
-{/foreach}
+{/foreach}

src/DK/Menu/UI/menu.latte

@@ -7,4 +7,4 @@
 		<a href="{$item->getLink()}" n:class="$item->isActive() ? active">{$item->getTranslatedTitle()}</a>
 		{include branch, menuParent => $item}
 	</li>
-</ul>
+</ul>

src/DK/Menu/UI/sitemapXml.latte

@@ -0,0 +1,25 @@
+{contentType text/xml}
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+
+
+	{if !isset($menuParent)}
+		{var $menuParent = $menu}
+	{/if}
+	{var $priority = 1}
+
+	{block branch}
+
+	{if $menuParent->hasVisualItems()}
+		{foreach $menuParent->getItems() as $item}
+			<url n:if="$item->isVisual() && $item->isAllowed()">
+				<loc>{$baseUri}{$item->getLink()}</loc>
+				<priority>{$priority}</priority>
+			</url>
+			{include branch, menuParent => $item, priority => $priority - 0.1}	  
+		{/foreach}
+	{/if}
+
+	{/block}
+
+</urlset> 

tests/DKTests/.gitignore

@@ -1,3 +1,3 @@
 coverage.dat
 *.actual
-*.expected
+*.expected

tests/DKTests/Menu/Extension.phpt

@@ -129,4 +129,4 @@ interface ICustomControlFactory
 }
 
 
-\run(new ExtensionTest);
+\run(new ExtensionTest);

tests/DKTests/Menu/Menu.phpt

@@ -415,4 +415,4 @@ class Translator implements ITranslator
 }
 
 
-\run(new MenuTest);
+\run(new MenuTest);

tests/DKTests/Menu/MockUserStorage.php

@@ -71,4 +71,4 @@ function getLogoutReason()
 
 	}
 
-}
+}

tests/DKTests/app/BooksModule/presenters/HomepagePresenter.php

@@ -13,4 +13,4 @@
 class HomepagePresenter extends BasePresenter
 {
 
-} 
+}

tests/DKTests/app/BooksModule/templates/Homepage/default.latte

@@ -1 +1 @@
-{layout ../../../templates/@layout.latte}
+{layout ../../../templates/@layout.latte}

tests/DKTests/app/config/config.neon

@@ -25,4 +25,4 @@ services:
 	router:
 		class: Nette\Application\Routers\RouteList
 		setup:
-			- '$service[] = ?'(Nette\Application\Routers\Route('<presenter>/<action>[/<id>]', 'Homepage:default'))
+			- '$service[] = ?'(Nette\Application\Routers\Route('<presenter>/<action>[/<id>]', 'Homepage:default'))

tests/DKTests/app/config/customControl.neon

@@ -2,4 +2,4 @@ menu:
 
 	default:
 		controlClass: DKTests\Menu\CustomControl
-		controlInterface: DKTests\Menu\ICustomControlFactory
+		controlInterface: DKTests\Menu\ICustomControlFactory