Merge branch 'master' of https://github.com/dmstr/yii2-prototype-module

Author: schmunk42

src/commands/PrototypeController.php

@@ -33,7 +33,7 @@
 class PrototypeController extends Controller
 {
 
-    public $escapeFileNames = false;
+    public $escapeFileNames = true;
     public $exportPath = '@runtime/export';
 
     /**
@@ -57,17 +57,17 @@ public function actions()
         $actions['export-html'] = [
             'class' => ExportAction::class,
             'modelClass' => Html::class,
-            'extention' => 'html',
+            'extension' => 'html',
         ];
         $actions['export-less'] = [
             'class' => ExportAction::class,
             'modelClass' => Less::class,
-            'extention' => 'less',
+            'extension' => 'less',
         ];
         $actions['export-twig'] = [
             'class' => ExportAction::class,
             'modelClass' => Twig::class,
-            'extention' => 'twig',
+            'extension' => 'twig',
         ];
         return $actions;
     }
@@ -77,7 +77,6 @@ public function actions()
      *
      * Returns path alias if alias defined otherwise return plain path
      * Removes slash from end
-     * Add sub dir with name of extention
      */
     public function getExportPath()
     {

src/commands/actions/ExportAction.php

@@ -31,13 +31,13 @@
  * @author Elias Luhr <[email protected]>
  *
  * @property ActiveRecord modelClass
- * @property  string extention
+ * @property  string extension
  * @property  PrototypeController controller
  */
 class ExportAction extends Action
 {
     public $modelClass;
-    public $extention;
+    public $extension;
 
     private static $availableModelTypes = [
         Html::class,
@@ -53,7 +53,7 @@ class ExportAction extends Action
     protected function run()
     {
 
-        $this->controller->stdout("Exporting {$this->extention} files" . PHP_EOL, Console::FG_BLUE);
+        $this->controller->stdout("Exporting {$this->extension} files" . PHP_EOL, Console::FG_BLUE);
         if (!class_exists($this->modelClass)) {
             $this->controller->stderr("Model class '{$this->modelClass}' does not exist", Console::FG_RED);
             return ExitCode::IOERR;
@@ -83,7 +83,15 @@ protected function run()
                 $fileName = Inflector::slug(str_replace('/','-',$entry->key));
             }
             try {
-                if (file_put_contents($exportPath . DIRECTORY_SEPARATOR . $fileName . '.' . $this->extention, $entry->value) === false) {
+                // check if filename "looks" like a path, if yes, we must create subdirs
+                if ($fileName !== basename($fileName)) {
+                    $subDir = $exportPath . DIRECTORY_SEPARATOR . trim(dirname($fileName), DIRECTORY_SEPARATOR);
+                    if (!FileHelper::createDirectory($subDir)) {
+                        throw new ErrorException("Error while creating sub directory '{$subDir}' for file '{$fileName}'");
+                    }
+                }
+
+                if (file_put_contents($exportPath . DIRECTORY_SEPARATOR . $fileName . '.' . $this->extension, $entry->value) === false) {
                     throw new ErrorException("Error while writing file for key '{$entry->key}'");
                 }
                 $this->controller->stdout('.');

src/migrations/m211116_101347_add_timestamp_cols.php

@@ -0,0 +1,22 @@
+<?php
+
+use yii\db\Migration;
+
+class m211116_101347_add_timestamp_cols extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('{{%twig}}', 'created_at', $this->dateTime()->null());
+        $this->addColumn('{{%twig}}', 'updated_at', $this->dateTime()->null());
+        $this->addColumn('{{%less}}', 'created_at', $this->dateTime()->null());
+        $this->addColumn('{{%less}}', 'updated_at', $this->dateTime()->null());
+        $this->addColumn('{{%html}}', 'created_at', $this->dateTime()->null());
+        $this->addColumn('{{%html}}', 'updated_at', $this->dateTime()->null());
+    }
+
+    public function down()
+    {
+        echo "m211116_101347_add_timestamp_cols cannot be reverted.\n";
+        return false;
+    }
+}

src/models/BaseModel.php

@@ -10,16 +10,51 @@
 namespace dmstr\modules\prototype\models;
 
 
+use bedezign\yii2\audit\AuditTrailBehavior;
 use Yii;
+use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveQuery;
 use yii\db\ActiveRecord;
+use yii\db\Expression;
 
 /**
  * @package dmstr\modules\prototype\models
  * @author Elias Luhr <[email protected]>
  */
 class BaseModel extends ActiveRecord
 {
+
+    /**
+     * Column attribute 'created_at'
+     */
+    const ATTR_CREATED_AT = 'created_at';
+
+    /**
+     * Column attribute 'updated_at'
+     */
+    const ATTR_UPDATED_AT = 'updated_at';
+
+    /**
+     * @inheritdoc
+     *
+     * Use yii\behaviors\TimestampBehavior for created_at and updated_at attribute
+     *
+     * @return array
+     */
+    public function behaviors()
+    {
+
+        $behaviors = parent::behaviors();
+
+        $behaviors['timestamp'] = [
+            'class'              => TimestampBehavior::class,
+            'createdAtAttribute' => static::ATTR_CREATED_AT,
+            'updatedAtAttribute' => static::ATTR_UPDATED_AT,
+            'value'              => new Expression('NOW()'),
+        ];
+        return $behaviors;
+    }
+
     /**
      * @inheritdoc
      */

src/views/html/index.php

@@ -1,5 +1,6 @@
 <?php
 
+use dmstr\modules\prototype\models\BaseModel;
 use rmrevin\yii\fontawesome\FA;
 use yii\bootstrap\ButtonDropdown;
 use yii\grid\GridView;
@@ -103,6 +104,8 @@
                         'contentOptions' => ['nowrap' => 'nowrap'],
                     ],
                     'key',
+                    BaseModel::ATTR_UPDATED_AT,
+                    BaseModel::ATTR_CREATED_AT,
                 ],
             ]
         ); ?>

src/views/html/view.php

@@ -1,6 +1,7 @@
 <?php
 
 use dmstr\bootstrap\Tabs;
+use dmstr\modules\prototype\models\BaseModel;
 use rmrevin\yii\fontawesome\FA;
 use yii\helpers\Html;
 use yii\widgets\DetailView;
@@ -79,6 +80,8 @@
                 'id',
                 'key',
                 'value:html',
+                BaseModel::ATTR_UPDATED_AT,
+                BaseModel::ATTR_CREATED_AT,
             ],
         ]
     ); ?>

src/views/less/index.php

@@ -1,5 +1,6 @@
 <?php
 
+use dmstr\modules\prototype\models\BaseModel;
 use rmrevin\yii\fontawesome\FA;
 use yii\bootstrap\ButtonDropdown;
 use yii\grid\GridView;
@@ -103,6 +104,8 @@
                         'contentOptions' => ['nowrap' => 'nowrap'],
                     ],
                     'key',
+                    BaseModel::ATTR_UPDATED_AT,
+                    BaseModel::ATTR_CREATED_AT,
                 ],
             ]
         ); ?>

src/views/less/view.php

@@ -1,6 +1,7 @@
 <?php
 
 use dmstr\bootstrap\Tabs;
+use dmstr\modules\prototype\models\BaseModel;
 use rmrevin\yii\fontawesome\FA;
 use yii\helpers\Html;
 use yii\widgets\DetailView;
@@ -83,6 +84,8 @@
                     'format'    => 'html',
                     'value'     => '<pre>' . Html::encode($model->value) . '</pre>'
                 ],
+                BaseModel::ATTR_UPDATED_AT,
+                BaseModel::ATTR_CREATED_AT,
             ],
         ]
     ); ?>

src/views/twig/index.php

@@ -1,5 +1,6 @@
 <?php
 
+use dmstr\modules\prototype\models\BaseModel;
 use rmrevin\yii\fontawesome\FA;
 use yii\grid\GridView;
 use yii\helpers\Html;
@@ -72,6 +73,8 @@
                     'contentOptions' => ['nowrap' => 'nowrap'],
                 ],
                 'key',
+                BaseModel::ATTR_UPDATED_AT,
+                BaseModel::ATTR_CREATED_AT,
             ],
         ]); ?>
     </div>

src/views/twig/view.php

@@ -1,6 +1,7 @@
 <?php
 
 use dmstr\bootstrap\Tabs;
+use dmstr\modules\prototype\models\BaseModel;
 use rmrevin\yii\fontawesome\FA;
 use yii\helpers\Html;
 use yii\widgets\DetailView;
@@ -75,6 +76,8 @@
                 'format' => 'raw',
                 'value' => "<pre>" . htmlspecialchars($model->value) . "</pre>",
             ],
+            BaseModel::ATTR_UPDATED_AT,
+            BaseModel::ATTR_CREATED_AT,
         ],
     ]); ?>