Merge branch 'master' into develop

Author: jenssegers

README.md

@@ -218,6 +218,24 @@ You may also specify additional columns to update:
 
 All basic insert, update, delete and select methods should be implemented.
 
+### Dates
+
+Eloquent allows you to work with Carbon/DateTime objects instead of MongoDate objects. Internally, these dates will be converted to MongoDate objects when saved to the database. If you wish to use this functionality on non-default date fields you will need to manually specify them as described here: http://laravel.com/docs/eloquent#date-mutators
+
+Example:
+
+    use Jenssegers\Mongodb\Model as Eloquent;
+
+    class User extends Eloquent {
+
+        protected $dates = array('birthday');
+
+    }
+
+Which allows you to execute queries like:
+
+    $users = User::where('birthday', '>', new DateTime('-18 years'))->get();
+
 ### Relations
 
 Supported relations are:

src/Jenssegers/Mongodb/Builder.php

@@ -2,6 +2,8 @@
 
 use MongoID;
 use MongoRegex;
+use MongoDate;
+use DateTime;
 use Closure;
 
 class Builder extends \Illuminate\Database\Query\Builder {
@@ -646,6 +648,12 @@ protected function compileWheres()
                 }
             }
 
+            // Convert dates
+            if (isset($where['value']) && $where['value'] instanceof DateTime)
+            {
+                $where['value'] = new MongoDate($where['value']->getTimestamp());
+            }
+
             // First item of chain
             if ($i == 0 && count($this->wheres) > 1 && $where['boolean'] == 'and')
             {

tests/ModelTest.php

@@ -309,4 +309,17 @@ public function testUnset()
 		$this->assertFalse(isset($user2->note2));
 	}
 
+	public function testDates()
+	{
+		$user = User::create(array('name' => 'John Doe', 'birthday' => new DateTime('1980/1/1')));
+		$this->assertInstanceOf('DateTime', $user->birthday);
+
+		// Re-fetch to be sure
+		$user = User::find($user->_id);
+		$this->assertInstanceOf('DateTime', $user->birthday);
+
+		$user = User::where('birthday', '>', new DateTime('1975/1/1'))->first();
+		$this->assertEquals('John Doe', $user->name);
+	}
+
 }

tests/QueryBuilderTest.php

@@ -413,4 +413,36 @@ public function testUnset()
 		$this->assertFalse(isset($user2['note2']));
 	}
 
+	public function testUpdateSubdocument()
+	{
+		$id = DB::collection('users')->insertGetId(array('name' => 'John Doe', 'address' => array('country' => 'Belgium')));
+
+		DB::collection('users')->where('_id', $id)->update(array('address.country' => 'England'));
+
+		$check = DB::collection('users')->find($id);
+		$this->assertEquals('England', $check['address']['country']);
+	}
+
+	public function testDates()
+	{
+		DB::collection('users')->insert(array(
+			array('name' => 'John Doe', 'birthday' => new MongoDate(strtotime("1980-01-01 00:00:00"))),
+			array('name' => 'Jane Doe', 'birthday' => new MongoDate(strtotime("1981-01-01 00:00:00"))),
+			array('name' => 'Robert Roe', 'birthday' => new MongoDate(strtotime("1982-01-01 00:00:00"))),
+			array('name' => 'Mark Moe', 'birthday' => new MongoDate(strtotime("1983-01-01 00:00:00"))),
+		));
+
+		$user = DB::collection('users')->where('birthday', new MongoDate(strtotime("1980-01-01 00:00:00")))->first();
+		$this->assertEquals('John Doe', $user['name']);
+
+		$user = DB::collection('users')->where('birthday', '=', new DateTime("1980-01-01 00:00:00"))->first();
+		$this->assertEquals('John Doe', $user['name']);
+
+		$start = new MongoDate(strtotime("1981-01-01 00:00:00"));
+		$stop = new MongoDate(strtotime("1982-01-01 00:00:00"));
+
+		$users = DB::collection('users')->whereBetween('birthday', array($start, $stop))->get();
+		$this->assertEquals(2, count($users));
+	}
+
 }

tests/models/User.php

@@ -7,11 +7,13 @@
 
 class User extends Eloquent implements UserInterface, RemindableInterface {
 
-	protected $collection = 'users';
+    protected $collection = 'users';
 
-	protected static $unguarded = true;
+    protected $dates = array('birthday');
 
-	public function books()
+    protected static $unguarded = true;
+
+    public function books()
     {
         return $this->hasMany('Book', 'author_id');
     }
@@ -56,4 +58,4 @@ public function getReminderEmail()
         return $this->email;
     }
 
-}
+}