Merge pull request #7 from RonasIT/dpankratov/version-update

Dpankratov/version update

Author: DenTray

ReadMe.md

@@ -8,8 +8,17 @@ Laravel-Entity-Generator - This generator is used to create a standard class sta
     composer require ronasit/laravel-entity-generator: 1.*
 ```
 
-Add `RonasIT\Support\EntityGeneratorServiceProvider::class` to `app/config/app.php`, 
-into 'providers' variable. And publish.
+If you're on Laravel 5.5 or later the package will be auto-discovered.
+Otherwise you will need to manually configure it in your config/app.php.
+
+```php
+'providers' => [
+    // ...
+    RonasIT\Support\EntityGeneratorServiceProvider::class,
+],
+```
+
+And publish.
 
 ```bash
     php artisan vendor:publish

composer.json

@@ -29,5 +29,12 @@
       "src/helpers.php"
     ]
   },
-  "minimum-stability": "beta"
+  "minimum-stability": "beta",
+  "extra": {
+    "laravel": {
+      "providers": [
+        "RonasIT\\Support\\EntityGeneratorServiceProvider"
+      ]
+    }
+  }
 }

src/Commands/MakeEntityCommand.php

@@ -4,7 +4,9 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Config;
 use RonasIT\Support\Events\SuccessCreateMessage;
+use RonasIT\Support\Exceptions\ClassNotExistsException;
 use RonasIT\Support\Exceptions\EntityCreateException;
 use RonasIT\Support\Generators\ControllerGenerator;
 use RonasIT\Support\Generators\EntityGenerator;
@@ -18,6 +20,7 @@
 use RonasIT\Support\Generators\TranslationsGenerator;
 use RonasIT\Support\Generators\SeederGenerator;
 use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
+use UnexpectedValueException;
 
 /**
  * @property ControllerGenerator $controllerGenerator
@@ -34,6 +37,10 @@
  */
 class MakeEntityCommand extends Command
 {
+    const CRUD_OPTIONS = [
+        'C', 'R', 'U', 'D'
+    ];
+
     /**
      * The name and signature of the console command.
      *
@@ -50,6 +57,8 @@ class MakeEntityCommand extends Command
         {--without-tests : Set this flag if you don\'t want to create tests. This flag is a lower priority than --only-tests.}
         {--without-seeder : Set this flag if you don\'t want to create seeder.}
         
+        {--only-api : Set this flag if you want to create controller, route, requests, tests.}
+        {--only-entity : Set this flag if you want to create migration, model, repository, service, factory, seeder.}
         {--only-model : Set this flag if you want to create only model. This flag is a higher priority than --without-model, --only-migration, --only-tests and --only-repository.} 
         {--only-repository : Set this flag if you want to create only repository. This flag is a higher priority than --without-repository, --only-tests and --only-migration.}
         {--only-service : Set this flag if you want to create only service.}
@@ -60,6 +69,8 @@ class MakeEntityCommand extends Command
         {--only-tests : Set this flag if you want to create only tests. This flag is a higher priority than --without-tests.}
         {--only-seeder : Set this flag if you want to create only seeder.}
 
+        {--methods=CRUD : Set types of methods to create. Affect on routes, requests classes, controller\'s methods and tests methods.} 
+
         {--i|integer=* : Add integer field to entity.}
         {--I|integer-required=* : Add required integer field to entity. If you want to specify default value you have to do it manually.}
         {--f|float=* : Add float field to entity.}
@@ -98,6 +109,8 @@ class MakeEntityCommand extends Command
 
     protected $rules = [
         'only' => [
+            'only-api' => [ControllerGenerator::class, RequestsGenerator::class, TestsGenerator::class],
+            'only-entity' => [MigrationGenerator::class, ModelGenerator::class, ServiceGenerator::class, RepositoryGenerator::class, FactoryGenerator::class, SeederGenerator::class],
             'only-model' => [ModelGenerator::class],
             'only-repository' => [RepositoryGenerator::class],
             'only-service' => [ServiceGenerator::class],
@@ -150,6 +163,8 @@ public function __construct()
      */
     public function handle()
     {
+        $this->validateInput();
+        $this->checkConfigs();
         $this->eventDispatcher->listen(SuccessCreateMessage::class, $this->getSuccessMessageCallback());
 
         try {
@@ -159,6 +174,74 @@ public function handle()
         }
     }
 
+    protected function checkConfigs()
+    {
+        $packageConfigPath = __DIR__ . '/../../config/entity-generator.php';
+        $packageConfigs = require $packageConfigPath;
+
+        $projectConfigs = config('entity-generator');
+
+        $newConfig = $this->outputNewConfig($packageConfigs, $projectConfigs);
+
+        if ($newConfig !== $projectConfigs) {
+            $this->info('Config has been updated');
+            Config::set('entity-generator', $newConfig);
+            file_put_contents(config_path('entity-generator.php'), "<?php\n\nreturn" . $this->customVarExport($newConfig) . ';');
+        }
+    }
+
+    protected function outputNewConfig($packageConfigs, $projectConfigs)
+    {
+        $flattenedPackageConfigs = Arr::dot($packageConfigs);
+        $flattenedProjectConfigs = Arr::dot($projectConfigs);
+
+        $newConfig = array_merge($flattenedPackageConfigs, $flattenedProjectConfigs);
+
+        $differences = array_diff_key($newConfig, $flattenedProjectConfigs);
+
+        foreach ($differences as $differenceKey => $differenceValue) {
+            $this->info("Key '{$differenceKey}' was missing in your config, we added it with the value '{$differenceValue}'");
+        }
+
+        return array_undot($newConfig);
+    }
+
+    protected function customVarExport($expression)
+    {
+        $defaultExpression = var_export($expression, true);
+
+        $patterns = [
+            '/array/' => '',
+            '/\(/' => '[',
+            '/\)/' => ']',
+            '/=> \\n/' => '=>',
+            '/=>.+\[/' => '=> [',
+            '/^ {8}/m' => "\t\t\t\t",
+            '/^ {6}/m' => "\t\t\t",
+            '/^ {4}/m' => "\t\t",
+            '/^ {2}/m' => "\t",
+        ];
+
+        return preg_replace(array_keys($patterns), array_values($patterns), $defaultExpression);
+    }
+
+    protected function classExists($path, $name)
+    {
+        $paths = config('entity-generator.paths');
+
+        $entitiesPath = $paths[$path];
+
+        $classPath = base_path("{$entitiesPath}/{$name}.php");
+
+        return file_exists($classPath);
+    }
+
+    protected function validateInput()
+    {
+        $this->validateOnlyApiOption();
+        $this->validateCrudOptions();
+    }
+
     protected function generate()
     {
         foreach ($this->rules['only'] as $option => $generators) {
@@ -198,9 +281,15 @@ protected function runGeneration($generator)
             ->setModel($this->argument('name'))
             ->setFields($this->getFields())
             ->setRelations($this->getRelations())
+            ->setCrudOptions($this->getCrudOptions())
             ->generate();
     }
 
+    protected function getCrudOptions()
+    {
+        return str_split($this->option('methods'));
+    }
+
     protected function getRelations()
     {
         return [
@@ -222,5 +311,25 @@ protected function getFields()
     {
         return Arr::only($this->options(), EntityGenerator::AVAILABLE_FIELDS);
     }
-}
 
+    protected function validateCrudOptions()
+    {
+        $crudOptions = $this->getCrudOptions();
+
+        foreach ($crudOptions as $crudOption) {
+            if (!in_array($crudOption, MakeEntityCommand::CRUD_OPTIONS)) {
+                throw new UnexpectedValueException("Invalid method {$crudOption}.");
+            }
+        }
+    }
+
+    protected function validateOnlyApiOption()
+    {
+        if ($this->option('only-api')) {
+            $modelName = $this->argument('name');
+            if (!$this->classExists('services', "{$modelName}Service")) {
+                throw new ClassNotExistsException('Cannot create API without entity.');
+            }
+        }
+    }
+}

src/Generators/EntityGenerator.php

@@ -19,6 +19,18 @@ abstract class EntityGenerator
     protected $model;
     protected $fields;
     protected $relations;
+    protected $crudOptions;
+
+    /**
+     * @param array $crudOptions
+     * @return $this
+     */
+    public function setCrudOptions($crudOptions)
+    {
+        $this->crudOptions = $crudOptions;
+
+        return $this;
+    }
 
     /**
      * @param string $model
@@ -101,6 +113,8 @@ protected function getStub($stub, $data = [])
     {
         $stubPath = config("entity-generator.stubs.$stub");
 
+        $data['options'] = $this->crudOptions;
+
         return view($stubPath)->with($data)->render();
     }
 

src/Generators/RequestsGenerator.php

@@ -27,31 +27,38 @@ public function setRelations($relations)
 
     public function generate()
     {
-        $this->createRequest(
-            self::GET_METHOD,
-            true,
-            $this->getGetValidationParameters()
-        );
-
-        $this->createRequest(self::DELETE_METHOD);
+        if (in_array('R', $this->crudOptions)) {
+            $this->createRequest(
+                self::GET_METHOD,
+                true,
+                $this->getGetValidationParameters()
+            );
+            $this->createRequest(
+                self::SEARCH_METHOD,
+                false,
+                $this->getSearchValidationParameters()
+            );
+        }
 
-        $this->createRequest(
-            self::CREATE_METHOD,
-            false,
-            $this->getValidationParameters($this->fields, true)
-        );
+        if (in_array('D', $this->crudOptions)) {
+            $this->createRequest(self::DELETE_METHOD);
+        }
 
-        $this->createRequest(
-            self::UPDATE_METHOD,
-            true,
-            $this->getValidationParameters($this->fields, false)
-        );
+        if (in_array('C', $this->crudOptions)) {
+            $this->createRequest(
+                self::CREATE_METHOD,
+                false,
+                $this->getValidationParameters($this->fields, true)
+            );
+        }
 
-        $this->createRequest(
-            self::SEARCH_METHOD,
-            false,
-            $this->getSearchValidationParameters()
-        );
+        if (in_array('U', $this->crudOptions)) {
+            $this->createRequest(
+                self::UPDATE_METHOD,
+                true,
+                $this->getValidationParameters($this->fields, false)
+            );
+        }
     }
 
     protected function createRequest($method, $needToValidate = true, $parameters = [])

src/Generators/TestsGenerator.php

@@ -179,16 +179,25 @@ protected function generateExistedEntityFixture()
         $entity = Str::snake($this->model);
 
         foreach (self::FIXTURE_TYPES as $type => $modifications) {
-            foreach ($modifications as $modification) {
-                $excepts = [];
-                if ($modification === 'request') {
-                    $excepts = ['id'];
+            if ($this->isFixtureNeeded($type)) {
+                foreach ($modifications as $modification) {
+                    $excepts = [];
+                    if ($modification === 'request') {
+                        $excepts = ['id'];
+                    }
+                    $this->generateFixture("{$type}_{$entity}_{$modification}.json", Arr::except($object, $excepts));
                 }
-                $this->generateFixture("{$type}_{$entity}_{$modification}.json", Arr::except($object, $excepts));
             }
         }
     }
 
+    protected function isFixtureNeeded($type)
+    {
+        $firstLetter = strtoupper($type[0]);
+
+        return in_array($firstLetter, $this->crudOptions);
+    }
+
     protected function generateFixture($fixtureName, $data)
     {
         $fixturePath = $this->getFixturesPath($fixtureName);