Ditch old model in favor of HybridRelations trait, move Model to the correct namespace

Author: jenssegers

README.md

@@ -106,15 +106,15 @@ Eloquent
 This package includes a MongoDB enabled Eloquent class that you can use to define models for corresponding collections.
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {}
 ```
 
 Note that we did not tell Eloquent which collection to use for the `User` model. Just like the original Eloquent, the lower-case, plural name of the class will be used as the table name unless another name is explicitly specified. You may specify a custom collection (alias for table) by defining a `collection` property on your model:
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
 
@@ -126,7 +126,7 @@ class User extends Eloquent {
 **NOTE:** Eloquent will also assume that each collection has a primary key column named id. You may define a `primaryKey` property to override this convention. Likewise, you may define a `connection` property to override the name of the database connection that should be used when utilizing the model.
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class MyModel extends Eloquent {
 
@@ -142,7 +142,7 @@ Everything else works just like the original Eloquent model. Read more about the
 You may also register an alias for the MongoDB model by adding the following to the alias array in `app/config/app.php`:
 
 ```php
-'Moloquent'       => 'Jenssegers\Mongodb\Model',
+'Moloquent'       => 'Jenssegers\Mongodb\Eloquent\Model',
 ```
 
 This will allow you to use the registered alias like:
@@ -232,10 +232,10 @@ MongoDB Support => enabled
 
 #### Argument 2 passed to Illuminate\Database\Query\Builder::__construct() must be an instance of Illuminate\Database\Query\Grammars\Grammar, null given
 
-To solve this, you will need to check two things. First check if your model is extending the correct class; this class should be `Jenssegers\Mongodb\Model`. Secondly, check if your model is using a MongoDB connection. If you did not change the default database connection in your database configuration file, you need to specify the MongoDB enabled connection. This is what your class should look like if you did not set up an alias and change the default database connection:
+To solve this, you will need to check two things. First check if your model is extending the correct class; this class should be `Jenssegers\Mongodb\Eloquent\Model`. Secondly, check if your model is using a MongoDB connection. If you did not change the default database connection in your database configuration file, you need to specify the MongoDB enabled connection. This is what your class should look like if you did not set up an alias and change the default database connection:
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
 
@@ -530,7 +530,7 @@ Eloquent allows you to work with Carbon/DateTime objects instead of MongoDate ob
 Example:
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
 
@@ -557,7 +557,7 @@ Supported relations are:
 Example:
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
 
@@ -572,7 +572,7 @@ class User extends Eloquent {
 And the inverse relation:
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Item extends Eloquent {
 
@@ -587,7 +587,7 @@ class Item extends Eloquent {
 The belongsToMany relation will not use a pivot "table", but will push id's to a __related_ids__ attribute instead. This makes the second parameter for the belongsToMany method useless. If you want to define custom keys for your relation, set it to `null`:
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
 
@@ -607,7 +607,7 @@ Other relations are not yet supported, but may be added in the future. Read more
 If you want to embed models, rather than referencing them, you can use the `embedsMany` relation. This relation is similar to the `hasMany` relation, but embeds the models inside the parent object.
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class User extends Eloquent {
 
@@ -702,7 +702,7 @@ $books = $user->books()->where('rating', '>', 5)->orderBy('title')->get();
 The embedsOne relation is similar to the EmbedsMany relation, but only embeds a single model.
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Book extends Eloquent {
 
@@ -750,15 +750,17 @@ $book->author()->save($newAuthor);
 
 ### MySQL Relations
 
-If you're using a hybrid MongoDB and SQL setup, you're in luck! The model will automatically return a MongoDB- or SQL-relation based on the type of the related model. Of course, if you want this functionality to work both ways, your SQL-models will need to extend `Jenssegers\Eloquent\Model`. Note that this functionality only works for hasOne, hasMany and belongsTo relations.
+If you're using a hybrid MongoDB and SQL setup, you're in luck! The model will automatically return a MongoDB- or SQL-relation based on the type of the related model. Of course, if you want this functionality to work both ways, your SQL-models will need use the `Jenssegers\Mongodb\Eloquent\HybridRelations` trait. Note that this functionality only works for hasOne, hasMany and belongsTo relations.
 
 Example SQL-based User model:
 
 ```php
-use Jenssegers\Eloquent\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\HybridRelations;
 
 class User extends Eloquent {
 
+    use HybridRelations;
+
     protected $connection = 'mysql';
 
     public function messages()
@@ -772,7 +774,7 @@ class User extends Eloquent {
 And the Mongodb-based Message model:
 
 ```php
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Message extends Eloquent {
 

src/Jenssegers/Eloquent/Model.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Str;
-use Jenssegers\Mongodb\Model;
+use Jenssegers\Mongodb\Eloquent\Model;
 use Jenssegers\Mongodb\Relations\BelongsTo;
 use Jenssegers\Mongodb\Relations\BelongsToMany;
 use Jenssegers\Mongodb\Relations\HasMany;
@@ -23,7 +23,7 @@ trait HybridRelations {
     public function hasOne($related, $foreignKey = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model'))
         {
             return parent::hasOne($related, $foreignKey, $localKey);
         }
@@ -50,7 +50,7 @@ public function hasOne($related, $foreignKey = null, $localKey = null)
     public function morphOne($related, $name, $type = null, $id = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model'))
         {
             return parent::morphOne($related, $name, $type, $id, $localKey );
         }
@@ -77,7 +77,7 @@ public function morphOne($related, $name, $type = null, $id = null, $localKey =
     public function hasMany($related, $foreignKey = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model'))
         {
             return parent::hasMany($related, $foreignKey, $localKey);
         }
@@ -104,7 +104,7 @@ public function hasMany($related, $foreignKey = null, $localKey = null)
     public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model'))
         {
             return parent::morphMany($related, $name, $type, $id, $localKey);
         }
@@ -145,7 +145,7 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
         }
 
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model'))
         {
             return parent::belongsTo($related, $foreignKey, $otherKey, $relation);
         }
@@ -238,7 +238,7 @@ public function belongsToMany($related, $collection = null, $foreignKey = null,
         }
 
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model'))
         {
             return parent::belongsToMany($related, $collection, $foreignKey, $otherKey, $relation);
         }

src/Jenssegers/Mongodb/Eloquent/HybridRelations.php

@@ -1,4 +1,4 @@
-<?php namespace Jenssegers\Mongodb;
+<?php namespace Jenssegers\Mongodb\Eloquent;
 
 use Carbon\Carbon;
 use DateTime;

src/Jenssegers/Mongodb/Model.php renamed to src/Jenssegers/Mongodb/Eloquent/Model.php

@@ -1,6 +1,7 @@
 <?php namespace Jenssegers\Mongodb;
 
 use Illuminate\Support\ServiceProvider;
+use Jenssegers\Mongodb\Eloquent\Model;
 
 class MongodbServiceProvider extends ServiceProvider {
 

src/Jenssegers/Mongodb/MongodbServiceProvider.php

@@ -13,7 +13,7 @@ public function tearDown()
     public function testNewModel()
     {
         $user = new User;
-        $this->assertInstanceOf('Jenssegers\Mongodb\Model', $user);
+        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Model', $user);
         $this->assertInstanceOf('Jenssegers\Mongodb\Connection', $user->getConnection());
         $this->assertEquals(false, $user->exists);
         $this->assertEquals('users', $user->getTable());
@@ -170,7 +170,7 @@ public function testFind()
 
         $check = User::find($user->_id);
 
-        $this->assertInstanceOf('Jenssegers\Mongodb\Model', $check);
+        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Model', $check);
         $this->assertEquals(true, $check->exists);
         $this->assertEquals($user->_id, $check->_id);
 
@@ -188,7 +188,7 @@ public function testGet()
         $users = User::get();
         $this->assertEquals(2, count($users));
         $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $users);
-        $this->assertInstanceOf('Jenssegers\Mongodb\Model', $users[0]);
+        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Model', $users[0]);
     }
 
     public function testFirst()
@@ -199,7 +199,7 @@ public function testFirst()
         ]);
 
         $user = User::first();
-        $this->assertInstanceOf('Jenssegers\Mongodb\Model', $user);
+        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Model', $user);
         $this->assertEquals('John Doe', $user->name);
     }
 
@@ -226,7 +226,7 @@ public function testCreate()
     {
         $user = User::create(['name' => 'Jane Poe']);
 
-        $this->assertInstanceOf('Jenssegers\Mongodb\Model', $user);
+        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Model', $user);
         $this->assertEquals(true, $user->exists);
         $this->assertEquals('Jane Poe', $user->name);
 
@@ -454,14 +454,14 @@ public function testRaw()
             return $collection->find(['age' => 35]);
         });
         $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $users);
-        $this->assertInstanceOf('Jenssegers\Mongodb\Model', $users[0]);
+        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Model', $users[0]);
 
         $user = User::raw(function ($collection)
         {
             return $collection->findOne(['age' => 35]);
         });
 
-        $this->assertInstanceOf('Jenssegers\Mongodb\Model', $user);
+        $this->assertInstanceOf('Jenssegers\Mongodb\Eloquent\Model', $user);
 
         $count = User::raw(function ($collection)
         {

tests/ModelTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Address extends Eloquent {
 

tests/models/Address.php

@@ -1,6 +1,6 @@
 <?php
 
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Book extends Eloquent {
 

tests/models/Book.php

@@ -1,6 +1,6 @@
 <?php
 
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Client extends Eloquent {
 

tests/models/Client.php

@@ -1,6 +1,6 @@
 <?php
 
-use Jenssegers\Mongodb\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
 
 class Group extends Eloquent {