1. add web/view class

2. add web/help class 3. update example 4. refactor
scarwu · Aug 14, 2018 · 4ef0afb · 4ef0afb
1 parent b911ddd
commit 4ef0afb
Show file tree

Hide file tree

Showing 18 changed files with 250 additions and 60 deletions.
diff --git a/example/Web/controllers/AboutController.php b/example/Web/controllers/AboutController.php
@@ -16,22 +16,31 @@ class AboutController extends Controller
 {
     public function defaultAction()
     {
-        $this->res->html('about/default', [
+        $this->view->setLayoutPath('index');
+        $this->view->setContentPath('about/default');
+
+        $this->res->html($this->view->render([
             'title' => 'Oni - About / Default Page'
-        ]);
+        ]));
     }
 
     public function mvcAction()
     {
-        $this->res->html('about/mvc', [
+        $this->view->setLayoutPath('index');
+        $this->view->setContentPath('about/mvc');
+
+        $this->res->html($this->view->render([
             'title' => 'Oni - About / MVC Page'
-        ]);
+        ]));
     }
 
     public function mvvmAction()
     {
-        $this->res->html('about/mvvm', [
+        $this->view->setLayoutPath('index');
+        $this->view->setContentPath('about/mvvm');
+
+        $this->res->html($this->view->render([
             'title' => 'Oni - About / MVVM Page'
-        ]);
+        ]));
     }
 }
diff --git a/example/Web/controllers/MainController.php b/example/Web/controllers/MainController.php
@@ -16,7 +16,10 @@ class MainController extends Controller
 {
     public function defaultAction()
     {
-        $this->res->html('main/default', [
+        $this->view->setLayoutPath('index');
+        $this->view->setContentPath('main/default');
+
+        $this->res->html($this->view->render([
             'title' => 'Oni - A Lightweight PHP Framework for Web & CLI',
             'data' => [
                 'method' => $this->req->method(),
@@ -37,13 +40,16 @@ public function defaultAction()
                     'get' => $_GET
                 ]
             ]
-        ]);
+        ]));
     }
 
     public function errorAction()
     {
-        $this->res->html('main/error', [
+        $this->view->setLayoutPath('index');
+        $this->view->setContentPath('main/error');
+
+        $this->res->html($this->view->render([
             'title' => 'Oni - Error Page'
-        ]);
+        ]));
     }
 }
diff --git a/example/Web/views/index.php b/example/Web/views/index.php
@@ -3,6 +3,6 @@
     <title><?=$title?></title>
 </head>
 <body>
-    <?=$this->view->content()?>
+    <?=$this->loadContent()?>
 </body>
 </html>
diff --git a/src/Oni/CLI/App.php b/src/Oni/CLI/App.php
@@ -10,7 +10,6 @@
 
 namespace Oni\CLI;
 
-use Exception;
 use Oni\Basic;
 use Oni\Loader;
 use Oni\CLI\IO;

diff --git a/src/Oni/CLI/IO.php b/src/Oni/CLI/IO.php
@@ -10,7 +10,6 @@
 
 namespace Oni\CLI;
 
-use Exception;
 use Oni\Basic;
 
 class IO extends Basic

diff --git a/src/Oni/CLI/Task.php b/src/Oni/CLI/Task.php
@@ -10,7 +10,6 @@
 
 namespace Oni\CLI;
 
-use Exception;
 use Oni\Basic;
 use Oni\CLI\IO;
 

diff --git a/src/Oni/Loader.php b/src/Oni/Loader.php
@@ -10,8 +10,6 @@
 
 namespace Oni;
 
-use Exception;
-
 class Loader
 {
     /**

diff --git a/src/Oni/Web/App.php b/src/Oni/Web/App.php
@@ -10,11 +10,11 @@
 
 namespace Oni\Web;
 
-use Exception;
 use Oni\Basic;
 use Oni\Loader;
 use Oni\Web\Req;
 use Oni\Web\Res;
+use Oni\Web\View;
 
 class App extends Basic
 {
@@ -72,10 +72,6 @@ public function run()
             return true;
         }
 
-        // Set Response Attrs
-        $this->res->setAttr('view/path', $this->getAttr('view/path'));
-        $this->res->setAttr('view/ext', $this->getAttr('view/ext'));
-
         // Register Model Classes
         $namespace = $this->getAttr('model/namespace');
         $path = $this->getAttr('model/path');
@@ -229,7 +225,12 @@ private function loadController()
             $action = null;
         }
 
-        $instance = new $namespace($this->req, $this->res);
+        // Set View Attrs
+        $view = View::init();
+        $view->setAttr('path', $this->getAttr('view/path'));
+        $view->setAttr('ext', $this->getAttr('view/ext'));
+
+        $instance = new $namespace($this->req, $this->res, $view);
 
         switch ($instance->getAttr('mode')) {
         case 'page':
@@ -255,7 +256,7 @@ private function loadController()
                 }
 
                 $namespace = "{$namespace}\\{$handler}Controller";
-                $instance = new $namespace($this->req, $this->res);
+                $instance = new $namespace($this->req, $this->res, $view);
                 $action = $this->getAttr('controller/error/action') . 'Action';
 
                 if (false === method_exists($instance, $action)) {

diff --git a/src/Oni/Web/Controller/Page.php b/src/Oni/Web/Controller/Page.php
@@ -10,13 +10,18 @@
 
 namespace Oni\Web\Controller;
 
-use Exception;
 use Oni\Basic;
 use Oni\Web\Req;
 use Oni\Web\Res;
+use Oni\Web\View;
 
 abstract class Page extends Basic
 {
+    /**
+     * @var array
+     */
+    protected $view = null;
+
     /**
      * @var array
      */
@@ -30,7 +35,7 @@ abstract class Page extends Basic
     /**
      * Construct
      */
-    public function __construct($req = null, $res = null)
+    public function __construct($req = null, $res = null, $view = null)
     {
         // Set Default Attributes
         $this->_attr = [
@@ -40,6 +45,7 @@ public function __construct($req = null, $res = null)
         // Set Instance(s)
         $this->req = (null !== $req) ? $req : Req::init();
         $this->res = (null !== $res) ? $res : Res::init();
+        $this->view = (null !== $view) ? $view : View::init();
     }
 
     /**

diff --git a/src/Oni/Web/Controller/Rest.php b/src/Oni/Web/Controller/Rest.php
@@ -10,7 +10,6 @@
 
 namespace Oni\Web\Controller;
 
-use Exception;
 use Oni\Basic;
 use Oni\Web\Req;
 use Oni\Web\Res;

diff --git a/src/Oni/Web/Helper.php b/src/Oni/Web/Helper.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Helper
+ *
+ * @package     Oni
+ * @author      Scar Wu
+ * @copyright   Copyright (c) Scar Wu (https://scar.tw)
+ * @link        https://github.com/scarwu/Oni
+ */
+
+namespace Oni\Web;
+
+class Helper {
+
+    /**
+     * Create Link To
+     *
+     * @param string $link
+     * @param string $name
+     *
+     * @return string
+     */
+    public static function linkTo($link, $name)
+    {
+        $link = self::linkEncode($link);
+
+        return "<a href=\"{$link}\">{$name}</a>";
+    }
+
+    /**
+     * Link Encode
+     *
+     * @param string $link
+     *
+     * @return string
+     */
+    public static function linkEncode($link)
+    {
+        $segments = explode('/', $link);
+        $segments = array_map('rawurlencode', $segments);
+        $link = implode('/', $segments);
+
+        return $link;
+    }
+}
diff --git a/src/Oni/Web/Model.php b/src/Oni/Web/Model.php
@@ -10,7 +10,6 @@
 
 namespace Oni\Web;
 
-use Exception;
 use Oni\Basic;
 
 class Model extends Basic

diff --git a/src/Oni/Web/Req.php b/src/Oni/Web/Req.php
@@ -10,10 +10,7 @@
 
 namespace Oni\Web;
 
-use Exception;
-use Oni\Basic;
-
-class Req extends Basic
+class Req extends
 {
     /**
      * @var object

diff --git a/src/Oni/Web/Res.php b/src/Oni/Web/Res.php
@@ -10,10 +10,7 @@
 
 namespace Oni\Web;
 
-use Exception;
-use Oni\Basic;
-
-class Res extends Basic
+class Res extends
 {
     /**
      * @var object
@@ -25,14 +22,7 @@ class Res extends Basic
      *
      * This function is private, so this class is singleton pattern
      */
-    private function __construct()
-    {
-        // Set Default Attributes
-        $this->_attr = [
-            'view/path' => null,
-            'view/ext' => 'php'
-        ];
-    }
+    private function __construct() {}
 
     /**
      * Initialize
@@ -46,27 +36,26 @@ public static function init()
         return self::$_instance;
     }
 
+    /**
+     * Redirect
+     *
+     * @param string $path
+     */
+    public function redirect($path)
+    {
+        header("Location: {$path}");
+    }
+
     /**
      * Render HTML
      *
-     * @param string $_name
-     * @param array $_data
+     * @param string $data
      */
-    public function html($_name, $_data = [])
+    public function html($data)
     {
         header('Content-Type: text/html');
 
-        $_path = $this->getAttr('view/path');
-        $_ext = $this->getAttr('view/ext');
-        $_fullpath = "{$_path}/{$_name}.{$_ext}";
-
-        if (file_exists($_fullpath)) {
-            foreach ($_data as $_key => $_value) {
-                $$_key = $_value;
-            }
-
-            include $_fullpath;
-        }
+        echo $data;
     }
 
     /**

diff --git a/src/Oni/Web/Router.php b/src/Oni/Web/Router.php
@@ -10,7 +10,6 @@
 
 namespace Oni\Web;
 
-use Exception;
 use Oni\Basic;
 
 class Router extends Basic

diff --git a/src/Oni/Web/Store/Cache.php b/src/Oni/Web/Store/Cache.php
@@ -10,7 +10,6 @@
 
 namespace Oni\Web\Store;
 
-use Exception;
 use Memcached;
 use Oni\Basic;
 

diff --git a/src/Oni/Web/Store/Database.php b/src/Oni/Web/Store/Database.php
@@ -10,7 +10,6 @@
 
 namespace Oni\Web\Store;
 
-use Exception;
 use PDO;
 use Oni\Basic;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,6 @@ @@
     namespace Oni;
-    use Exception;
     class Loader
     {
         /**
@@ Expand Down @@