Refactor to original Laravel classes

README.md

 Laravel Eloquent MongoDB [![Build Status](https://travis-ci.org/jenssegers/Laravel-MongoDB.png?branch=master)](https://travis-ci.org/jenssegers/Laravel-MongoDB)
 ========================
 
-An Eloquent model that supports MongoDB.
+An Eloquent model that supports MongoDB, inspired by LMongo but using original Eloquent methods.
 
 *This model extends the original Eloquent model so it uses exactly the same methods. Please note that some advanced Eloquent features may not be working, but feel free to issue a pull request!*
 

composer.json

@@ -12,7 +12,8 @@
     "require": {
         "php": ">=5.3.0",
         "illuminate/support": "4.0.x",
-        "illuminate/database": "4.0.x"
+        "illuminate/database": "4.0.x",
+        "illuminate/events": "4.0.x"
     },
     "autoload": {
         "psr-0": {

src/Jenssegers/Mongodb/Connection.php

 <?php namespace Jenssegers\Mongodb;
 
-class Connection {
+use MongoClient;
+
+class Connection extends \Illuminate\Database\Connection {
 
     /**
      * The MongoDB database handler.
@@ -16,13 +18,6 @@ class Connection {
      */
     protected $connection;
 
-    /**
-     * The database connection configuration options.
-     *
-     * @var string
-     */
-    protected $config = array();
-
     /**
      * Create a new database connection instance.
      *
@@ -31,8 +26,6 @@ class Connection {
      */
     public function __construct(array $config)
     {
-        if (!is_null($this->connection)) return;
-
         // Store configuration
         $this->config = $config;
 
@@ -40,16 +33,14 @@ class Connection {
         $options = array_get($config, 'options', array());
 
         // Create connection
-        $this->connection = new \MongoClient($this->getDsn($config), $options);
+        $this->connection = new MongoClient($this->getDsn($config), $options);
 
         // Select database
         $this->db = $this->connection->{$config['database']};
-
-        return $this;
     }
 
     /**
-     * Get a mongodb collection.
+     * Get a MongoDB collection.
      *
      * @param  string   $name
      * @return MongoDB
@@ -60,7 +51,7 @@ class Connection {
     }
 
     /**
-     * Get the mongodb database object.
+     * Get the MongoDB database object.
      *
      * @return  MongoDB
      */

src/Jenssegers/Mongodb/DatabaseManager.php

+<?php namespace Jenssegers\Mongodb;
+
+use Illuminate\Database\ConnectionResolverInterface;
+use Jenssegers\Mongodb\Connection;
+use Jenssegers\Mongodb\Builder as QueryBuilder;
+
+class DatabaseManager implements ConnectionResolverInterface {
+
+	/**
+	 * The application instance.
+	 *
+	 * @var \Illuminate\Foundation\Application
+	 */
+	protected $app;
+
+	/**
+	 * The active connection instances.
+	 *
+	 * @var array
+	 */
+	protected $connections = array();
+
+	/**
+	 * The custom connection resolvers.
+	 *
+	 * @var array
+	 */
+	protected $extensions = array();
+
+	/**
+	 * The default database connection.
+	 *
+	 * @var array
+	 */
+	protected $defaultConnection = 'mongodb';
+
+	/**
+	 * Create a new database manager instance.
+	 *
+	 * @param  \Illuminate\Foundation\Application  $app
+	 * @return void
+	 */
+	public function __construct($app)
+	{
+		$this->app = $app;
+	}
+
+	/**
+	 * Get a database connection instance.
+	 *
+	 * @param  string  $name
+	 * @return \Illuminate\Database\Connection
+	 */
+	public function connection($name = null)
+	{
+		$name = $name ?: $this->getDefaultConnection();
+
+		// If we haven't created this connection, we'll create it based on the config
+		// provided in the application. Once we've created the connections we will
+		// set the "fetch mode" for PDO which determines the query return types.
+		if ( ! isset($this->connections[$name]))
+		{
+			$connection = $this->makeConnection($name);
+
+			$this->connections[$name] = $this->prepare($connection);
+		}
+
+		return $this->connections[$name];
+	}
+
+	/**
+	 * Reconnect to the given database.
+	 *
+	 * @param  string  $name
+	 * @return \Illuminate\Database\Connection
+	 */
+	public function reconnect($name = null)
+	{
+		unset($this->connections[$name]);
+
+		return $this->connection($name);
+	}
+
+	/**
+	 * Make the database connection instance.
+	 *
+	 * @param  string  $name
+	 * @return \Illuminate\Database\Connection
+	 */
+	protected function makeConnection($name)
+	{
+		$config = $this->getConfig($name);
+
+		if (isset($this->extensions[$name]))
+		{
+			return call_user_func($this->extensions[$name], $config);
+		}
+
+		return new Connection($config);
+	}
+
+	/**
+	 * Prepare the database connection instance.
+	 *
+	 * @param  \Illuminate\Database\Connection  $connection
+	 * @return \Illuminate\Database\Connection
+	 */
+	protected function prepare(Connection $connection)
+	{
+		$connection->setEventDispatcher($this->app['events']);
+
+		// We will setup a Closure to resolve the paginator instance on the connection
+		// since the Paginator isn't sued on every request and needs quite a few of
+		// our dependencies. It'll be more efficient to lazily resolve instances.
+		$app = $this->app;
+
+		$connection->setPaginator(function() use ($app)
+		{
+			return $app['paginator'];
+		});
+
+		return $connection;
+	}
+
+	/**
+	 * Get the configuration for a connection.
+	 *
+	 * @param  string  $name
+	 * @return array
+	 */
+	protected function getConfig($name)
+	{
+		$name = $name ?: $this->getDefaultConnection();
+
+		// To get the database connection configuration, we will just pull each of the
+		// connection configurations and get the configurations for the given name.
+		// If the configuration doesn't exist, we'll throw an exception and bail.
+		$connections = $this->app['config']['database.connections'];
+
+		if (is_null($config = array_get($connections, $name)))
+		{
+			throw new \InvalidArgumentException("Database [$name] not configured.");
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Get the default connection name.
+	 *
+	 * @return string
+	 */
+	public function getDefaultConnection()
+	{
+		return $this->defaultConnection;
+	}
+
+	/**
+	 * Set the default connection name.
+	 *
+	 * @param  string  $name
+	 * @return void
+	 */
+	public function setDefaultConnection($name)
+	{
+		$this->defaultConnection = $name;
+	}
+
+	/**
+	 * Return a new QueryBuilder for a collection
+	 *
+	 * @param  string  $collection
+	 * @return QueryBuilder
+	 */
+	public function collection($collection)
+	{
+		return new QueryBuilder($this->connection(), $collection);
+	}
+
+	/**
+	 * Return a new QueryBuilder for a collection
+	 *
+	 * @param  string  $collection
+	 * @return QueryBuilder
+	 */
+	public function __get($collection)
+	{
+		return $this->collection($collection);
+	}
+
+}
\ No newline at end of file

src/Jenssegers/Mongodb/Model.php

 <?php namespace Jenssegers\Mongodb;
 
-use Illuminate\Database\ConnectionResolverInterface as Resolver;
+use Jenssegers\Mongodb\DatabaseManager as Resolver;
 use Illuminate\Database\Eloquent\Collection;
-use Jenssegers\Mongodb\Query as QueryBuilder;
+use Jenssegers\Mongodb\Builder as QueryBuilder;
 
 use DateTime;
 use MongoDate;

src/Jenssegers/Mongodb/MongodbServiceProvider.php

 <?php namespace Jenssegers\Mongodb;
 
 use Jenssegers\Mongodb\Model;
-use Jenssegers\Mongodb\ConnectionResolver;
+use Jenssegers\Mongodb\DatabaseManager;
 use Illuminate\Support\ServiceProvider;
 
 class MongodbServiceProvider extends ServiceProvider {
@@ -13,7 +13,8 @@ class MongodbServiceProvider extends ServiceProvider {
      */
     public function boot()
     {
-        Model::setConnectionResolver($this->app['db.mongodb']);
+        Model::setConnectionResolver($this->app['mongodb']);
+        Model::setEventDispatcher($this->app['events']);
     }
 
     /**
@@ -26,9 +27,9 @@ class MongodbServiceProvider extends ServiceProvider {
         // The database manager is used to resolve various connections, since multiple
         // connections might be managed. It also implements the connection resolver
         // interface which may be used by other components requiring connections.
-        $this->app['db.mongodb'] = $this->app->share(function($app)
+        $this->app['mongodb'] = $this->app->share(function($app)
         {
-            return new ConnectionResolver($app);
+            return new DatabaseManager($app);
         });
     }
 

srcb/Jenssegers/Mongodb/Connection.php

+<?php namespace Jenssegers\Mongodb;
+
+class Connection {
+
+    /**
+     * The MongoDB database handler.
+     *
+     * @var resource
+     */
+    protected $db;
+
+    /**
+     * The MongoClient connection handler.
+     *
+     * @var resource
+     */
+    protected $connection;
+
+    /**
+     * The database connection configuration options.
+     *
+     * @var string
+     */
+    protected $config = array();
+
+    /**
+     * Create a new database connection instance.
+     *
+     * @param  array   $config
+     * @return void
+     */
+    public function __construct(array $config)
+    {
+        if (!is_null($this->connection)) return;
+
+        // Store configuration
+        $this->config = $config;
+
+        // Check for connection options
+        $options = array_get($config, 'options', array());
+
+        // Create connection
+        $this->connection = new \MongoClient($this->getDsn($config), $options);
+
+        // Select database
+        $this->db = $this->connection->{$config['database']};
+
+        return $this;
+    }
+
+    /**
+     * Get a mongodb collection.
+     *
+     * @param  string   $name
+     * @return MongoDB
+     */
+    public function getCollection($name)
+    {
+        return $this->db->{$name};
+    }
+
+    /**
+     * Get the mongodb database object.
+     *
+     * @return  MongoDB
+     */
+    public function getDb()
+    {
+        return $this->db;
+    }
+
+    /**
+     * Create a DSN string from a configuration.
+     *
+     * @param  array   $config
+     * @return string
+     */
+    protected function getDsn(array $config)
+    {
+        // First we will create the basic DSN setup as well as the port if it is in
+        // in the configuration options. This will give us the basic DSN we will
+        // need to establish the MongoClient and return them back for use.
+        extract($config);
+
+        $dsn = "mongodb://";
+
+        if (isset($config['username']) and isset($config['password']))
+        {
+            $dsn .= "{$username}:{$password}@";
+        }
+
+        $dsn.= "{$host}";
+
+        if (isset($config['port']))
+        {
+            $dsn .= ":{$port}";
+        }
+
+        $dsn.= "/{$database}";
+
+        return $dsn;
+    }
+
+}
\ No newline at end of file

srcb/Jenssegers/Mongodb/Model.php

+<?php namespace Jenssegers\Mongodb;
+
+use Illuminate\Database\ConnectionResolverInterface as Resolver;
+use Illuminate\Database\Eloquent\Collection;
+use Jenssegers\Mongodb\Query as QueryBuilder;
+
+use DateTime;
+use MongoDate;
+
+abstract class Model extends \Illuminate\Database\Eloquent\Model {
+
+    /**
+     * The collection associated with the model.
+     *
+     * @var string
+     */
+    protected $collection;
+
+    /**
+     * The primary key for the model.
+     *
+     * @var string
+     */
+    protected $primaryKey = '_id';
+
+    /**
+     * Convert a DateTime to a storable string.
+     *
+     * @param  DateTime  $value
+     * @return MongoDate
+     */
+    protected function fromDateTime(DateTime $value)
+    {
+        return new MongoDate($value->getTimestamp());
+    }
+
+    /**
+     * Return a timestamp as DateTime object.
+     *
+     * @param  mixed  $value
+     * @return DateTime
+     */
+    protected function asDateTime($value)
+    {
+        if ($value instanceof MongoDate)
+        {
+            $value = $value->sec;
+        }
+
+        if (is_int($value))
+        {
+            $value = "@$value";
+        }
+
+        return new DateTime($value);
+    }
+
+    /**
+     * Get the table associated with the model.
+     *
+     * @return string
+     */
+    public function getTable()
+    {
+        if (isset($this->collection)) return $this->collection;
+
+        return parent::getTable();
+    }
+
+    /**
+     * Get a new query builder instance for the connection.
+     *
+     * @return Builder
+     */
+    protected function newBaseQueryBuilder()
+    {
+        $connection = $this->getConnection();
+        return new QueryBuilder($connection);
+    }
+
+}
\ No newline at end of file

srcb/Jenssegers/Mongodb/MongodbServiceProvider.php

+<?php namespace Jenssegers\Mongodb;
+
+use Jenssegers\Mongodb\Model;
+use Jenssegers\Mongodb\ConnectionResolver;
+use Illuminate\Support\ServiceProvider;
+
+class MongodbServiceProvider extends ServiceProvider {
+
+    /**
+     * Bootstrap the application events.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Model::setConnectionResolver($this->app['db.mongodb']);
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        // The database manager is used to resolve various connections, since multiple
+        // connections might be managed. It also implements the connection resolver
+        // interface which may be used by other components requiring connections.
+        $this->app['db.mongodb'] = $this->app->share(function($app)
+        {
+            return new ConnectionResolver($app);
+        });
+    }
+
+}
\ No newline at end of file

tests/ConnectionTest.php

@@ -10,12 +10,8 @@ class ConnectionTest extends PHPUnit_Framework_TestCase {
 
 	public function setUp()
 	{
-		$config = array(
-			'host'     => 'localhost',
-			'database' => 'unittest'
-		);
-
-		$this->connection = new Connection($config);
+		include('tests/app.php');
+		$this->connection = new Connection($app['config']['database.connections']['mongodb']);
 		$this->collection = $this->connection->getCollection('unittest');
 	}
 

tests/ModelTest.php

@@ -4,19 +4,14 @@ require_once('models/User.php');
 
 use Jenssegers\Mongodb\Connection;
 use Jenssegers\Mongodb\Model;
-use Jenssegers\Mongodb\ConnectionResolver;
+use Jenssegers\Mongodb\DatabaseManager;
 
 class ModelTest extends PHPUnit_Framework_TestCase {
 
 	public function setUp()
 	{
-		$app = array();
-		$app['config']['database']['connections']['mongodb'] = array(
-			'host'     => 'localhost',
-			'database' => 'unittest'
-		);
-
-		Model::setConnectionResolver(new ConnectionResolver($app));
+		include('tests/app.php');
+		Model::setConnectionResolver(new DatabaseManager($app));
 	}
 
 	public function tearDown()

tests/QueryTest.php

@@ -4,19 +4,14 @@ require_once('models/User.php');
 
 use Jenssegers\Mongodb\Connection;
 use Jenssegers\Mongodb\Model;
-use Jenssegers\Mongodb\ConnectionResolver;
+use Jenssegers\Mongodb\DatabaseManager;
 
 class QueryTest extends PHPUnit_Framework_TestCase {
 
 	public function setUp()
 	{
-		$app = array();
-		$app['config']['database']['connections']['mongodb'] = array(
-			'host'     => 'localhost',
-			'database' => 'unittest'
-		);
-
-		Model::setConnectionResolver(new ConnectionResolver($app));
+		include('tests/app.php');
+		Model::setConnectionResolver(new DatabaseManager($app));
 
 		// test data
 		User::create(array('name' => 'John Doe', 'age' => 35, 'title' => 'admin'));
@@ -38,6 +33,7 @@ class QueryTest extends PHPUnit_Framework_TestCase {
 	public function testGet()
 	{
 		$users = User::get();
+
 		$this->assertEquals(9, count($users));
 		$this->assertInstanceOf('Jenssegers\Mongodb\Model', $users[0]);
 	}

tests/app.php

+<?php
+
+$app = array();
+$app['events'] = new \Illuminate\Events\Dispatcher;
+$app['config']['database.connections']['mongodb'] = array(
+	'host'     => 'localhost',
+	'database' => 'unittest'
+);
\ No newline at end of file