Merge pull request #14 from ninjapenguin/attributes-per-spec

updates resource output to correctly nest attributes

Author: egeriis

src/EchoIt/JsonApi/Model.php

@@ -210,9 +210,15 @@ public function toArray()
             }
         }
 
-        // add type parameter
-        $attributes = $this->attributesToArray();
-        $attributes['type'] = $this->getResourceType();
+        //add type parameter
+        $model_attributes = $this->attributesToArray();
+        unset($model_attributes[$this->primaryKey]);
+
+        $attributes = [
+            'id'         => $this->getKey(),
+            'type'       => $this->getResourceType(),
+            'attributes' => $model_attributes
+        ];
 
         if (! count($relations)) {
             return $attributes;