Hide interal embedded documents attribute, fixes #229

src/Jenssegers/Mongodb/Model.php

@@ -228,12 +228,28 @@ abstract class Model extends \Jenssegers\Eloquent\Model {
         // MongoDB related objects to a string representation. This kind
         // of mimics the SQL behaviour so that dates are formatted
         // nicely when your models are converted to JSON.
-        foreach ($attributes as &$value)
+        foreach ($attributes as $key => &$value)
         {
             if ($value instanceof MongoId)
             {
                 $value = (string) $value;
             }
+
+            // If the attribute starts with an underscore, it might be the
+            // internal array of embedded documents. In that case, we need
+            // to hide these from the output so that the relation-based
+            // attribute can take over.
+            else if (starts_with($key, '_'))
+            {
+                $camelKey = camel_case($key);
+
+                // If we can find a method that responds to this relation we
+                // will remove it from the output.
+                if (method_exists($this, $camelKey))
+                {
+                    unset($attributes[$key]);
+                }
+            }
         }
 
         return $attributes;

src/Jenssegers/Mongodb/Query/Builder.php

@@ -663,6 +663,31 @@ class Builder extends \Illuminate\Database\Query\Builder {
         return $id;
     }
 
+    /**
+     * Add a basic where clause to the query.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  mixed   $value
+     * @param  string  $boolean
+     * @return \Illuminate\Database\Query\Builder|static
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function where($column, $operator = null, $value = null, $boolean = 'and')
+    {
+        // Remove the leading $ from operators.
+        if (func_num_args() == 3)
+        {
+            if (starts_with($operator, '$'))
+            {
+                $operator = substr($operator, 1);
+            }
+        }
+
+        return parent::where($column, $operator, $value, $boolean);
+    }
+
     /**
      * Compile the where array.
      *

tests/EmbeddedRelationsTest.php

@@ -82,6 +82,16 @@ class EmbeddedRelationsTest extends TestCase {
         $this->assertEquals(array('London', 'Manhattan', 'Bruxelles'), $freshUser->addresses->lists('city'));
     }
 
+    public function testEmbedsToArray()
+    {
+        $user = User::create(array('name' => 'John Doe'));
+        $user->addresses()->saveMany(array(new Address(array('city' => 'London')), new Address(array('city' => 'Bristol'))));
+
+        $array = $user->toArray();
+        $this->assertFalse(array_key_exists('_addresses', $array));
+        $this->assertTrue(array_key_exists('addresses', $array));
+    }
+
     public function testEmbedsManyAssociate()
     {
         $user = User::create(array('name' => 'John Doe'));

tests/QueryBuilderTest.php

@@ -520,6 +520,9 @@ class QueryBuilderTest extends TestCase {
 		$results = DB::collection('items')->where('tags', 'size', 2)->get();
 		$this->assertEquals(2, count($results));
 
+		$results = DB::collection('items')->where('tags', '$size', 2)->get();
+		$this->assertEquals(2, count($results));
+
 		$results = DB::collection('items')->where('tags', 'size', 3)->get();
 		$this->assertEquals(0, count($results));