Merge branch 'dev'

Author: dmolsen

Diff for: .editorconfig

@@ -2,7 +2,7 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = tab
+indent_style = space
 trim_trailing_whitespace = false
 end_of_line = lf
 insert_final_newline = true

Diff for: README.md

@@ -1,12 +1,9 @@
-![license](https://img.shields.io/github/license/pattern-lab/plugin-php-data-inheritance.svg?maxAge=2592000)
-[![Packagist](https://img.shields.io/packagist/v/pattern-lab/plugin-data-inheritance.svg?maxAge=2592000)](https://packagist.org/packages/pattern-lab/plugin-data-inheritance) [![Gitter](https://img.shields.io/gitter/room/pattern-lab/php.svg?maxAge=2592000)](https://gitter.im/pattern-lab/php)
+![license](https://img.shields.io/github/license/pattern-lab/plugin-php-data-inheritance.svg)
+[![Packagist](https://img.shields.io/packagist/v/pattern-lab/plugin-data-inheritance.svg)](https://packagist.org/packages/pattern-lab/plugin-data-inheritance) [![Gitter](https://img.shields.io/gitter/room/pattern-lab/php.svg)](https://gitter.im/pattern-lab/php)
 
 # Data Inheritance Plugin for Pattern Lab
 
-The Data Inheritance Plugin forces patterns to inherit data from their lineage. This allows data in included patterns to bubble
-to the top of the pattern stack. With this plugin pseudo-patterns become first-class citizens.
-
-This is a crap intro. Rewrite it.
+The Data Inheritance Plugin allows patterns to inherit data from patterns within its lineage. This means that data from included patterns is merged with the current pattern. The current pattern's data takes precedence.
 
 ## Installation
 

Diff for: src/PatternLab/DataInheritance/PatternLabListener.php

@@ -1,18 +1,19 @@
 <?php
 
 /*!
- * Faker Listener Class
+ * Data Inheritance Listener Class
  *
  * Copyright (c) 2016 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
  *
- * Adds Faker support to Pattern Lab
+ * Allows patterns to inherit data from patterns in their lineage
  *
  */
 
 namespace PatternLab\DataInheritance;
 
 use \PatternLab\Config;
+use \PatternLab\Data;
 use \PatternLab\PatternData;
 
 class PatternLabListener extends \PatternLab\Listener {
@@ -28,33 +29,46 @@ public function __construct() {
   }
 
   /**
-  * Fake some content. Replace the entire store.
+  * Look up data in lineages, update pattern store data, replace store
   */
   public function inherit() {
 
     if ((bool)Config::getOption("plugins.dataInheritance.enabled")) {
 
-      $store = PatternData::get();
+      $storeData        = Data::get();
+      $storePatternData = PatternData::get();
 
-      foreach ($store as $patternStoreKey => $patternData) {
+      foreach ($storePatternData as $patternStoreKey => $patternData) {
 
-        if (count($patternData["lineages"]) > 0) {
+        if (isset($patternData["lineages"]) && (count($patternData["lineages"]) > 0)) {
 
-          $data = PatternData::getPatternOption($patternStoreKey, "data");
+          $dataLineage = array();
 
           foreach($patternData["lineages"] as $lineage) {
 
-            $lineageData = PatternData::getPatternOption($lineage["lineagePattern"], "data");
-            $data = array_replace_recursive($data, $lineageData);
+            // merge the lineage data with the lineage store. newer/higher-level data is more important.
+            $lineageKey  = $lineage["lineagePattern"];
+            $lineageData = isset($storeData["patternSpecific"][$lineageKey]) && isset($storeData["patternSpecific"][$lineageKey]["data"]) ? $storeData["patternSpecific"][$lineageKey]["data"] : array();
+            if (!empty($lineageData)) {
+              $dataLineage = array_replace_recursive($dataLineage, $lineageData);
+            }
 
           }
 
-          PatternData::setPatternOption($patternStoreKey, "data", $data);
+          // merge the lineage data with the pattern data. pattern data is more important.
+          $dataPattern = isset($storeData["patternSpecific"][$patternStoreKey]) && isset($storeData["patternSpecific"][$patternStoreKey]["data"]) ? $storeData["patternSpecific"][$patternStoreKey]["data"] : array();
+          $dataPattern = array_replace_recursive($dataLineage, $dataPattern);
+          
+          if (!empty($dataPattern)) {
+            $storeData["patternSpecific"][$patternStoreKey]["data"] = $dataPattern;
+          }
 
         }
 
       }
 
+      Data::replaceStore($storeData);
+      
     }
 
   }