Rename getParent to getParentRelation and added more tests for soft deletion

Author: jenssegers

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -26,7 +26,7 @@ public function update(array $values)
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParent())
+        if ($relation = $this->model->getParentRelation())
         {
             $relation->performUpdate($this->model, $values);
 
@@ -46,7 +46,7 @@ public function insert(array $values)
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParent())
+        if ($relation = $this->model->getParentRelation())
         {
             $relation->performInsert($this->model, $values);
 
@@ -67,7 +67,7 @@ public function insertGetId(array $values, $sequence = null)
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParent())
+        if ($relation = $this->model->getParentRelation())
         {
             $relation->performInsert($this->model, $values);
 
@@ -86,7 +86,7 @@ public function delete()
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParent())
+        if ($relation = $this->model->getParentRelation())
         {
             $relation->performDelete($this->model);
 
@@ -108,7 +108,7 @@ public function increment($column, $amount = 1, array $extra = array())
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParent())
+        if ($relation = $this->model->getParentRelation())
         {
             $value = $this->model->{$column};
 
@@ -138,7 +138,7 @@ public function decrement($column, $amount = 1, array $extra = array())
     {
         // Intercept operations on embedded models and delegate logic
         // to the parent relation instance.
-        if ($relation = $this->model->getParent())
+        if ($relation = $this->model->getParentRelation())
         {
             $value = $this->model->{$column};
 

src/Jenssegers/Mongodb/Model.php

@@ -35,7 +35,7 @@ abstract class Model extends \Jenssegers\Eloquent\Model {
      *
      * @var Relation
      */
-    protected $parent;
+    protected $parentRelation;
 
     /**
      * The connection resolver instance.
@@ -470,19 +470,19 @@ protected function pullAttributeValues($column, array $values)
      *
      * @param Relation $relation
      */
-    public function setParent(Relation $relation)
+    public function setParentRelation(Relation $relation)
     {
-        $this->parent = $relation;
+        $this->parentRelation = $relation;
     }
 
     /**
      * Get the parent relation.
      *
      * @return Relation
      */
-    public function getParent()
+    public function getParentRelation()
     {
-        return $this->parent;
+        return $this->parentRelation;
     }
 
     /**

src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php

@@ -94,7 +94,7 @@ public function initRelation(array $models, $relation)
     {
         foreach ($models as $model)
         {
-            $model->setParent($this);
+            $model->setParentRelation($this);
 
             $model->setRelation($relation, $this->related->newCollection());
         }
@@ -116,7 +116,7 @@ public function match(array $models, BaseCollection $results, $relation)
         {
             $results = $model->$relation()->getResults();
 
-            $model->setParent($this);
+            $model->setParentRelation($this);
 
             $model->setRelation($relation, $results);
         }
@@ -152,7 +152,7 @@ public function count()
      */
     public function save(Model $model)
     {
-        $model->setParent($this);
+        $model->setParentRelation($this);
 
         return $model->save() ? $model : false;
     }
@@ -183,7 +183,7 @@ public function create(array $attributes)
         // on the models. Otherwise, some of these attributes will not get set.
         $instance = $this->related->newInstance($attributes);
 
-        $instance->setParent($this);
+        $instance->setParentRelation($this);
 
         $instance->save();
 
@@ -310,7 +310,7 @@ protected function toModel($attributes = array())
 
         $model = $this->related->newFromBuilder((array) $attributes);
 
-        $model->setParent($this);
+        $model->setParentRelation($this);
 
         $model->setRelation($this->foreignKey, $this->parent);
 
@@ -327,7 +327,7 @@ protected function toModel($attributes = array())
      */
     protected function getParentRelation()
     {
-        return $this->parent->getParent();
+        return $this->parent->getParentRelation();
     }
 
     /**

tests/ModelTest.php

@@ -267,29 +267,33 @@ public function testTouch()
 
 	public function testSoftDelete()
 	{
-		$user = new Soft;
-		$user->name = 'Softy';
-		$user->save();
+		Soft::create(array('name' => 'John Doe'));
+		Soft::create(array('name' => 'Jane Doe'));
+
+		$this->assertEquals(2, Soft::count());
+
+		$user = Soft::where('name', 'John Doe')->first();
 		$this->assertEquals(true, $user->exists);
+		$this->assertEquals(false, $user->trashed());
+		$this->assertNull($user->deleted_at);
 
 		$user->delete();
+		$this->assertEquals(true, $user->trashed());
+		$this->assertNotNull($user->deleted_at);
 
-		$check = Soft::find($user->_id);
-		$this->assertEquals(null, $check);
-
-		$all = Soft::get();
-		$this->assertEquals(0, $all->count());
+		$user = Soft::where('name', 'John Doe')->first();
+		$this->assertNull($user);
 
-		$all = Soft::withTrashed()->get();
-		$this->assertEquals(1, $all->count());
+		$this->assertEquals(1, Soft::count());
+		$this->assertEquals(2, Soft::withTrashed()->count());
 
-		$check = $all[0];
-		$this->assertInstanceOf('Carbon\Carbon', $check->deleted_at);
-		$this->assertEquals(true, $check->trashed());
+		$user = Soft::withTrashed()->where('name', 'John Doe')->first();
+		$this->assertNotNull($user);
+		$this->assertInstanceOf('Carbon\Carbon', $user->deleted_at);
+		$this->assertEquals(true, $user->trashed());
 
-		$check->restore();
-		$all = Soft::get();
-		$this->assertEquals(1, $all->count());
+		$user->restore();
+		$this->assertEquals(2, Soft::count());
 	}
 
 	public function testPrimaryKey()

tests/models/Soft.php

@@ -5,9 +5,10 @@
 
 class Soft extends Eloquent {
 
-	use SoftDeletingTrait;
+    use SoftDeletingTrait;
 
-	protected $collection = 'soft';
-	protected $dates = array('deleted_at');
+    protected $collection = 'soft';
+    protected static $unguarded = true;
+    protected $dates = array('deleted_at');
 
 }