Improve renderer

Author: Habib Nurrahman

README.md

@@ -16,38 +16,65 @@ composer require nurmanhabib/navigator
 
 #### Penggunaan
 
-1. Cukup membuat _object_ `NavCollection` dengan menambahkan beberapa `NavItem`
-
-   ```php
-   $menu = new NavCollection;
-   $menu->addHome();
-   $menu->addLink('Berita', 'berita');
-   $menu->addSeparator();
-   $menu->addParent('Kategori', function (NavCollection $menu) {
-     $menu->addLink('Teknologi', 'kategori/teknologi');
-     $menu->addLink('Otomotif', 'kategori/otomotif');
-     $menu->addParent('Lifestyle', function (NavCollection $menu) {
-       $menu->addLink('Pria', 'lifestyle-pria');
-       $menu->addLink('Wanita', 'lifestyle-wanita');
-     });
-   });
-   ```
-
-2. Selanjutnya membuat object `Navigator`
-
-   ```php
-   $navigator = new Navigator($menu);
-   ```
-
-3. Set NavItem yang aktif berdasarkan url
-
-   ```php
-   $navigator->setActive('lifestyle-wanita');
-   ```
-
-4. Render Navigator
-
-   ```php
-   return $navigator->render();
-   ```
-
+Cukup membuat _object_ `Nurmanhabib\Navigator\NavCollection` dengan menambahkan beberapa `Nurmanhabib\Navigator\NavItem`
+
+```php
+use Nurmanhabib\Navigator\NavCollection;
+use Nurmanhabib\Navigator\Navigator;
+
+$menu = new NavCollection;
+$menu->addHome();
+$menu->addLink('Berita', '/berita')->match('berita*');
+$menu->addSeparator();
+$menu->addParent('Kategori', function (NavCollection $menu) {
+    $menu->addLink('Teknologi', '/kategori/teknologi');
+    $menu->addLink('Otomotif', '/kategori/otomotif');
+    $menu->addParent('Lifestyle', function (NavCollection $menu) {
+        $menu->addLink('Pria', '/lifestyle-pria');
+        $menu->addLink('Wanita', '/lifestyle-wanita');
+    });
+});
+
+$menu->addHeading('Configuration');
+$menu->addLink('Application', '/config/app');
+
+$menu->addHeading('Account');
+$menu->addLink('My Profile', '/profile');
+$menu->addLink('Logout', '/logout');
+
+$navigator = new Navigator($menu);
+
+echo $navigator->render();
+```
+   
+#### API
+
+1. match
+
+    ```php
+    $menu->addLink('Teknologi', 'kategori/teknologi')->match('kategori/*');
+    ```
+   
+   Item akan aktif untuk path uri berikut:
+   
+    - `kategori/teknologi`    
+    - `kategori/otomotif`
+    
+2. setData
+
+    ```php
+    $menu->addLink('Teknologi', 'kategori/teknologi')->setData(['key' => 'value']);
+    ```
+   
+   Anda bisa menambahkan data pada item menu untuk digunakan pada saat custom render.
+   
+ 3. hasData
+    ```php
+    $item->hasData('key');
+    ```
+   
+ 4. getData
+    ```php
+    echo $item->getData('key');
+    ```
+   

src/Activators/LinkActivator.php

@@ -7,23 +7,46 @@
 
 class LinkActivator extends NavActivator
 {
-    protected $url;
+    protected $uri;
 
     /**
      * LinkActivator constructor.
-     * @param $url
+     * @param $uri
      */
-    public function __construct($url)
+    public function __construct($uri)
     {
-        $this->url = $url;
+        $this->uri = $uri;
     }
 
     public function isActive(Nav $nav)
     {
-        if ($nav instanceof NavModifier) {
-            return $nav->getOriginalNav()->getUrl() === $this->url;
-        }
+        return $this->matchPath($nav) && $this->matchQuery($nav) && $this->matchFragment($nav);
+    }
+
+    protected function matchPath(Nav $nav)
+    {
+        $pathPattern = ltrim(parse_url($this->uri, PHP_URL_PATH), '/');
+        $navPath = ltrim(parse_url($nav->getPattern(), PHP_URL_PATH), '/');
+
+        return fnmatch($pathPattern, $navPath) || fnmatch($navPath, $pathPattern);
+    }
+
+    protected function matchQuery(Nav $nav)
+    {
+        $expectedQuery = parse_url($this->uri, PHP_URL_QUERY);
+        $navQuery = parse_url($nav->getPattern(), PHP_URL_QUERY);
+
+        parse_str($expectedQuery, $expectedQuery);
+        parse_str($navQuery, $navQuery);
+
+        return empty(array_diff($expectedQuery, $navQuery));
+    }
+
+    protected function matchFragment(Nav $nav)
+    {
+        $expectedFragment = parse_url($this->uri, PHP_URL_FRAGMENT);
+        $navFragment = parse_url($nav->getPattern(), PHP_URL_FRAGMENT);
 
-        return $nav->getUrl() === $this->url;
+        return $expectedFragment === $navFragment;
     }
 }

src/Activators/RequestActivator.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Nurmanhabib\Navigator\Activators;
+
+class RequestUriActivator extends LinkActivator
+{
+    public function __construct()
+    {
+        parent::__construct($_SERVER['REQUEST_URI']);
+    }
+}

src/Activators/RequestUriActivator.php

@@ -57,6 +57,11 @@ public function getChild();
      */
     public function setChild(NavCollection $child);
 
+    /**
+     * @return string
+     */
+    public function getPattern();
+
     /**
      * @param Nav $nav
      * @return Nav
@@ -82,6 +87,7 @@ public function setData(array $data);
     public function getData($key = null, $default = null);
 
     /**
+     * @param $key
      * @return array
      */
     public function hasData($key);
@@ -92,6 +98,7 @@ public function hasData($key);
     public function toArray();
 
     /**
+     * @param int $options
      * @return string
      */
     public function toJson($options = 0);

src/Items/Nav.php

@@ -13,6 +13,8 @@ abstract class NavItem implements Nav
 
     protected $visible = true;
 
+    protected $pattern;
+
     abstract public function getText();
 
     abstract public function getUrl();
@@ -75,6 +77,22 @@ public function add(Nav $item)
         throw new NavChildException($this);
     }
 
+    public function match($pattern)
+    {
+        $this->pattern = $pattern;
+
+        return $this;
+    }
+
+    public function getPattern()
+    {
+        if (empty($this->pattern)) {
+            $this->pattern = $this->getUrl();
+        }
+
+        return $this->pattern;
+    }
+
     public function toJson($options = 0)
     {
         return json_encode($this->toArray(), $options);

src/Items/NavItem.php

@@ -25,6 +25,13 @@ public function getUrl()
         return $this->url;
     }
 
+    public function setIcon($icon)
+    {
+        $this->icon = $icon;
+
+        return $this;
+    }
+
     public function getIcon()
     {
         return $this->icon;

src/Items/NavLink.php

@@ -54,6 +54,11 @@ public function add(Nav $nav)
         throw new NavChildException($this);
     }
 
+    public function getPattern()
+    {
+        return '';
+    }
+
     public function getType()
     {
         return 'separator';

src/Items/NavSeparator.php

@@ -92,6 +92,11 @@ public function getData($key = null, $default = null)
         return $this->nav->getData($key, $default);
     }
 
+    public function getPattern()
+    {
+        return $this->nav->getPattern();
+    }
+
     public function toArray()
     {
         return [