Fixed programatically loading a pattern with custom data.

src/Primer/Renderable/Pattern.php

@@ -87,7 +87,8 @@ public function __construct($id, $customData = array())
         $this->loadCopy();
 
         // Load the data
-        $this->loadData($customData);
+        $this->loadData();
+        $this->setData($customData);
     }
 
     /**

src/Primer/Templating/ViewData.php

@@ -32,15 +32,15 @@ public function merge($data)
     {
         $arr = [];
 
-        if (get_class($data) == ViewData::class) {
-            $arr = $data->toArray();
-        } elseif (is_array($data)) {
+        if (is_array($data)) {
             $arr = $data;
+        } elseif (get_class($data) == ViewData::class) {
+            $arr = $data->toArray();
         } else {
             throw new Exception('Unexpected data type passed to ViewData merge function');
         }
 
-        $this->setDataFromArray($data->toArray());
+        $this->setDataFromArray($arr);
     }
 
     protected function setDataFromArray(array $data)

tests/PatternTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rareloop\Primer\Tests;
+
+use Rareloop\Primer\Primer;
+use Rareloop\Primer\Renderable\Pattern;
+use Rareloop\Primer\TemplateEngine\Handlebars\Template as HandlebarsTemplateEngine;
+
+class PatternTest extends \PHPUnit_Framework_TestCase
+{
+    protected $primer;
+
+    public function testCustomPatternData()
+    {
+        $primer = Primer::start(array(
+            'basePath' => __DIR__.'/primer-test',
+            'templateClass' => HandlebarsTemplateEngine::class,
+        ));
+
+        $pattern = new Pattern('components/patterns/custom-data', [
+            'name' => 'Test name',
+        ]);
+
+        $output = $pattern->render(false);
+        $this->assertEquals("Test name", $output);
+    }
+}

tests/primer-test/patterns/components/patterns/custom-data/template.hbs

@@ -0,0 +1 @@
+{{ name }}