Added notBlank expander

Author: norberttech

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/NotBlank.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
+
+use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
+use Coduo\ToString\String;
+
+class NotBlank implements PatternExpander
+{
+    private $error;
+
+    /**
+     * @param $value
+     * @return boolean
+     */
+    public function match($value)
+    {
+        if (false === $value || (empty($value) && '0' != $value)) {
+            $this->error = sprintf("Value %s is not blank.", new String($value));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}

src/Coduo/PHPMatcher/Parser.php

@@ -23,7 +23,8 @@ class Parser
      * @var array
      */
     private $expanderDefinitions = array(
-        "startsWith" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\StartsWith"
+        "startsWith" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\StartsWith",
+        "notBlank" => "Coduo\\PHPMatcher\\Matcher\\Pattern\\Expander\\NotBlank"
     );
 
     /**

tests/Coduo/PHPMatcher/Matcher/Pattern/Expander/NotBlankTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Coduo\PHPMatcher\Tests\Matcher\Pattern\Expander;
+
+use Coduo\PHPMatcher\Matcher;
+use Coduo\PHPMatcher\Matcher\Pattern\Expander\NotBlank;
+
+class NotBlankTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider examplesProvider
+     */
+    public function test_examples_not_ignoring_case($value, $expectedResult)
+    {
+        $expander = new NotBlank();
+        $this->assertEquals($expectedResult, $expander->match($value));
+    }
+
+    public static function examplesProvider()
+    {
+        return array(
+            array("lorem", true),
+            array("0", true),
+            array(new \DateTime(), true),
+            array("", false),
+            array(null, false),
+            array(array(), false)
+        );
+    }
+}

tests/Coduo/PHPMatcher/MatcherTest.php

@@ -2,15 +2,6 @@
 namespace Coduo\PHPMatcher\Tests;
 
 use Coduo\PHPMatcher\Lexer;
-use Coduo\PHPMatcher\Matcher\ArrayMatcher;
-use Coduo\PHPMatcher\Matcher\CaptureMatcher;
-use Coduo\PHPMatcher\Matcher\CallbackMatcher;
-use Coduo\PHPMatcher\Matcher\ChainMatcher;
-use Coduo\PHPMatcher\Matcher\ExpressionMatcher;
-use Coduo\PHPMatcher\Matcher\JsonMatcher;
-use Coduo\PHPMatcher\Matcher\ScalarMatcher;
-use Coduo\PHPMatcher\Matcher\TypeMatcher;
-use Coduo\PHPMatcher\Matcher\WildcardMatcher;
 use Coduo\PHPMatcher\Matcher;
 use Coduo\PHPMatcher\Parser;
 
@@ -27,9 +18,9 @@ class MatcherTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->captureMatcher = new CaptureMatcher();
+        $this->captureMatcher = new Matcher\CaptureMatcher();
         $parser = new Parser(new Lexer());
-        $scalarMatchers = new ChainMatcher(array(
+        $scalarMatchers = new Matcher\ChainMatcher(array(
             $this->captureMatcher,
             new Matcher\CallbackMatcher(),
             new Matcher\ExpressionMatcher(),
@@ -43,12 +34,12 @@ public function setUp()
             new Matcher\WildcardMatcher(),
         ));
 
-        $arrayMatcher = new ArrayMatcher($scalarMatchers);
+        $arrayMatcher = new Matcher\ArrayMatcher($scalarMatchers);
 
-        $this->matcher = new Matcher(new ChainMatcher(array(
+        $this->matcher = new Matcher(new Matcher\ChainMatcher(array(
             $scalarMatchers,
             $arrayMatcher,
-            new JsonMatcher($arrayMatcher)
+            new Matcher\JsonMatcher($arrayMatcher)
         )));
     }