MongoDate tweak, fixes #86

Author: jenssegers

src/Jenssegers/Mongodb/Model.php

@@ -273,15 +273,30 @@ public function setRawAttributes(array $attributes, $sync = false)
             {
                 $value = (string) $value;
             }
+        }
+
+        parent::setRawAttributes($attributes, $sync);
+    }
 
+    /**
+     * Convert the model's attributes to an array.
+     *
+     * @return array
+     */
+    public function attributesToArray()
+    {
+        $attributes = parent::attributesToArray();
+
+        foreach ($attributes as &$value)
+        {
             // Convert MongoDate to string
-            else if ($value instanceof MongoDate)
+            if ($value instanceof MongoDate)
             {
                 $value = $this->asDateTime($value)->format('Y-m-d H:i:s');
             }
         }
 
-        parent::setRawAttributes($attributes, $sync);
+        return $attributes;
     }
 
     /**

tests/ModelTest.php

@@ -178,6 +178,9 @@ public function testCreate()
 		$this->assertInstanceOf('Jenssegers\Mongodb\Model', $user);
 		$this->assertEquals(true, $user->exists);
 		$this->assertEquals('Jane Poe', $user->name);
+
+		$check = User::where('name', 'Jane Poe')->first();
+		$this->assertEquals($user, $check);
 	}
 
 	public function testDestroy()
@@ -280,6 +283,14 @@ public function testToArray()
 		$items = Item::all();
 		$this->assertEquals($original, $items->toArray());
 		$this->assertEquals($original[0], $items[0]->toArray());
+
+		// with date
+		$item = Item::create(array('name' => 'fork', 'type' => 'sharp'));
+		$array = $item->toArray();
+		$this->assertTrue(array_key_exists('created_at', $array));
+		$this->assertTrue(array_key_exists('updated_at', $array));
+		$this->assertTrue(is_string($array['created_at']));
+		$this->assertTrue(is_string($array['updated_at']));
 	}
 
 	public function testUnset()
@@ -312,14 +323,11 @@ public function testUnset()
 	public function testDates()
 	{
 		$user = User::create(array('name' => 'John Doe', 'birthday' => new DateTime('1980/1/1')));
-
 		$this->assertInstanceOf('Carbon\Carbon', $user->birthday);
 
 		$check = User::find($user->_id);
-
 		$this->assertInstanceOf('Carbon\Carbon', $check->birthday);
 		$this->assertEquals($user->birthday, $check->birthday);
-		
 
 		$user = User::where('birthday', '>', new DateTime('1975/1/1'))->first();
 		$this->assertEquals('John Doe', $user->name);

tests/QueryBuilderTest.php

@@ -265,10 +265,10 @@ public function testDistinct()
 		));
 
 		$items = DB::collection('items')->distinct('name')->get();
-		$this->assertEquals(array('knife', 'fork', 'spoon'), $items);
+		$this->assertEquals(3, count($items));
 
 		$types = DB::collection('items')->distinct('type')->get();
-		$this->assertEquals(array('sharp', 'round'), $types);
+		$this->assertEquals(2, count($types));
 	}
 
 	public function testCustomId()