Merge branch 'master' into develop

Author: jenssegers

README.md

@@ -94,7 +94,7 @@ This will allow you to use your registered alias like:
 Query Builder
 -------------
 
-The database driver plugs right into the original query builder. When using mongodb connections you will be able to build fluent queries to perform database operations. For your convenience, there is a `collection` alias for `table` as well as some additional mongodb specific operations like `push` and `pull`.
+The database driver plugs right into the original query builder. When using mongodb connections you will be able to build fluent queries to perform database operations. For your convenience, there is a `collection` alias for `table` as well as some additional mongodb specific operators/operations.
 
     // With custom connection
     $user = DB::connection('mongodb')->collection('users')->get();
@@ -236,6 +236,48 @@ You may also specify additional columns to update:
     User::where('age', '29')->increment('age', 1, array('group' => 'thirty something'));
     User::where('bmi', 30)->decrement('bmi', 1, array('category' => 'overweight'));
 
+### MongoDB specific operators
+
+**Exists**
+
+Matches documents that have the specified field.
+
+    User::where('age', 'exists', true)->get();
+
+**All**
+
+Matches arrays that contain all elements specified in the query.
+
+    User::where('roles', 'all', array('moderator', 'author'))->get();
+
+**Size**
+
+Selects documents if the array field is a specified size.
+
+    User::where('tags', 'size', 3)->get();
+
+**Regex**
+
+Selects documents where values match a specified regular expression.
+
+    User::where('name', 'regex', new MongoRegex("/.*doe/i"))->get();
+
+**Type**
+
+Selects documents if a field is of the specified type. For more information check: http://docs.mongodb.org/manual/reference/operator/query/type/#op._S_type
+
+    User::where('age', 'type', 2)->get();
+
+**Mod**
+
+Performs a modulo operation on the value of a field and selects documents with a specified result.
+
+    User::where('age', 'mod', array(10, 0))->get();
+
+**Where**
+
+Matches documents that satisfy a JavaScript expression. For more information check http://docs.mongodb.org/manual/reference/operator/query/where/#op._S_where
+
 ### Inserts, updates and deletes
 
 All basic insert, update, delete and select methods should be implemented.

src/Jenssegers/Mongodb/Connection.php

@@ -1,6 +1,6 @@
 <?php namespace Jenssegers\Mongodb;
 
-use Jenssegers\Mongodb\Builder as QueryBuilder;
+use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
 use MongoClient;
 
 class Connection extends \Illuminate\Database\Connection {

src/Jenssegers/Mongodb/Model.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 use Jenssegers\Mongodb\DatabaseManager as Resolver;
-use Jenssegers\Mongodb\Builder as QueryBuilder;
+use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
 use Jenssegers\Mongodb\Relations\BelongsTo;
 use Jenssegers\Mongodb\Relations\BelongsToMany;
 

src/Jenssegers/Mongodb/Builder.php renamed to src/Jenssegers/Mongodb/Query/Builder.php

@@ -1,11 +1,13 @@
-<?php namespace Jenssegers\Mongodb;
+<?php namespace Jenssegers\Mongodb\Query;
 
 use MongoID;
 use MongoRegex;
 use MongoDate;
 use DateTime;
 use Closure;
 
+use Jenssegers\Mongodb\Connection;
+
 class Builder extends \Illuminate\Database\Query\Builder {
 
     /**
@@ -16,7 +18,19 @@ class Builder extends \Illuminate\Database\Query\Builder {
     protected $collection;
 
     /**
-     * All of the available operators.
+     * All of the available clause operators.
+     *
+     * @var array
+     */
+    protected $operators = array(
+        '=', '<', '>', '<=', '>=', '<>', '!=',
+        'like', 'not like', 'between', 'ilike',
+        '&', '|', '^', '<<', '>>',
+        'exists', 'type', 'mod', 'where', 'all', 'size', 'regex',
+    );
+
+    /**
+     * Operator conversion.
      *
      * @var array
      */
@@ -268,7 +282,7 @@ public function distinct($column = false)
      */
     public function orderBy($column, $direction = 'asc')
     {
-        $this->orders[$column] = ($direction == 'asc' ? 1 : -1);
+        $this->orders[$column] = (strtolower($direction) == 'asc' ? 1 : -1);
 
         return $this;
     }
@@ -472,7 +486,7 @@ public function from($collection)
      */
     public function truncate()
     {
-        $result = $this->collection->drop();
+        $result = $this->collection->remove();
 
         return (1 == (int) $result['ok']);
     }
@@ -699,10 +713,14 @@ protected function compileWhereBasic($where)
         {
             $query = array($column => $value);
         }
-        else
+        else if (array_key_exists($operator, $this->conversion))
         {
             $query = array($column => array($this->conversion[$operator] => $value));
         }
+        else
+        {
+            $query = array($column => array('$' . $operator => $value));
+        }
 
         return $query;
     }

tests/ConnectionTest.php

@@ -34,10 +34,10 @@ public function testCollection()
 		$this->assertInstanceOf('MongoCollection', $collection);
 
 		$collection = DB::connection('mongodb')->collection('unittests');
-		$this->assertInstanceOf('Jenssegers\Mongodb\Builder', $collection);
+		$this->assertInstanceOf('Jenssegers\Mongodb\Query\Builder', $collection);
 
 		$collection = DB::connection('mongodb')->table('unittests');
-		$this->assertInstanceOf('Jenssegers\Mongodb\Builder', $collection);
+		$this->assertInstanceOf('Jenssegers\Mongodb\Query\Builder', $collection);
 	}
 
 	public function testDynamic()

tests/QueryBuilderTest.php

@@ -14,7 +14,7 @@ public function tearDown()
 
 	public function testCollection()
 	{
-		$this->assertInstanceOf('Jenssegers\Mongodb\Builder', DB::collection('users'));
+		$this->assertInstanceOf('Jenssegers\Mongodb\Query\Builder', DB::collection('users'));
 	}
 
 	public function testGet()
@@ -195,6 +195,10 @@ public function testRaw()
 
 		$collection = DB::collection('users')->raw();
 		$this->assertInstanceOf('MongoCollection', $collection);
+
+		$results = DB::collection('users')->whereRaw(array('age' => 20))->get();
+		$this->assertEquals(1, count($results));
+		$this->assertEquals('Jane Doe', $results[0]['name']);
 	}
 
 	public function testPush()
@@ -445,4 +449,61 @@ public function testDates()
 		$this->assertEquals(2, count($users));
 	}
 
+	public function testOperators()
+	{
+		DB::collection('users')->insert(array(
+			array('name' => 'John Doe', 'age' => 30),
+			array('name' => 'Jane Doe'),
+			array('name' => 'Robert Roe', 'age' => 'thirty-one'),
+		));
+
+		$results = DB::collection('users')->where('age', 'exists', true)->get();
+		$this->assertEquals(2, count($results));
+		$this->assertEquals('John Doe', $results[0]['name']);
+
+		$results = DB::collection('users')->where('age', 'exists', false)->get();
+		$this->assertEquals(1, count($results));
+		$this->assertEquals('Jane Doe', $results[0]['name']);
+
+		$results = DB::collection('users')->where('age', 'type', 2)->get();
+		$this->assertEquals(1, count($results));
+		$this->assertEquals('Robert Roe', $results[0]['name']);
+
+		$results = DB::collection('users')->where('age', 'mod', array(15, 0))->get();
+		$this->assertEquals(1, count($results));
+		$this->assertEquals('John Doe', $results[0]['name']);
+
+		$results = DB::collection('users')->where('age', 'mod', array(29, 1))->get();
+		$this->assertEquals(1, count($results));
+		$this->assertEquals('John Doe', $results[0]['name']);
+
+		$results = DB::collection('users')->where('age', 'mod', array(14, 0))->get();
+		$this->assertEquals(0, count($results));
+
+		DB::collection('items')->insert(array(
+			array('name' => 'fork',  'tags' => array('sharp', 'pointy')),
+			array('name' => 'spork', 'tags' => array('sharp', 'pointy', 'round', 'bowl')),
+			array('name' => 'spoon', 'tags' => array('round', 'bowl')),
+		));
+
+		$results = DB::collection('items')->where('tags', 'all', array('sharp', 'pointy'))->get();
+		$this->assertEquals(2, count($results));
+
+		$results = DB::collection('items')->where('tags', 'all', array('sharp', 'round'))->get();
+		$this->assertEquals(1, count($results));
+
+		$results = DB::collection('items')->where('tags', 'size', 2)->get();
+		$this->assertEquals(2, count($results));
+
+		$results = DB::collection('items')->where('tags', 'size', 3)->get();
+		$this->assertEquals(0, count($results));
+
+		$results = DB::collection('items')->where('tags', 'size', 4)->get();
+		$this->assertEquals(1, count($results));
+
+		$regex = new MongoRegex("/.*doe/i");
+		$results = DB::collection('users')->where('name', 'regex', $regex)->get();
+		$this->assertEquals(2, count($results));
+	}
+
 }

tests/QueryTest.php

@@ -142,6 +142,9 @@ public function testOrder()
 		$user = User::whereNotNull('age')->orderBy('age', 'asc')->first();
 		$this->assertEquals(13, $user->age);
 
+		$user = User::whereNotNull('age')->orderBy('age', 'ASC')->first();
+		$this->assertEquals(13, $user->age);
+
 		$user = User::whereNotNull('age')->orderBy('age', 'desc')->first();
 		$this->assertEquals(37, $user->age);
 	}