updated code generation

Author: begimov

src/Commands/RepositoryMakeCommand.php

@@ -52,8 +52,12 @@ protected function buildClass($name)
 
         $scopes = $this->option('scopes');
 
-        return (new Replacer(parent::buildClass($name)))
-            ->replace($model, $scopes);
+        $stub = (new Replacer(parent::buildClass($name)))
+            ->replace($scopes);
+
+        $stub = str_replace('NamespacedDummyModel', $model, $stub);
+
+        return str_replace('DummyModel', last(explode('\\', $model)), $stub);
     }
 
     /**

src/Commands/RepositoryMakeMainCommand.php

@@ -41,9 +41,16 @@ public function handle()
 
         $this->createRepository();
 
-        $this->createScopes();
+        $scope = $this->option('scope');
 
-        if ($scope = $this->option('scope')) {
+        $this->createScopes(
+            $scope 
+                ? Str::singular($scope) . Str::plural($this->getNameInput()) . 'Scope' 
+                : $scope,
+            Str::camel($scope)
+        );
+
+        if ($scope) {
             $this->createScope($scope);
         }
     }
@@ -63,26 +70,28 @@ protected function createRepository()
     }
 
     /**
-     * Create a repository.
+     * Create a repository scopes.
      *
      * @return void
      */
-    protected function createScopes()
+    protected function createScopes($scope, $scopeName)
     {
         $this->call('make:repository:scopes', [
             'name' => $this->getNamespacedScopes(),
+            '--scope' => $scope,
+            '--scope_name' => $scopeName,
         ]);
     }
 
     /**
-     * Create a repository.
+     * Create a repository scope.
      *
      * @return void
      */
     protected function createScope($scope)
     {
         $this->call('make:repository:scope', [
-            'name' => $this->getNamespacedScope($scope),
+            'name' => $this->getNamespacedScope($scope)
         ]);
     }
 
@@ -108,8 +117,9 @@ protected function rootNamespace()
 
     private function getNamespacedModel()
     {
-        return $this->baseNamespace .'\Models\\' 
-            . Str::singular($this->getNameInput());
+        return implode(
+            '\\', explode('/', trim($this->argument('modelName')))
+        );
     }
 
     private function getNamespacedScopes()

src/Commands/RepositoryScopesMakeCommand.php

@@ -12,7 +12,7 @@ class RepositoryScopesMakeCommand extends GeneratorCommand
      *
      * @var string
      */
-    protected $signature = 'make:repository:scopes {name}';
+    protected $signature = 'make:repository:scopes {name} {--scope=} {--scope_name=}';
 
     /**
      * The console command description.
@@ -48,8 +48,16 @@ public function handle()
      */
     protected function buildClass($name)
     {
-        return (new Replacer(parent::buildClass($name)))
+        $stub = (new Replacer(parent::buildClass($name)))
             ->replace($name);
+
+        if ($scope = $this->option('scope')) {
+            $stub = str_replace('SearchScope', $scope, $stub);
+            $scopeName = $this->option('scope_name');
+            $stub = str_replace('search', $scopeName, $stub);
+        }
+
+        return $stub;
     }
 
     /**

src/Commands/stubs/repository.stub

@@ -2,7 +2,7 @@
 
 namespace DummyNamespace;
 
-use App\DummyModel;
+use App\NamespacedDummyModel;
 use AwesIO\Repository\Eloquent\BaseRepository;
 use NamespacedDummyScope;
 
@@ -15,11 +15,6 @@ class DummyClass extends BaseRepository
      */
     protected $searchable = [];
 
-    /**
-     * Returns DocDummyModel model's full class name.
-     *
-     * @return string
-     */
     public function entity()
     {
         return DummyModel::class;