Merge branch 'dev' of https://github.com/pattern-lab/plugin-php-data-…

…inheritance into dev
pattern-lab · Jun 30, 2016 · b949887 · b949887
2 parents 6734b88 + 7070063
commit b949887
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -3,10 +3,7 @@
 
 # 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 --git a/src/PatternLab/DataInheritance/PatternLabListener.php b/src/PatternLab/DataInheritance/PatternLabListener.php
@@ -13,6 +13,7 @@
 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);
+
     }
 
   }