Add "@isnot" blade directive (#130)

artesaos · Jun 1, 2018 · ec530a3 · ec530a3
1 parent e793fd0
commit ec530a3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/src/Defender/Providers/DefenderServiceProvider.php b/src/Defender/Providers/DefenderServiceProvider.php
@@ -142,6 +142,17 @@ protected function registerBladeExtensions()
             $bladeCompiler->directive('endis', function ($expression) {
                 return '<?php endif; ?>';
             });
+
+            /*
+             * add @isnot and @endisnot to blade compiler
+             */
+            $bladeCompiler->directive('isnot', function ($expression) {
+                return "<?php if(!app('defender')->hasRoles({$this->stripParentheses($expression)})): ?>";
+            });
+
+            $bladeCompiler->directive('endisnot', function ($expression) {
+                return '<?php endif; ?>';
+            });
         });
     }
 

diff --git a/tests/Defender/DefenderServiceProviderTest.php b/tests/Defender/DefenderServiceProviderTest.php
@@ -85,7 +85,8 @@ public function testShouldCompileDefenderTemplateHelpers()
         $this->assertNotContains('@is', $compiled);
         $this->assertNotContains('@endshield', $compiled);
         $this->assertNotContains('@endis', $compiled);
-
+        $this->assertNotContains('@isnot', $compiled);
+        $this->assertNotContains('@endisnot', $compiled);
         $this->assertStringEqualsFile($expected, $compiled);
     }
 
@@ -110,6 +111,9 @@ public function testShouldNotCompileDefenderTemplateHelpers()
         $this->assertContains('@is', $compiled);
         $this->assertContains('@endshield', $compiled);
         $this->assertContains('@endis', $compiled);
+        $this->assertContains('@isnot', $compiled);
+        $this->assertContains('@endisnot', $compiled);
+
 
         $this->assertStringNotEqualsFile($expected, $compiled);
     }

diff --git a/tests/stubs/views/defender.blade.output.txt b/tests/stubs/views/defender.blade.output.txt
@@ -2,6 +2,10 @@
 Yes, you are admin!
 <?php endif; ?>
 
+<?php if(!app('defender')->hasRoles('admin')): ?>
+No, you are not an admin!
+<?php endif; ?>
+
 <?php if(app('defender')->canDo('do.this')): ?>
 Yes, you can do this!
 <?php endif; ?>
diff --git a/tests/stubs/views/defender.blade.txt b/tests/stubs/views/defender.blade.txt
@@ -2,6 +2,10 @@
 Yes, you are admin!
 @endis
 
+@isnot('admin')
+No, you are not an admin!
+@endisnot
+
 @shield('do.this')
 Yes, you can do this!
 @endshield