Merge pull request #1 from OliveCMS/v2

see change logs

Author: xtoolkit

.gitignore

@@ -5,4 +5,5 @@ test.php
 composer.phar
 composer.lock
 vendor/
+debugc/
 database*/

.travis.yml

@@ -5,7 +5,6 @@ php:
   - 5.6
   - 7.0
   - 7.1
-  - 7.2
 
 services:
   - mysql
@@ -16,9 +15,5 @@ before_script:
   - composer install
 
 script:
-  - chmod +x ./test/bash.sh
-  - chmod +x ./test/src/bexe.sh
-  - chmod +x ./test/src/lexe.sh
-  - export IS_TRAVIS_CI=dev
-  - cd test
-  - ./bash.sh -y
+  - chmod +x ./test/run
+  - ./test/run -y

CHANGELOG.md

@@ -1,6 +1,58 @@
 # Changelog
 
-# v1.0
+## v2.0
+
+UDSM now have D2T (Database 2 Table) mode! this option is a solution for when Addon can not auto create database! with this mode, app can create auto database.
+
+### Core changes:
+
+* Core class
+  1. review and rewrite all UDMS namespace classes
+  2. rename AppDataModel to AppModel
+  3. add `getAppModel`, `getAppModelData`, `setAppModelData`, `resetAppModel`, `setD2TMod`, `desD2TMode`, `getD2T` and `setD2T` methods
+  4. rewrite `listDatabases`, `existsDatabase`, `createDatabase`, `renameDatabase` and `dropDatabase` for match with **D2TMode**
+  5. rewrite `setAppModel` and `render` method
+  6. review and rewrite optimize for `AppModel`, `AppModelData`, `DatabaseModel` and `DatabaseModelData` methods
+  7. fix dropDatabase $keep bug
+  8. fix type (core class -> Core class)
+  9. fix valid name  check bug
+  10. add errors code for Exception method
+  11. update Documentation and Readme page
+  12. add D2TMode Documentation
+  13. add Errors Documentation
+* Common class
+  1. move path, `DatabaseModel`, `DatabaseModelData` and `addLog` methods to Core class
+  2. add `getCore` to reserved name
+* Database class:
+  1. add `getName` method
+  2. rewrite `listTable`, `createTable`, `existsTable`, `dropTable`, `renameTable` and `cleanTable` for match with **D2TMode**
+* Table class:
+  1. rewrite some line for match with **D2TMode**
+  2. add columns list to DatabaseModelData
+  3. set default value column type and lenght when null
+
+### Addons changes:
+
+* Json
+  1. review and rewrite optimize for db and dbc functions
+  2. rewrite point core methods
+* MongoDB
+  1. fix listTable function problem
+  2. review and rewrite optimize for db and dbc functions
+  3. rewrite point core methods
+* MySQL
+  1. fix get relation column type and lenght
+  2. fix set null column type and lenght
+  3. rewrite point core methods
+
+### Test case changes:
+
+1. rewrite with ColorConsole
+2. fix rmDir use with new Olive\\Tools
+3. add `D2TMode` case
+4. add addon cases and full test time
+
+## v1.0
 
 release fast project.
 

README.md

@@ -50,13 +50,29 @@ $udms->school->student->find(
 - [Usage Instructions](doc/01-usage.md)
 - [Utility Classes](doc/02-utilities.md)
 - [Addons Connect Instructions](doc/03-addons.md)
+- [D2TMode Instructions](doc/04-d2tmode.md)
+- [UDMS Errors](doc/05-error.md)
 
 ## Requirements
 
-- udms 2.x works with PHP 5.5+.
+- UDMS 2.x works with PHP 5.5+.
 - PDO mysql
 - php mongodb module
 
+# Versioning
+
+UDMS will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format:
+
+`<major>.<minor>.<patch>`
+
+And constructed with the following guidelines:
+
+    major -> Breaking backward compatibility bumps the major
+    minor -> New additions
+    patch -> Bug fixes
+
+For more information on SemVer, please visit http://semver.org.
+
 ## License
 
-UDMS is licensed under the [MIT license](http://opensource.org/licenses/MIT).
+olive-cms/udms is licensed under the [MIT license](http://opensource.org/licenses/MIT).

addons/Json/Point.php

@@ -1,16 +1,20 @@
 <?php
 namespace Olive\UDMS\Addon\Json;
 
+use Olive\Tools;
 use Olive\UDMS\Common as Common;
 use Olive\UDMS\Model\Addon as Addon;
-use Olive\Tools;
 class Point implements Addon
 {
     use Common;
 
+    private $cacheDB;
+
+    private $cacheDBC;
+
     public function createDatabase($name, $options)
     {
-        $dir = $this->getUCPath($name . '/json/');
+        $dir = $this->getCore->getUCPath($name . '/json/');
         if (! is_dir($dir)) {
             mkdir($dir);
         }
@@ -20,12 +24,12 @@ public function createDatabase($name, $options)
 
     public function dropDatabase($name)
     {
-        Tools::rmDir($this->getUCPath($name . '/json/'));
+        Tools::rmDir($this->getCore->getUCPath($name . '/json/'));
     }
 
     public function existsDatabase($name)
     {
-        if (file_exists($this->getUCPath($name . '/json/db.json'))) {
+        if (file_exists($this->getCore->getUCPath($name . '/json/db.json'))) {
             return true;
         } else {
             return false;
@@ -35,9 +39,9 @@ public function existsDatabase($name)
     public function listDatabases()
     {
         $return = [];
-        $dbdirs = Tools::getDirList($this->getUCPath());
+        $dbdirs = Tools::getDirList($this->getCore->getUCPath());
         foreach ($dbdirs as $db) {
-            if (file_exists($this->getUCPath($db . '/json/db.json'))) {
+            if (file_exists($this->getCore->getUCPath($db . '/json/db.json'))) {
                 $return[] = $db;
             }
         }
@@ -51,32 +55,32 @@ public function renameDatabase($name, $to)
 
     private function get_db($name)
     {
-        if (! isset($GLOBALS['__udms_global']['addon']['json']['db'][$name])) {
-            $GLOBALS['__udms_global']['addon']['json']['db'][$name] = Tools::getJsonFile($this->getUCPath($name . '/json/db.json'));
+        if (is_null($this->cacheDB)) {
+            $this->cacheDB = Tools::getJsonFile($this->getCore->getUCPath($name . '/json/db.json'));
         }
 
-        return $GLOBALS['__udms_global']['addon']['json']['db'][$name];
+        return $this->cacheDB;
     }
 
     private function update_db($name, $data = [])
     {
-        Tools::file($this->getUCPath($name . '/json/db.json'), Tools::jsonEncode($data));
-        $GLOBALS['__udms_global']['addon']['json']['db'][$name] = $data;
+        Tools::file($this->getCore->getUCPath($name . '/json/db.json'), Tools::jsonEncode($data));
+        $this->cacheDB = $data;
     }
 
     private function get_dbc($name)
     {
-        if (! isset($GLOBALS['__udms_global']['addon']['json']['config'][$name])) {
-            $GLOBALS['__udms_global']['addon']['json']['config'][$name] = Tools::getJsonFile($this->getUCPath($name . '/json/config.json'));
+        if (is_null($this->cacheDBC)) {
+            $this->cacheDBC = Tools::getJsonFile($this->getCore->getUCPath($name . '/json/config.json'));
         }
 
-        return $GLOBALS['__udms_global']['addon']['json']['config'][$name];
+        return $this->cacheDBC;
     }
 
     private function update_dbc($name, $data = [])
     {
-        Tools::file($this->getUCPath($name . '/json/config.json'), Tools::jsonEncode($data));
-        $GLOBALS['__udms_global']['addon']['json']['config'][$name] = $data;
+        Tools::file($this->getCore->getUCPath($name . '/json/config.json'), Tools::jsonEncode($data));
+        $this->cacheDBC = $data;
     }
 
     public function createTable($db, $name, $options)
@@ -221,9 +225,8 @@ public function get($db, $table)
         }
     }
 
-    public function __construct($path, $udmsCacheDir, $option = [])
+    public function __construct($point, $option = [])
     {
-        $this->setPath($path);
-        $this->setUCPath($udmsCacheDir);
+        $this->getCore = $point;
     }
 }

addons/MongoDB/Point.php

@@ -2,10 +2,10 @@
 namespace Olive\UDMS\Addon\MongoDB;
 
 use MongoDB as MDB;
+use Olive\Tools;
 use Olive\UDMS\Common as Common;
 use Olive\UDMS\Exception\Custom as UException;
 use Olive\UDMS\Model\Addon as Addon;
-use Olive\Tools;
 class Point implements Addon
 {
     use Common;
@@ -22,6 +22,8 @@ class Point implements Addon
 
     private $dse;
 
+    private $cacheDBC;
+
     public function createDatabase($name, $options)
     {
         $create = $this->service->$name->__udms_table;
@@ -30,7 +32,7 @@ public function createDatabase($name, $options)
             '__udms_id' => '0'
           ]
         );
-        $dir = $this->getUCPath($name . '/mongodb/');
+        $dir = $this->getCore->getUCPath($name . '/mongodb/');
         if (! is_dir($dir)) {
             mkdir($dir);
         }
@@ -126,7 +128,7 @@ public function listTables($db)
             $return[] = $ti['name'];
         }
 
-        return $return;
+        return array_diff($return, ['__udms_table']);
     }
 
     public function renameTable($db, $name, $to)
@@ -142,17 +144,17 @@ public function renameTable($db, $name, $to)
 
     private function get_dbc($name)
     {
-        if (! isset($GLOBALS['__udms_global']['addon']['mongodb']['config'][$name])) {
-            $GLOBALS['__udms_global']['addon']['mongodb']['config'][$name] = Tools::getJsonFile($this->getUCPath($name . '/mongodb/config.json'));
+        if (is_null($this->cacheDBC)) {
+            $this->cacheDBC = Tools::getJsonFile($this->getCore->getUCPath($name . '/mongodb/config.json'));
         }
 
-        return $GLOBALS['__udms_global']['addon']['mongodb']['config'][$name];
+        return $this->cacheDBC;
     }
 
     private function update_dbc($name, $data = [])
     {
-        Tools::file($this->getUCPath($name . '/mongodb/config.json'), Tools::jsonEncode($data));
-        $GLOBALS['__udms_global']['addon']['mongodb']['config'][$name] = $data;
+        Tools::file($this->getCore->getUCPath($name . '/mongodb/config.json'), Tools::jsonEncode($data));
+        $this->cacheDBC = $data;
     }
 
     public function createColumn($db, $table, $name, $options)
@@ -254,10 +256,9 @@ public function get($db, $table)
         }
     }
 
-    public function __construct($path, $udmsCacheDir, $option = [])
+    public function __construct($point, $option = [])
     {
-        $this->setPath($path);
-        $this->setUCPath($udmsCacheDir);
+        $this->getCore = $point;
         $this->option = $option;
         if (isset($option['login'])) {
             $login = $option['login'];
@@ -269,7 +270,7 @@ public function __construct($path, $udmsCacheDir, $option = [])
         try {
             $db = new MDB\Client($option['type'] . '://' . $option['host'], $login);
         } catch (Excepstion $e) {
-            throw new UException($this->getUCPath(), 'Can not connect to MongoDB.');
+            throw new UException($this->getCore->getUCPath(), 'Can not connect to MongoDB.', 200);
         }
         $this->service = $db;
     }