Add store

pmvc-app · Jul 3, 2017 · c7e23b1 · c7e23b1
1 parent fabbd99
commit c7e23b1
Show file tree

Hide file tree

Showing 4 changed files with 183 additions and 148 deletions.
diff --git a/index.php b/index.php
@@ -20,35 +20,32 @@
 class dimension extends Action
 {
     private $_dot;
-    private $_folder;
-    private $_underscore;
     private $_inputs = [];
 
     function index($m, $f)
     {
-        $this->init();
+        $this->_dot = \PMVC\plug('dotenv');
         $options = $this->_dot->getUnderscoreToArray(
             \PMVC\get(
                 $this,
                 'options',
                 '.env.dimension'
             )
         );
+        $this->_dot[dotenv\ESCAPE] = \PMVC\get($options, dotenv\ESCAPE);
+        $allConfigs = $this->store()->getConfigs('.dimension.base');
+
+        // <!-- Reset Buckets
+        // Put after $allConfigs
         $resetBuckets = \PMVC\value(
             $options,
             explode('_', $f['UTM'])
         );
-        $this->_folder = \PMVC\lastSlash(\PMVC\getOption('dimensionFolder'));
-        if (!\PMVC\realpath($this->_folder)) {
-            return !trigger_error('Dimensions settings folder not exists. ['.$this->_folder.']');
-        }
-        $this->_dot[dotenv\ESCAPE] = \PMVC\get($options, dotenv\ESCAPE);
-        $allConfigs = $this->getConfigs('.dimension.base');
-
-        if (!empty($resetBuckets)) { //put after $allConfigs
+        if (!empty($resetBuckets)) { 
             $f['BUCKETS'] = explode(',', $resetBuckets);
             $allConfigs['resetBuckets'] = $resetBuckets;
         }
+        // Reset Buckets -->
 
         foreach($options['DIMENSIONS'] as $dimension)
         {
@@ -82,30 +79,6 @@ function index($m, $f)
         return $go;
     }
 
-    function init()
-    {
-        $this->_dot = \PMVC\plug('dotenv');
-        $this->_underscore = \PMVC\plug('underscore');
-    }
-
-    function processInputForOneDimension(array $flattenInputs, $dimension)
-    {
-        if (empty($flattenInputs)) {
-            return [];
-        }
-        if (\PMVC\isdev(DEBUG_KEY)) {
-            foreach ($flattenInputs as $i) {
-                $this->_inputs[$i] = $dimension;
-            }
-        }
-        if (count($flattenInputs)>1) {
-            return $this->getMultiInputConfigs($flattenInputs, $dimension);
-        } else {
-            $flattenInputs = reset($flattenInputs);
-            return $this->getOneInputConfigs($flattenInputs, $dimension);
-        }
-    }
-
     function getFlattenInput($f, $dimension)
     {
         $keys = explode('_',$dimension);
@@ -156,122 +129,23 @@ function flatten(array $array)
         return array_keys($lines);
     }
 
-    function getMultiInputConfigs($inputs, $dimension)
+    function processInputForOneDimension(array $flattenInputs, $dimension)
     {
-        $allKeys = [];
-        $allKeyMap = [];
-        $allConfigs = [];
-        foreach($inputs as $input)
-        {
-            $arr = $this->getOneInputConfigs($input, $dimension);
-
-            // <!-- Verify Conflict
-            $keys = $this->_underscore
-                ->array()
-                ->toUnderscore($arr);
-            $keys = array_keys($keys);
-            $found = false;
-            foreach($keys as $key)
-            {
-                if (isset($allKeyMap[$key])) {
-                    $found = $key;
-                } else {
-                    foreach ($allKeys as $aV) {
-                       if (0===strpos($aV,$key) || 0===strpos($key,$aV)) {
-                            $found=$aV;
-                            break;
-                       }
-                    }
-                    if (!$found) {
-                        $allKeys[] = $key;
-                        $allKeyMap[$key] = $input;
-                        continue;
-                    }
-                }
-                trigger_error('Conflict for '.$dimension.' key: ['.$found.'].'.
-                    ' Between ['.$allKeyMap[$found].'] and ['.$input.']'
-                );
+        if (empty($flattenInputs)) {
+            return [];
+        }
+        if (\PMVC\isdev(DEBUG_KEY)) {
+            foreach ($flattenInputs as $i) {
+                $this->_inputs[$i] = $dimension;
             }
-            // -->
-
-            $allConfigs = array_replace_recursive(   
-                $allConfigs,   
-                $arr
-            );
         }
-        return $allConfigs;
-    }
-
-    function getOneInputConfigs($input, $dimension)
-    {
-        $file = $this->getOneInputFile($input, $dimension);
-        $configs =  $this->getConfigs($file);
-        if (!empty($configs['base'])) {
-            $baseFile = $this->getOneInputFile($configs['base'], $dimension);
-            $baseConfigs =  $this->getConfigs($baseFile);
-            $configs = array_replace_recursive(   
-                $baseConfigs,   
-                $configs
-            );
+        $store = $this->store();
+        if (count($flattenInputs)>1) {
+            return $store->getMultiInputConfigs($flattenInputs, $dimension);
+        } else {
+            $flattenInputs = reset($flattenInputs);
+            return $store->getOneInputConfigs($flattenInputs, $dimension);
         }
-        return $configs;
-    }
-
-    function getOneInputFile($input, $dimension)
-    {
-        return '.dimension.'.$dimension.'.'.$input;
     }
 
-    function getConfigs($file)
-    {
-        $path = $this->_folder.$file;
-        $allFile = glob($path.'.*');
-        if (\PMVC\realPath($path)) {
-            $allFile[]=$path;
-        }
-        $allKeys = [];
-        $allConfigs = [];
-        foreach($allFile as $file)
-        {
-            $arr = $this->_dot->getUnderscoreToArray($file);
-            if (!is_array($arr)) {
-                trigger_error(
-                    '[\PMVC\App\dimension\getConfigs] '.
-                    'Parse dimension setting fail. ['.$file.']'
-                );
-                return [];
-            }
-
-            // <!-- check if key conflict
-            $keys = $this->_underscore
-                ->array()
-                ->toUnderscore($arr);
-            $keys = array_keys($keys);
-            foreach($keys as $key)
-            {
-                if (!isset($allKeys[$key])) {
-                    $allKeys[$key] = $file;
-                } else {
-                    trigger_error('Conflict for key: ['.$key.'].'.
-                        ' Between ['.$allKeys[$key].'] and ['.$file.']'
-                    );
-                }
-            }
-            // -->
-
-            \PMVC\dev(function() use ($allConfigs, $arr, $file) {
-                return [
-                    'before'=> $allConfigs,
-                    'merge' => $arr,
-                    'with'  => $file
-                ];
-            }, DEBUG_KEY.'-file');
-
-            $allConfigs = array_replace_recursive(
-                $allConfigs,   
-                $arr
-            );
-        }
-        return $allConfigs;
-    }
 }
diff --git a/src/_store.php b/src/_store.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PMVC\App\dimension;
+
+use DomainException; 
+
+${_INIT_CONFIG}[_CLASS] = __NAMESPACE__.'\Store';
+
+class Store
+{
+    private $_folder;
+    private $_dot;
+    private $_underscore;
+
+    public function __construct()
+    {
+        $this->_dot = \PMVC\plug('dotenv');
+        $this->_underscore = \PMVC\plug('underscore');
+        $this->_folder = \PMVC\lastSlash(\PMVC\getOption('dimensionFolder'));
+        if (!\PMVC\realpath($this->_folder)) {
+            throw new DomainException('Dimensions settings folder not exists. ['.$this->_folder.']');
+        }
+    }
+
+    public function __invoke()
+    {
+        return $this;
+    }
+
+    function getMultiInputConfigs($inputs, $dimension)
+    {
+        $allKeys = [];
+        $allKeyMap = [];
+        $allConfigs = [];
+        foreach($inputs as $input)
+        {
+            $arr = $this->getOneInputConfigs($input, $dimension);
+
+            // <!-- Verify Conflict
+            $keys = $this->_underscore
+                ->array()
+                ->toUnderscore($arr);
+            $keys = array_keys($keys);
+            $found = false;
+            foreach($keys as $key)
+            {
+                if (isset($allKeyMap[$key])) {
+                    $found = $key;
+                } else {
+                    foreach ($allKeys as $aV) {
+                       if (0===strpos($aV,$key) || 0===strpos($key,$aV)) {
+                            $found=$aV;
+                            break;
+                       }
+                    }
+                    if (!$found) {
+                        $allKeys[] = $key;
+                        $allKeyMap[$key] = $input;
+                        continue;
+                    }
+                }
+                trigger_error('Conflict for '.$dimension.' key: ['.$found.'].'.
+                    ' Between ['.$allKeyMap[$found].'] and ['.$input.']'
+                );
+            }
+            // -->
+
+            $allConfigs = array_replace_recursive(   
+                $allConfigs,   
+                $arr
+            );
+        }
+        return $allConfigs;
+    }
+
+    function getOneInputConfigs($input, $dimension)
+    {
+        $file = $this->getOneInputFile($input, $dimension);
+        $configs =  $this->getConfigs($file);
+        if (!empty($configs['base'])) {
+            $baseFile = $this->getOneInputFile($configs['base'], $dimension);
+            $baseConfigs =  $this->getConfigs($baseFile);
+            $configs = array_replace_recursive(   
+                $baseConfigs,   
+                $configs
+            );
+        }
+        return $configs;
+    }
+
+    function getOneInputFile($input, $dimension)
+    {
+        return '.dimension.'.$dimension.'.'.$input;
+    }
+
+    function getConfigs($file)
+    {
+        $path = $this->_folder.$file;
+        $allFile = glob($path.'.*');
+        if (\PMVC\realPath($path)) {
+            $allFile[]=$path;
+        }
+        $allKeys = [];
+        $allConfigs = [];
+        foreach($allFile as $file)
+        {
+            $arr = $this->_dot->getUnderscoreToArray($file);
+            if (!is_array($arr)) {
+                trigger_error(
+                    '[\PMVC\App\dimension\getConfigs] '.
+                    'Parse dimension setting fail. ['.$file.']'
+                );
+                return [];
+            }
+
+            // <!-- check if key conflict
+            $keys = $this->_underscore
+                ->array()
+                ->toUnderscore($arr);
+            $keys = array_keys($keys);
+            foreach($keys as $key)
+            {
+                if (!isset($allKeys[$key])) {
+                    $allKeys[$key] = $file;
+                } else {
+                    trigger_error('Conflict for key: ['.$key.'].'.
+                        ' Between ['.$allKeys[$key].'] and ['.$file.']'
+                    );
+                }
+            }
+            // -->
+
+            \PMVC\dev(function() use ($allConfigs, $arr, $file) {
+                return [
+                    'before'=> $allConfigs,
+                    'merge' => $arr,
+                    'with'  => $file
+                ];
+            }, DEBUG_KEY.'-file');
+
+            $allConfigs = array_replace_recursive(
+                $allConfigs,   
+                $arr
+            );
+        }
+        return $allConfigs;
+    }
+}
diff --git a/tests/include.php b/tests/include.php
@@ -9,7 +9,6 @@
 
 \PMVC\Load::plug(['controller'=>null]);
 \PMVC\l(vendorDir.'pmvc-plugin/controller/tests/resources/FakeView.php');
-\PMVC\option('set', 'dimensionFolder', __DIR__.'/resources');
 
 $pDot = \PMVC\plug('dotenv');
 $pDot[\PMVC\PlugIn\dotenv\ENV_FOLDER] = __DIR__.'/resources';