Merge branch 'master' of github.com:jenssegers/Laravel-MongoDB

Author: jenssegers

src/Jenssegers/Mongodb/Relations/EmbedsMany.php

@@ -166,7 +166,7 @@ public function save(Model $model)
         $this->updateTimestamps($model);
 
         // Insert a new document.
-        if ( ! $model->exists)
+        if ( ! $this->contains($model))
         {
             $result = $this->performInsert($model);
         }
@@ -196,6 +196,22 @@ public function count()
         return count($this->getEmbeddedRecords());
     }
 
+    /**
+     * Indicate if a model is already contained in the embedded documents
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return bool
+     */
+    public function contains(Model $model)
+    {
+        foreach ($this->getEmbeddedRecords() as $record)
+        {
+            if ($record[$model->getKeyName()] == $model->getKey()) return true;
+        }
+
+        return false;
+    }
+
     /**
      * Attach a model instance to the parent model without persistence.
      *
@@ -205,7 +221,7 @@ public function count()
     public function associate(Model $model)
     {
         // Insert the related model in the parent instance
-        if ( ! $model->exists)
+        if ( ! $this->contains($model))
         {
             return $this->associateNew($model);
         }

tests/RelationsTest.php

@@ -399,6 +399,10 @@ public function testEmbedsManyDuplicate()
         $user->addresses()->save($address);
         $this->assertEquals(1, $user->addresses->count());
         $this->assertEquals(array('Paris'), $user->addresses->lists('city'));
+
+        $user->addresses()->create(array('_id' => $address->_id, 'city' => 'Bruxelles'));
+        $this->assertEquals(1, $user->addresses->count());
+        $this->assertEquals(array('Bruxelles'), $user->addresses->lists('city'));
     }
 
     public function testEmbedsManyCreate()
@@ -521,7 +525,7 @@ public function testEmbedsManyUpdatingEventReturnsFalse()
     {
         $user = User::create(array('name' => 'John Doe'));
         $address = new Address(array('city' => 'New York'));
-        $address->exists = true;
+        $user->addresses()->save($address);
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
         $events->shouldReceive('until')->once()->with('eloquent.saving: '.get_class($address), $address)->andReturn(true);