Merge branch 'master' into fix/issue-#2

.gitignore

@@ -1,3 +1,4 @@
 tags
 .php_cs.cache
-.idea
+.idea
+

README.md

@@ -13,11 +13,13 @@ $ artisan migrate
 
 ### In your model
 
-Set your model to use the `HasMetadata` trait, and add the public property `$metadataFallbacks`.
+Set your model to use the `HasMetadata` trait, and add the public property `$metadataFallbacks`. 
+Your model also need to use the HasMedias trait in order to allow for OpenGraph images.
 ```php
 class Page extends Model {
 
-    use HasMetadata;
+    use HasMetadata,
+        HasMedias;
 
     public $metadataFallbacks = [];             
 ...
@@ -55,7 +57,7 @@ In the admin 'form.blade.php' view add the metadata fieldset to the additional f
 @stop
 
 @section('fieldsets')
-    @metadata-fields
+    @metadataFields
 @stop
 ```
 

src/Models/Behaviours/HasMetadata.php

@@ -71,7 +71,11 @@ protected function initializeHasMetadata()
 
         // Add the default metadata from config into the $mediasParams array
         // by default adds in an 'og_image' role with a 'default' crop
-        $this->mediasParams = array_merge($this->mediasParams, config('metadata.mediasParams') );
+        if( isset($this->mediasParams) && is_Array($this->mediasParams)) {
+            $this->mediasParams = array_merge($this->mediasParams, config('metadata.mediasParams'));
+        } else {
+            $this->mediasParams = config('metadata.mediasParams');
+        }
     }
 
     public function usesTrait($trait) {

src/Models/Metadata.php

@@ -27,19 +27,6 @@ public function meta_describable() {
         return $this->morphTo();
     }
 
-//    //TODO - naming of this method?
-//    public function full() {
-//        $metadata = [];
-//        $exclude = ['id', 'created_at', 'updated_at', 'meta_describable_id', 'meta_describable_type', 'og_image'];
-//        $columns = array_diff($this->getTableColumns(), $exclude);
-//        foreach($columns as $column){
-//            $metadata[$column] = $this->field($column);
-//        }
-//
-//        $metadata['image'] = $this->meta_describable->getSocialImageAttribute();
-//
-//        return $metadata;
-//    }
 
     public function field($column)
     {