removed generator; added callback for user permissions

.gitignore

@@ -1 +1,3 @@
 /.idea
+/vendor
+/composer.lock

composer.json

@@ -8,11 +8,7 @@
         }
     ],
     "require": {
-      "php": ">=5.5.9",
-      "illuminate/database": "5.1.x-dev"
-    },
-    "require-dev": {
-      "vlucas/phpdotenv": "~1.0"
+      "laravel/lumen-framework": "5.1.x-dev"
     },
     "autoload": {
       "psr-4": {

src/Generator/LuGenerator.php

@@ -1,269 +0,0 @@
-<?php
-
-namespace Luticate\Generator;
-
-use PDO;
-use Twig_Autoloader;
-use Twig_Environment;
-use Twig_Loader_Filesystem;
-
-class LuGenerator {
-    private $_pdo;
-
-    public function __construct($db_connection, $db_database, $db_host, $db_port, $db_username, $db_password)
-    {
-        $dsn = $db_connection . ":dbname=" . $db_database . ";host="
-            . $db_host . ";port=" . $db_port;
-        $this->_pdo = new PDO($dsn, $db_username, $db_password);
-    }
-
-    protected function printError($query, $message)
-    {
-        echo $message . "\n";
-        var_dump($query->errorInfo());
-        var_dump($this->_pdo->errorInfo());
-        return null;
-    }
-
-    protected function buildTwigVars($vars)
-    {
-        foreach ($vars as $key => $value)
-        {
-            if (is_array($value))
-                $vars[$key] = $this->buildTwigVars($value);
-            else if (is_string($value))
-            {
-                $vars[$key] = array(
-                    "as_it" => $value,
-                    "camel_upper" => $this->snakeToCamelCase($value, true),
-                    "camel_lower" => $this->snakeToCamelCase($value, false)
-                );
-            }
-        }
-        return $vars;
-    }
-
-    protected function buildTwig($templateFile, $destFile, $vars)
-    {
-        $twig_vars = $this->buildTwigVars($vars);
-
-        Twig_Autoloader::register();
-        $loader = new Twig_Loader_Filesystem(__DIR__ );
-        $twig = new Twig_Environment($loader, array());
-        $template = $twig->loadTemplate($templateFile . '.twig');
-        $content = $template->render($twig_vars);
-        file_put_contents($destFile, $content);
-    }
-
-    public function getTables()
-    {
-        $tablesQuery = $this->_pdo->prepare("SELECT table_name
-FROM information_schema.tables
-WHERE table_type = 'BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'information_schema')");
-        if ($tablesQuery->execute(array())) {
-            $tables = $tablesQuery->fetchAll();
-            echo "Found " . count($tables) . " tables\n";
-            return $tables;
-        }
-        else
-            return $this->printError($tablesQuery, "Failed to get tables");
-    }
-
-    public function getColumns($table_name)
-    {
-        $columnsQuery = $this->_pdo->prepare("SELECT column_name as name, data_type as data_type FROM information_schema.columns WHERE table_name = :table_name");
-        if ($columnsQuery->execute(array(":table_name" => $table_name)))
-        {
-            $columns = $columnsQuery->fetchAll();
-            echo "Found " . count($columns) . " columns in table " . $table_name . "\n";
-            return $columns;
-        }
-        else
-            return $this->printError($columnsQuery, "Failed to get columns from " . $table_name);
-    }
-
-    function snakeToCamelCase($string, $capitalizeFirstCharacter) {
-        $str = preg_replace_callback("/_[a-zA-Z]/", function($matches)
-        {
-            return strtoupper($matches[0][1]);
-        }, $string);
-        if ($capitalizeFirstCharacter)
-            $str[0] = strtoupper($str[0]);
-        return $str;
-    }
-
-    public function sqlTypeToPhpType($type)
-    {
-        if ($type == "character" || $type == "character varying")
-            return "string";
-        return $type;
-    }
-
-    public function sqlTypesToPhpTypes($array)
-    {
-        foreach ($array as $key => $value)
-        {
-            $array[$key]["data_type"] = array(
-                "sql" => $array[$key]["data_type"],
-                "php" => $this->sqlTypeToPhpType($array[$key]["data_type"])
-            );
-        }
-        return $array;
-    }
-
-    public function generateDbo($name, $columns, $file)
-    {
-        $vars = array(
-            "dbo_name" => $name,
-            "columns" => $columns
-        );
-        $this->buildTwig('dbo.php', $file, $vars);
-    }
-
-    public function generateModel($modelName, $dboName, $columns, $file)
-    {
-        $vars = array(
-            "model_name" => $modelName,
-            "dbo_name" => $dboName,
-            "columns" => $columns
-        );
-        $this->buildTwig('model.php', $file, $vars);
-    }
-
-    public function getStoredProcedures()
-    {
-        $spQuery = $this->_pdo->prepare("SELECT r.routine_name AS sp_name, r.data_type AS data_type, proc.proretset AS proretset
-FROM information_schema.routines r
-LEFT JOIN pg_catalog.pg_proc proc ON proc.proname = r.routine_name
-WHERE r.specific_schema='public'");
-        if ($spQuery->execute())
-        {
-            $sp = $spQuery->fetchAll();
-            echo "Found " . count($sp) . " stored procedures\n";
-            return $sp;
-        }
-        else
-            return $this->printError($spQuery, "Failed to get stored procedures");
-    }
-
-    public function getStoredProceduresArguments($sp)
-    {
-        $sp_name = $sp["sp_name"];
-        $spQuery = $this->_pdo->prepare("SELECT parameters.parameter_name as name, parameters.data_type, parameters.parameter_mode
-FROM information_schema.routines
-JOIN information_schema.parameters ON routines.specific_name=parameters.specific_name
-WHERE routines.specific_schema='public' AND routines.routine_name = :sp_name
-ORDER BY parameters.ordinal_position;");
-        if ($spQuery->execute(array("sp_name" => $sp_name)))
-        {
-            $sp_ = $spQuery->fetchAll();
-            $sps = array("in" => array(), "out" => array());
-            foreach ($sp_ as $p)
-                $sps[strtolower($p["parameter_mode"])][] = $p;
-            $out_count = count($sps['out']);
-            if ($out_count == 0)
-            {
-                $sps['out'][] = array(
-                    "name" => $sp_name,
-                    "data_type" => $sp["data_type"],
-                    "parameter_mode" => "OUT"
-                );
-                $out_count = 1;
-            }
-            echo "Found " . count($sps['in']) . " input arguments for stored procedure " . $sp_name . "\n";
-            echo "Found " . $out_count . " output arguments for stored procedure " . $sp_name . "\n";
-            return $sps;
-        }
-        else
-            return $this->printError($spQuery, "Failed to get arguments for stored procedure " . $sp_name);
-    }
-
-    public function generateSp($sp, $args, $file)
-    {
-        $vars = array(
-            "sp" => $sp,
-            "args" => $args
-        );
-        $this->buildTwig('sp.php', $file, $vars);
-    }
-
-    public function generateDataAccess($dataAccessName, $modelName, $dboName, $file)
-    {
-        if (file_exists($file))
-            return;
-        $vars = array(
-            "data_access_name" => $dataAccessName,
-            "model_name" => $modelName,
-            "dbo_name" => $dboName
-        );
-        $this->buildTwig('dataaccess.php', $file, $vars);
-    }
-
-    public function generateBusiness($businessName, $dataAccessName, $dboName, $file)
-    {
-        if (file_exists($file))
-            return;
-        $vars = array(
-            "business_name" => $businessName,
-            "data_access_name" => $dataAccessName,
-            "dbo_name" => $dboName
-        );
-        $this->buildTwig('business.php', $file, $vars);
-    }
-
-    public function mkdir($dir, $dir_mode)
-    {
-        if (!file_exists($dir))
-            mkdir($dir, $dir_mode, true);
-    }
-
-    public function run($dir_mode, $dbo_dir, $model_dir, $sp_dir, $manager_dir, $business_dir)
-    {
-        $dbo_dir .= "/";
-        $model_dir .= "/";
-        $sp_dir .= "/";
-        $manager_dir .= "/";
-        $business_dir .= "/";
-
-        $this->mkdir($dbo_dir, $dir_mode);
-        $this->mkdir($model_dir, $dir_mode);
-        $this->mkdir($sp_dir, $dir_mode);
-        $this->mkdir($manager_dir, $dir_mode);
-        $this->mkdir($business_dir, $dir_mode);
-
-        $tables = $this->getTables();
-        if (!is_null($tables)) {
-            foreach ($tables as $table) {
-                $table_name = $table["table_name"];
-                $columns = $this->getColumns($table_name);
-                if (is_null($columns))
-                    continue;
-                $columns = $this->sqlTypesToPhpTypes($columns);
-                $baseName = $this->snakeToCamelCase($table_name, true);
-                $modelName = $baseName;
-                $dboName = $baseName . "Dbo";
-                $dataAccessName = $baseName . "DataAccess";
-                $businessName = $baseName . "Business";
-                $this->generateDbo($dboName, $columns, $dbo_dir . $dboName . ".php");
-                $this->generateModel($modelName, $dboName, $columns, $model_dir . $modelName . ".php");
-                $this->generateDataAccess($dataAccessName, $modelName, $dboName, $manager_dir . $dataAccessName . ".php");
-                $this->generateBusiness($businessName, $dataAccessName, $dboName, $business_dir . $businessName . ".php");
-            }
-        }
-        $sps = $this->getStoredProcedures();
-        if (!is_null($sps)) {
-            foreach ($sps as $sp)
-            {
-                $sp_name = $sp["sp_name"];
-                $args = $this->getStoredProceduresArguments($sp);
-                if (is_null($args))
-                    continue;
-                $args["in"] = $this->sqlTypesToPhpTypes($args["in"]);
-                $args["out"] = $this->sqlTypesToPhpTypes($args["out"]);
-                $sp_model_name = $this->snakeToCamelCase($sp_name, true);
-                $this->generateSp($sp, $args, $sp_dir . $sp_model_name . ".php");
-            }
-        }
-    }
-}
-

src/Generator/business.php.twig

@@ -1,14 +0,0 @@
-{{ "<?php" }}
-
-namespace App\Http\Business;
-
-use Luticate\Utils\LuBusiness;
-use App\Http\DataAccess\{{ data_access_name.as_it }};
-use App\Http\DBO\{{ dbo_name.as_it }};
-
-class {{ business_name.as_it }} extends LuBusiness {
-    public function __construct()
-    {
-        $this->dataAccess = new {{ data_access_name.as_it }}();
-    }
-}

src/Generator/dataaccess.php.twig

@@ -1,15 +0,0 @@
-{{ "<?php" }}
-
-namespace App\Http\DataAccess;
-
-use Luticate\Utils\LuDataAccess;
-use App\Http\DataAccess\Models\{{ model_name.as_it }};
-use App\Http\DBO\{{ dbo_name.as_it }};
-
-class {{ data_access_name.as_it }} extends LuDataAccess {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->model = new {{ model_name.as_it }}();
-    }
-}

src/Generator/dbo.php.twig

@@ -1,32 +0,0 @@
-{{ "<?php" }}
-
-namespace App\Http\DBO;
-
-use Luticate\Utils\LuDbo;
-
-class {{ dbo_name.camel_upper }} extends LuDbo {
-
-    public function jsonSerialize()
-    {
-        return array(
-{% for column in columns %}
-            "{{ column.name.camel_upper }}" => $this->_{{ column.name.camel_lower }}{{ loop.last ? "" : "," }}
-{% endfor %}
-        );
-    }
-{% for column in columns %}
-
-    /**
-     * @var {{ column.data_type.php.as_it }}
-     */
-    protected $_{{ column.name.camel_lower }};
-    public function get{{ column.name.camel_upper }}()
-    {
-        return $this->_{{ column.name.camel_lower }};
-    }
-    public function set{{ column.name.camel_upper }}($value)
-    {
-        $this->_{{ column.name.camel_lower }} = $value;
-    }
-{% endfor %}
-}

src/Generator/model.php.twig

@@ -1,43 +0,0 @@
-{{ "<?php" }}
-
-namespace App\Http\DataAccess\Models;
-
-use Luticate\Utils\LuModel;
-use App\Http\DBO\{{ dbo_name.camel_upper }};
-
-class {{ model_name.camel_upper }} extends LuModel
-{
-    function __construct()
-    {
-        parent::__construct();
-        $this->timestamps = false;
-    }
-
-    public function toDbo()
-    {
-        $dbo = new {{ dbo_name.camel_upper }}();
-
-{% for column in columns %}
-        $dbo->set{{ column.name.camel_upper }}($this->{{ column.name.as_it }});
-{% endfor %}
-
-        return $dbo;
-    }
-
-    /**
-     * @param $dbo \App\Http\DBO\{{ dbo_name.camel_upper }}
-     * @param $dam LuModel|null
-     * @return {{ model_name.camel_upper }}
-     */
-    public function fromDbo($dbo, $dam = null)
-    {
-        if (is_null($dam))
-            $dam = new {{ model_name.camel_upper }}();
-
-{% for column in columns %}
-        $dam->{{ column.name.as_it }} = $dbo->get{{ column.name.camel_upper }}();
-{% endfor %}
-
-        return $dam;
-    }
-}

src/Generator/sp.php.twig

@@ -1,50 +0,0 @@
-{{ "<?php" }}
-
-namespace App\Http\DataAccess\SP;
-
-use Luticate\Utils\LuSpModel;
-use Illuminate\Support\Facades\DB;
-
-class {{ sp.sp_name.camel_upper }} extends LuSpModel {
-
-    protected static function damToDbo($dam)
-    {
-        if (is_null($dam))
-            return null;
-        $dbo = new {{ sp.sp_name.camel_upper }}();
-
-{% for arg in args.out %}
-        $dbo->set{{ arg.name.camel_upper }}($dam->{{ arg.name.as_it }});
-{% endfor %}
-
-        return $dbo;
-    }
-
-    public static function execute({% for arg in args.in %}${{ arg.name.as_it }}{{ loop.last ? "" : ", " }}{% endfor %})
-    {
-        $values = DB::select('SELECT * FROM {{ sp.sp_name.as_it }}({% for arg in args.in %}?{{ loop.last ? "" : ", " }}{% endfor %})', array({% for arg in args.in %}${{ arg.name.as_it }}{{ loop.last ? "" : ", " }}{% endfor %}));
-{% if sp.proretset %}
-        $dboValues = array();
-        foreach ($values as $value)
-            $dboValues[] = self::damToDbo($value);
-        return $dboValues;
-{% else %}
-        return self::damToDbo($values[0]);
-{% endif %}
-    }
-{% for arg in args.out %}
-
-    /**
-    * @var {{ arg.data_type.php.as_it }}
-    */
-    protected $_{{ arg.name.camel_lower }};
-    public function get{{ arg.name.camel_upper }}()
-    {
-        return $this->_{{ arg.name.camel_lower }};
-    }
-    public function set{{ arg.name.camel_upper }}($value)
-    {
-        $this->_{{ arg.name.camel_lower }} = $value;
-    }
-{% endfor %}
-}

src/Utils/LuRoute.php

@@ -3,28 +3,64 @@
 namespace Luticate\Utils;
 
 class LuRoute {
-    const GET  = 1;
-    const POST = 2;
-    const DEL  = 3;
-    const PUT  = 4;
 
-    public function addRoute($url, $business, $method, $verb, $permissions = array())
+    /**
+     * @var callable
+     */
+    private $isAllowed = null;
+
+    /**
+     * @param $func callable
+     */
+    public function setPermissionFunction(callable $func)
     {
-        global $app;
-        $opt = [function() use($business, $method)
+        $this->isAllowed = $func;
+    }
+
+    private function getOptions($url, $business, $method, $permissions = array())
+    {
+        $callback = $this->isAllowed;
+        return [function() use($business, $method, $permissions, $callback)
         {
+            if ($permissions == null) {
+                $permissions = array();
+            }
+            else if (!is_array($permissions)) {
+                $permissions = array($permissions);
+            }
+            if ($callback != null && !$callback($permissions)) {
+                abort(401, "User does not have this permission");
+            }
             $controller = new LuController();
 
-            return $controller->execute("App\\Http\\Business\\" . $business . "Business", $method);
+            if (strpos($business, "\\") === false)
+                $business = "App\\Http\\Business\\" . $business . "Business";
+
+            return $controller->execute($business, $method);
         }];
-        if ($verb == LuRoute::GET)
-            return $app->get($url, $opt);
-        else if ($verb == LuRoute::POST)
-            return $app->post($url, $opt);
-        else if ($verb == LuRoute::DEL)
-            return $app->delete($url, $opt);
-        else if ($verb == LuRoute::PUT)
-            return $app->put($url, $opt);
-        return null;
+    }
+
+    public function get($url, $business, $method, $permissions = array())
+    {
+        global $app;
+        return $app->get($url, $this->getOptions($url, $business, $method, $permissions));
+    }
+
+    public function post($url, $business, $method, $permissions = array())
+    {
+        global $app;
+        return $app->post($url, $this->getOptions($url, $business, $method, $permissions));
+    }
+
+    public function put($url, $business, $method, $permissions = array())
+    {
+        global $app;
+        return $app->put($url, $this->getOptions($url, $business, $method, $permissions));
+    }
+
+    public function delete($url, $business, $method, $permissions = array())
+    {
+        global $app;
+        return $app->delete($url, $this->getOptions($url, $business, $method, $permissions));
     }
 }