Merge branch 'master' into embedded-models

src/Jenssegers/Mongodb/Connection.php

@@ -133,6 +133,16 @@ class Connection extends \Illuminate\Database\Connection {
         return new MongoClient($dsn, $options);
     }
 
+    /**
+     * Disconnect from the underlying MongoClient connection.
+     *
+     * @return void
+     */
+    public function disconnect()
+    {
+        $this->connection->close();
+    }
+
     /**
      * Create a DSN string from a configuration.
      *

src/Jenssegers/Mongodb/Model.php

@@ -39,17 +39,26 @@ abstract class Model extends \Jenssegers\Eloquent\Model {
     /**
      * Custom accessor for the model's id.
      *
-     * @return string
+     * @param mixed $value
+     *
+     * @return mixed
      */
     public function getIdAttribute($value)
     {
-        if ($value) return (string) $value;
+        // If we don't have a value for 'id', we will use the Mongo '_id' value.
+        // This allows us to work with models in a more sql-like way.
+        if ( ! $value and array_key_exists('_id', $this->attributes))
+        {
+            $value = $this->attributes['_id'];
+        }
 
-        // Return _id as string
-        if (array_key_exists('_id', $this->attributes))
+        // Convert MongoId's to string.
+        if ($value instanceof MongoId)
         {
-            return (string) $this->attributes['_id'];
+            return (string) $value;
         }
+
+        return $value;
     }
 
     /**

tests/ConnectionTest.php

@@ -15,7 +15,8 @@ class ConnectionTest extends TestCase {
 		$this->assertEquals(spl_object_hash($c1), spl_object_hash($c2));
 
 		$c1 = DB::connection('mongodb');
-		$c2 = DB::reconnect('mongodb');
+		DB::purge('mongodb');
+		$c2 = DB::connection('mongodb');
 		$this->assertNotEquals(spl_object_hash($c1), spl_object_hash($c2));
 	}
 

tests/ModelTest.php

@@ -79,7 +79,7 @@ class ModelTest extends TestCase {
 		$this->assertEquals(20, $check->age);
 	}
 
-	public function testManualId()
+	public function testManualStringId()
 	{
 		$user = new User;
 		$user->_id = '4af9f23d8ead0e1d32000000';
@@ -93,6 +93,35 @@ class ModelTest extends TestCase {
 
 		$raw = $user->getAttributes();
 		$this->assertInstanceOf('MongoId', $raw['_id']);
+
+		$user = new User;
+		$user->_id = 'customId';
+		$user->name = 'John Doe';
+		$user->title = 'admin';
+		$user->age = 35;
+		$user->save();
+
+		$this->assertEquals(true, $user->exists);
+		$this->assertEquals('customId', $user->_id);
+
+		$raw = $user->getAttributes();
+		$this->assertInternalType('string', $raw['_id']);
+	}
+
+	public function testManualIntId()
+	{
+		$user = new User;
+		$user->_id = 1;
+		$user->name = 'John Doe';
+		$user->title = 'admin';
+		$user->age = 35;
+		$user->save();
+
+		$this->assertEquals(true, $user->exists);
+		$this->assertEquals(1, $user->_id);
+
+		$raw = $user->getAttributes();
+		$this->assertInternalType('integer', $raw['_id']);
 	}
 
 	public function testDelete()