Move build wheres logic to base mode class. Add support for operators in where clauses

Author: damiantw

.gitignore

@@ -0,0 +1 @@
+.idea/

README.md

@@ -78,6 +78,20 @@ Simply call the `search()` method on your `Searchable` models:
 
 `$beers = App\Drink::search('beer')->get();`
 
+Or With pagination: 
+
+`$beers = App\Drink::search('beer')->paginate(15);`
+
+Simple constraints can be applied using the `where()` builder method 
+(each additional `WHERE` will be applied using `AND`).
+
+`$beers = App\Drink::search('beer')->where('in_stock', 1)->get();`
+
+The following operators can be applied to the `WHERE` statements: `<> != = <= < >= >` 
+(`=` will be used if no operator is specified)
+
+`$beers = App\Drink::search('beer')->where('abv >', 10)->get();`
+
 For more usage information see the [Laravel Scout Documentation](https://laravel.com/docs/5.3/scout).
 
 Modes <div id="modes"></div>

src/Engines/Modes/Boolean.php

@@ -21,9 +21,7 @@ public function buildWhereRawString()
     {
         $queryString = '';
 
-        foreach ($this->builder->wheres as $field => $value) {
-            $queryString .= "$field = :$field AND ";
-        }
+        $queryString .= $this->buildWheres();
 
         $indexFields = implode(',',  $this->modelService->getFullTextIndexFields());
 
@@ -34,14 +32,9 @@ public function buildWhereRawString()
 
     public function buildParams()
     {
-        $params = [];
 
-        foreach ($this->builder->wheres as $field => $value) {
-            $params[$field] = $value;
-        }
-
-        $params['_search'] = $this->builder->query;
-        return $params;
+        $this->whereParams['_search'] = $this->builder->query;
+        return $this->whereParams;
     }
 
     public function isFullText()

src/Engines/Modes/Like.php

@@ -25,9 +25,7 @@ public function buildWhereRawString()
 
         $this->fields = $this->modelService->getSearchableFields();
 
-        foreach ($this->builder->wheres as $field => $value) {
-            $queryString .= "$field = :$field AND ";
-        }
+        $queryString .= $this->buildWheres();
 
         $queryString .= '(';
 
@@ -46,17 +44,11 @@ public function buildWhereRawString()
 
     public function buildParams()
     {
-        $params = [];
-
-        foreach ($this->builder->wheres as $field => $value) {
-            $params[$field] = $value;
-        }
-
         for ($itr = 0; $itr < count($this->fields); $itr++) {
-            $params["_search$itr"] = '%' . $this->builder->query . '%';
+            $this->whereParams["_search$itr"] = '%' . $this->builder->query . '%';
         }
 
-        return $params;
+        return $this->whereParams;
     }
 
     public function isFullText()

src/Engines/Modes/LikeExpanded.php

@@ -25,9 +25,7 @@ public function buildWhereRawString()
 
         $this->fields = $this->modelService->getSearchableFields();
 
-        foreach ($this->builder->wheres as $field => $value) {
-            $queryString .= "$field = :$field AND ";
-        }
+        $queryString .= $this->buildWheres();
 
         $words = explode(' ', $this->builder->query);
 
@@ -53,21 +51,15 @@ public function buildParams()
     {
         $words = explode(' ', $this->builder->query);
 
-        $params = [];
-
-        foreach ($this->builder->wheres as $field => $value) {
-            $params[$field] = $value;
-        }
-
         $itr = 0;
         for ($i = 0; $i < count($this->fields); $i++) {
             foreach ($words as $word) {
-                $params["_search$itr"] = '%' . $word . '%';
+                $this->whereParams["_search$itr"] = '%' . $word . '%';
                 $itr ++;
             }
         }
 
-        return $params;
+        return $this->whereParams;
 
     }
 

src/Engines/Modes/Mode.php

@@ -8,6 +8,8 @@ abstract class Mode
 {
     protected $builder;
 
+    protected $whereParams = [];
+
     function __construct(Builder $builder)
     {
         $this->builder = $builder;
@@ -19,4 +21,37 @@ abstract public function buildParams();
 
     abstract public function isFullText();
 
+    protected function buildWheres()
+    {
+
+        $queryString = '';
+
+        $parsedWheres = $this->parseWheres($this->builder->wheres);
+
+        foreach ($parsedWheres as $parsedWhere) {
+
+            $field = $parsedWhere[0];
+            $operator = $parsedWhere[1];
+            $value = $parsedWhere[2];
+
+            $this->whereParams[$field] = $value;
+
+            $queryString .= "$field $operator :$field AND ";
+        }
+
+        return $queryString;
+    }
+
+    private function parseWheres($wheres)
+    {
+        $pattern  = '/([A-Za-z_]+[A-Za-z_0-9]?)[ ]?(<>|!=|=|<=|<|>=|>)/';
+
+        $result = array();
+        foreach($wheres as $field => $value) {
+            preg_match($pattern, $field, $matches);
+            $result []= !empty($matches) ? array($matches[1], $matches[2], $value) : array($field, '=', $value);
+        }
+        return $result;
+    }
+
 }

src/Engines/Modes/NaturalLanguage.php

@@ -21,9 +21,7 @@ public function buildWhereRawString()
     {
         $queryString = '';
 
-        foreach ($this->builder->wheres as $field => $value) {
-            $queryString .= "$field = :$field AND ";
-        }
+        $queryString .= $this->buildWheres();
 
         $indexFields = implode(',',  $this->modelService->getFullTextIndexFields());
 
@@ -41,14 +39,9 @@ public function buildWhereRawString()
 
     public function buildParams()
     {
-        $params = [];
-
-        foreach ($this->builder->wheres as $field => $value) {
-            $params[$field] = $value;
-        }
 
-        $params['_search'] = $this->builder->query;
-        return $params;
+        $this->whereParams['_search'] = $this->builder->query;
+        return $this->whereParams;
     }
 
     public function isFullText()