Merge master

Author: jenssegers

.travis.yml

@@ -16,6 +16,12 @@ before_script:
   - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - mysql -e 'create database unittest;'
   - composer self-update
+  - composer require satooshi/php-coveralls:dev-master
   - composer install --dev --no-interaction
 
-script: phpunit
+script:
+  - mkdir -p build/logs
+  - phpunit --coverage-clover build/logs/clover.xml
+
+after_script:
+  - php vendor/bin/coveralls -v

README.md

@@ -1,7 +1,7 @@
 Laravel MongoDB
 ===============
 
-[![Latest Stable Version](https://poser.pugx.org/jenssegers/mongodb/v/stable.png)](https://packagist.org/packages/jenssegers/mongodb) [![Total Downloads](https://poser.pugx.org/jenssegers/mongodb/downloads.png)](https://packagist.org/packages/jenssegers/mongodb) [![Build Status](https://travis-ci.org/jenssegers/Laravel-MongoDB.png?branch=master)](https://travis-ci.org/jenssegers/Laravel-MongoDB)
+[![Latest Stable Version](https://poser.pugx.org/jenssegers/mongodb/v/stable.png)](https://packagist.org/packages/jenssegers/mongodb) [![Total Downloads](https://poser.pugx.org/jenssegers/mongodb/downloads.png)](https://packagist.org/packages/jenssegers/mongodb) [![Build Status](https://travis-ci.org/jenssegers/Laravel-MongoDB.png?branch=master)](https://travis-ci.org/jenssegers/Laravel-MongoDB) [![Coverage Status](https://coveralls.io/repos/jenssegers/Laravel-MongoDB/badge.png?branch=master)](https://coveralls.io/r/jenssegers/Laravel-MongoDB?branch=master)
 
 An Eloquent model and Query builder with support for MongoDB, inspired by LMongo, but using the original Laravel methods. *This library extends the original Laravel classes, so it uses exactly the same methods.*
 
@@ -44,7 +44,7 @@ You can connect to multiple servers or replica sets with the following configura
 
     'mongodb' => array(
         'driver'   => 'mongodb',
-        'host'     => array('server1', 'server2),
+        'host'     => array('server1', 'server2'),
         'port'     => 27017,
         'username' => 'username',
         'password' => 'password',
@@ -414,6 +414,11 @@ You can remove an embedded document by using the `destroy()` method:
     // or
     $user->books()->destroy($book);
 
+If you want to add or remove embedded documents, without persistence, you can use the `associate` and `dissociate` methods. To write the changes to the database, save the parent object:
+
+    $user->books()->associate($book);
+    $user->save();
+
 Again, you may override the conventional local key by passing a second argument to the embedsMany method:
 
     return $this->embedsMany('Book', 'local_key');
@@ -458,16 +463,23 @@ These expressions will be injected directly into the query.
 
     User::whereRaw(array('age' => array('$gt' => 30, '$lt' => 40)))->get();
 
-You can also perform raw expressions on the internal MongoCollection object, note that this will return the original response, and not a collection of models.
+You can also perform raw expressions on the internal MongoCollection object. If this is executed on the model class, it will return a collection of models. If this is executed on the query builder, it will return the original response.
+
+    // Returns a collection of User models.
+    $models = User::raw(function($collection)
+    {
+        return $collection->find();
+    });
 
-    User::raw(function($collection)
+    // Returns the original MongoCursor.
+    $cursor = DB::collection('users')->raw(function($collection)
     {
         return $collection->find();
     });
 
-Or you can access the internal MongoCollection object directly:
+Optional: if you don't pass a closure to the raw method, the internal MongoCollection object will be accessible:
 
-    User::raw()->find();
+    $model = User::raw()->findOne(array('age' => array('$lt' => 18)));
 
 The MongoClient and MongoDB objects can be accessed like this:
 

composer.json

@@ -17,13 +17,13 @@
     },
     "require-dev": {
         "illuminate/cache": "4.2.x",
-        "illuminate/auth": "4.2.x"
+        "illuminate/auth": "4.2.x",
+        "mockery/mockery": "*"
     },
     "autoload": {
         "psr-0": {
             "Jenssegers\\Mongodb": "src/",
             "Jenssegers\\Eloquent": "src/"
         }
-    },
-    "minimum-stability": "dev"
+    }
 }

src/Jenssegers/Eloquent/Model.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Jenssegers\Mongodb\Relations\BelongsTo;
 use Jenssegers\Mongodb\Relations\BelongsToMany;
+use Jenssegers\Mongodb\Relations\MorphTo;
 use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
 
 abstract class Model extends \Illuminate\Database\Eloquent\Model {
@@ -169,6 +170,51 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
         return new BelongsTo($query, $this, $foreignKey, $otherKey, $relation);
     }
 
+    /**
+     * Define a polymorphic, inverse one-to-one or many relationship.
+     *
+     * @param  string  $name
+     * @param  string  $type
+     * @param  string  $id
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function morphTo($name = null, $type = null, $id = null)
+    {
+        // If no name is provided, we will use the backtrace to get the function name
+        // since that is most likely the name of the polymorphic interface. We can
+        // use that to get both the class and foreign key that will be utilized.
+        if (is_null($name))
+        {
+            list(, $caller) = debug_backtrace(false);
+
+            $name = snake_case($caller['function']);
+        }
+
+        list($type, $id) = $this->getMorphs($name, $type, $id);
+
+        // If the type value is null it is probably safe to assume we're eager loading
+        // the relationship. When that is the case we will pass in a dummy query as
+        // there are multiple types in the morph and we can't use single queries.
+        if (is_null($class = $this->$type))
+        {
+            return new MorphTo(
+                $this->newQuery(), $this, $id, null, $type, $name
+            );
+        }
+
+        // If we are not eager loading the relatinship, we will essentially treat this
+        // as a belongs-to style relationship since morph-to extends that class and
+        // we will pass in the appropriate values so that it behaves as expected.
+        else
+        {
+            $instance = new $class;
+
+            return new MorphTo(
+                with($instance)->newQuery(), $this, $id, $instance->getKeyName(), $type, $name
+            );
+        }
+    }
+
     /**
      * Define a many-to-many relationship.
      *

src/Jenssegers/Mongodb/Connection.php

@@ -173,6 +173,16 @@ public function getElapsedTime($start)
         return parent::getElapsedTime($start);
     }
 
+    /**
+    * Get the PDO driver name.
+    *
+    * @return string
+    */
+    public function getDriverName()
+    {
+        return '';
+    }
+
     /**
      * Dynamically pass methods to the connection.
      *

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -1,5 +1,7 @@
 <?php namespace Jenssegers\Mongodb\Eloquent;
 
+use MongoCursor;
+
 class Builder extends \Illuminate\Database\Eloquent\Builder {
 
     /**
@@ -12,4 +14,50 @@ class Builder extends \Illuminate\Database\Eloquent\Builder {
         'count', 'min', 'max', 'avg', 'sum', 'exists', 'push', 'pull'
     );
 
+    /**
+     * Create a raw database expression.
+     *
+     * @param  closure  $expression
+     * @return mixed
+     */
+    public function raw($expression = null)
+	{
+		// Get raw results from the query builder.
+		$results = $this->query->raw($expression);
+
+		$connection = $this->model->getConnectionName();
+
+		// Convert MongoCursor results to a collection of models.
+		if ($results instanceof MongoCursor)
+		{
+			$results = iterator_to_array($results, false);
+
+			$models = array();
+
+			// Once we have the results, we can spin through them and instantiate a fresh
+			// model instance for each records we retrieved from the database. We will
+			// also set the proper connection name for the model after we create it.
+			foreach ($results as $result)
+			{
+				$models[] = $model = $this->model->newFromBuilder($result);
+
+				$model->setConnection($connection);
+			}
+
+			return $this->model->newCollection($models);
+		}
+
+		// The result is a single object.
+		else if (is_array($results) and array_key_exists('_id', $results))
+		{
+			$model = $this->model->newFromBuilder($results);
+
+			$model->setConnection($connection);
+
+			return $model;
+		}
+
+		return $results;
+	}
+
 }

src/Jenssegers/Mongodb/Model.php

@@ -228,22 +228,34 @@ public function dropColumn($columns)
     }
 
     /**
-     * Pass push to the query builder.
+     * Append one or more values to an array.
      *
      * @return mixed
      */
     public function push()
     {
         if ($parameters = func_get_args())
         {
-            $query = $this->newQuery();
+            $query = $this->setKeysForSaveQuery($this->newQuery());
 
             return call_user_func_array(array($query, 'push'), $parameters);
         }
 
         return parent::push();
     }
 
+    /**
+     * Remove one or more values from an array.
+     *
+     * @return mixed
+     */
+    public function pull()
+    {
+        $query = $this->setKeysForSaveQuery($this->newQuery());
+
+        return call_user_func_array(array($query, 'pull'), func_get_args());
+    }
+
     /**
      * Create a new Eloquent query builder for the model.
      *