Merge pull request #9 from nurmanhabib/feature/exact-pattern

Added method matchExact() for pattern exact activator

Author: nurmanhabib

.gitignore

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

src/Activators/LinkActivator.php

@@ -35,7 +35,12 @@ protected function matchPath(Nav $nav)
             }
 
             $navPath = parse_url($navPattern, PHP_URL_PATH);
-            $match = strpos($currentPath, $navPath) !== false || fnmatch($navPath, $currentPath);
+
+            if ($nav->patternIsMatchExact()) {
+                $match = $currentPath === $navPath;
+            } else {
+                $match = strpos($currentPath, $navPath) !== false || fnmatch($navPath, $currentPath);
+            }
 
             if ($match) {
                 break;
@@ -58,7 +63,11 @@ protected function matchQuery(Nav $nav)
 
             parse_str($navQuery, $navQuery);
 
-            $match = empty(array_diff($navQuery, $expectedQuery));
+            if ($nav->patternIsMatchExact()) {
+                $match = $navQuery == $expectedQuery;
+            } else {
+                $match = empty(array_diff($navQuery, $expectedQuery));
+            }
 
             if ($match) {
                 break;

src/Items/Nav.php

@@ -62,6 +62,11 @@ public function setChild(NavCollection $child);
      */
     public function getPattern();
 
+    /**
+     * @return bool
+     */
+    public function patternIsMatchExact();
+
     /**
      * @param Nav $nav
      * @return Nav

src/Items/NavItem.php

@@ -15,6 +15,8 @@ abstract class NavItem implements Nav
 
     protected $patterns = [];
 
+    protected $patternMatchExact = false;
+
     abstract public function getText();
 
     abstract public function getUrl();
@@ -97,10 +99,40 @@ public function matches(array $patterns = [])
         return $this;
     }
 
+    public function matchExact($exact = true)
+    {
+        $this->patternMatchExact = $exact;
+
+        return $this;
+    }
+
+    public function patternIsMatchExact()
+    {
+        return $this->patternMatchExact;
+    }
+
     public function getPattern()
     {
         if (empty($this->patterns)) {
-            $this->match(parse_url($this->getUrl(), PHP_URL_PATH));
+            $path = parse_url($this->getUrl(), PHP_URL_PATH);
+            $query = parse_url($this->getUrl(), PHP_URL_QUERY);
+            $fragment = parse_url($this->getUrl(), PHP_URL_FRAGMENT);
+
+            $relavtiveUrl = '';
+            
+            if ($path) {
+                $relavtiveUrl = $path;
+            }
+            
+            if ($query) {
+                $relavtiveUrl .= '?' . $query;
+            }
+            
+            if ($fragment) {
+                $relavtiveUrl .= '#' . $fragment;
+            }
+
+            $this->match($relavtiveUrl);
         }
 
         return $this->patterns;

src/Items/NavSeparator.php

@@ -59,6 +59,11 @@ public function getPattern()
         return [];
     }
 
+    public function patternIsMatchExact()
+    {
+        return false;
+    }
+
     public function getType()
     {
         return 'separator';

src/Modifiers/NavModifier.php

@@ -97,6 +97,11 @@ public function getPattern()
         return $this->nav->getPattern();
     }
 
+    public function patternIsMatchExact()
+    {
+        return $this->nav->patternIsMatchExact();
+    }
+
     public function toArray()
     {
         return [