agus

Commands/ControllerCommand.php

@@ -53,12 +53,16 @@ protected function getTemplateContents()
         $module = $this->laravel['modules']->findOrFail($this->getModuleName());
 
         return (new Stub('/controller.stub', [
-            'MODULENAME' => $module->getStudlyName(),
-            'CONTROLLERNAME' => $this->getControllerName(),
-            'CLASS' => $this->getClass(),
-            'NAMESPACE' => $module->getLowername(),
-            'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
-            'CLASS_NAMESPACE' => $this->getClassNamespace($module),
+            'MODULENAME'        => $module->getStudlyName(),
+            'CONTROLLERNAME'    => $this->getControllerName(),
+            'NAMESPACE'         => $module->getStudlyName(),
+            'CLASS_NAMESPACE'   => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'LOWER_NAME'        => $module->getLowerName(),
+            'MODULE'            => $this->getModuleName(),
+            'NAME'              => $this->getModuleName(),
+            'STUDLY_NAME'       => $module->getStudlyName(),
+            'MODULE_NAMESPACE'  => $this->laravel['modules']->config('namespace'),
         ]))->render();
     }
 

Commands/GenerateFilterCommand.php

@@ -53,8 +53,13 @@ protected function getTemplateContents()
         $module = $this->laravel['modules']->findOrFail($this->getModuleName());
 
         return (new Stub('/filter.stub', [
-            'NAMESPACE' => $this->getClassNamespace($module),
-            'CLASS' => $this->getClass(),
+            'NAMESPACE'         => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'LOWER_NAME'        => $module->getLowerName(),
+            'MODULE'            => $this->getModuleName(),
+            'NAME'              => $this->getFileName(),
+            'STUDLY_NAME'       => $this->getFileName(),
+            'MODULE_NAMESPACE'  => $this->laravel['modules']->config('namespace'),
         ]))->render();
     }
 

Commands/GenerateProviderCommand.php

@@ -68,9 +68,16 @@ protected function getTemplateContents()
         $module = $this->laravel['modules']->findOrFail($this->getModuleName());
 
         return (new Stub('/'.$stub.'.stub', [
-            'NAMESPACE' => $this->getClassNamespace($module),
-            'CLASS' => $this->getClass(),
-            'LOWER_NAME' => $module->getLowerName(),
+            'NAMESPACE'         => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'LOWER_NAME'        => $module->getLowerName(),
+            'MODULE'            => $this->getModuleName(),
+            'NAME'              => $this->getFileName(),
+            'STUDLY_NAME'       => $module->getStudlyName(),
+            'MODULE_NAMESPACE'  => $this->laravel['modules']->config('namespace'),
+            'PATH_VIEWS'        => $this->laravel['config']->get('modules.paths.generator.views'),
+            'PATH_LANG'         => $this->laravel['config']->get('modules.paths.generator.lang'),
+            'PATH_CONFIG'       => $this->laravel['config']->get('modules.paths.generator.config')
         ]))->render();
     }
 

Commands/GenerateRouteProviderCommand.php

@@ -43,10 +43,16 @@ protected function getArguments()
      */
     protected function getTemplateContents()
     {
+        $module = $this->laravel['modules']->findOrFail($this->getModuleName());
+
         return (new Stub('/route-provider.stub', [
-            'MODULE' => $this->getModuleName(),
-            'NAME' => $this->getFileName(),
-            'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
+            'NAMESPACE'         => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'LOWER_NAME'        => $module->getLowerName(),
+            'MODULE'            => $this->getModuleName(),
+            'NAME'              => $this->getFileName(),
+            'STUDLY_NAME'       => $module->getStudlyName(),
+            'MODULE_NAMESPACE'  => $this->laravel['modules']->config('namespace'),
         ]))->render();
     }
 

Commands/MakeRequestCommand.php

@@ -53,11 +53,13 @@ protected function getTemplateContents()
         $module = $this->laravel['modules']->findOrFail($this->getModuleName());
 
         return (new Stub('/request.stub', [
-            'MODULE' => $this->getModuleName(),
-            'NAME' => $this->getFileName(),
-            'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
-            'NAMESPACE' => $this->getClassNamespace($module),
-            'CLASS' => $this->getClass(),
+            'NAMESPACE'         => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'LOWER_NAME'        => $module->getLowerName(),
+            'MODULE'            => $this->getModuleName(),
+            'NAME'              => $this->getFileName(),
+            'STUDLY_NAME'       => $module->getStudlyName(),
+            'MODULE_NAMESPACE'  => $this->laravel['modules']->config('namespace'),
         ]))->render();
     }
 

Commands/MigrateResetCommand.php

@@ -41,7 +41,7 @@ public function fire()
             return;
         }
 
-        foreach ($this->laravel['modules']->all() as $module) {
+        foreach (array_reverse($this->laravel['modules']->all()) as $module) {
             $this->line('Running for module: <info>'.$module->getName().'</info>');
 
             $this->reset($module);

Commands/MigrateRollbackCommand.php

@@ -41,7 +41,7 @@ public function fire()
             return;
         }
 
-        foreach ($this->laravel['modules']->all() as $module) {
+        foreach (array_reverse($this->laravel['modules']->all()) as $module) {
             $this->line('Running for module: <info>'.$module->getName().'</info>');
 
             $this->rollback($module);

Commands/MigrationCommand.php

@@ -3,7 +3,6 @@
 namespace Pingpong\Modules\Commands;
 
 use Illuminate\Support\Str;
-use Pingpong\Generators\Exceptions\InvalidMigrationNameException;
 use Pingpong\Generators\Migrations\NameParser;
 use Pingpong\Generators\Migrations\SchemaParser;
 use Pingpong\Support\Stub;
@@ -102,7 +101,7 @@ protected function getTemplateContents()
             ]);
         }
 
-        throw new InvalidMigrationNameException();
+        throw new \InvalidArgumentException('Invalid migration name');
     }
 
     /**

Commands/ModelCommand.php

@@ -66,12 +66,14 @@ protected function getTemplateContents()
         $module = $this->laravel['modules']->findOrFail($this->getModuleName());
 
         return (new Stub('/model.stub', [
-            'MODULE' => $this->getModuleName(),
-            'NAME' => $this->getModelName(),
-            'FILLABLE' => $this->getFillable(),
-            'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
-            'NAMESPACE' => $this->getClassNamespace($module),
-            'CLASS' => $this->getClass(),
+            'NAME'              => $this->getModelName(),
+            'FILLABLE'          => $this->getFillable(),
+            'NAMESPACE'         => $this->getClassNamespace($module),
+            'CLASS'             => $this->getClass(),
+            'LOWER_NAME'        => $module->getLowerName(),
+            'MODULE'            => $this->getModuleName(),
+            'STUDLY_NAME'       => $module->getStudlyName(),
+            'MODULE_NAMESPACE'  => $this->laravel['modules']->config('namespace'),
         ]))->render();
     }
 

Commands/SeedCommand.php

@@ -35,20 +35,31 @@ public function fire()
     {
         $this->module = $this->laravel['modules'];
 
-        $module = Str::studly($this->argument('module')) ?: $this->getModuleName();
+        $name = $this->argument('module');
 
-        if ($module) {
-            if ($this->module->has($module)) {
-                $this->dbseed($module);
-
-                return $this->info("Module [$module] seeded.");
+        if ($name) {
+            if (!$this->module->has(Str::studly($name))) {
+                return $this->error("Module [$name] does not exists.");
             }
 
-            return $this->error("Module [$module] does not exists.");
+            $class = $this->getSeederName($name);
+            if (class_exists($class)) {
+                $this->dbseed($name);
+
+                return $this->info("Module [$name] seeded.");
+            } else {
+                return $this->error("Class [$class] does not exists.");
+            }
         }
 
-        foreach ($this->module->all() as $name) {
-            $this->dbseed($name);
+        foreach ($this->module->getOrdered() as $module) {
+            $name = $module->getName();
+
+            if (class_exists($this->getSeederName($name))) {
+                $this->dbseed($name);
+
+                $this->info("Module [$name] seeded.");
+            }
         }
 
         return $this->info('All modules seeded.');
@@ -111,6 +122,7 @@ protected function getOptions()
     {
         return array(
             array('class', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder', null),
+            array('all', null, InputOption::VALUE_NONE, 'Whether or not we should seed all modules.'),
             array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to seed.'),
         );
     }

Commands/SeedMakeCommand.php

@@ -65,6 +65,7 @@ protected function getTemplateContents()
             'NAME' => $this->getSeederName(),
             'MODULE' => $this->getModuleName(),
             'MODULE_NAMESPACE' => $this->laravel['modules']->config('namespace'),
+
         ]))->render();
     }
 

Commands/stubs/controller.stub

@@ -6,7 +6,7 @@ class $CLASS$ extends Controller {
 
 	public function index()
 	{
-		return view('$NAMESPACE$::index');
+		return view('$LOWER_NAME$::index');
 	}
 
 }

Commands/stubs/routes.stub

@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['prefix' => '$LOWER_NAME$', 'namespace' => '$MODULE_NAMESPACE$\$STUDLY_NAME$\Http\Controllers'], function()
+Route::group(['middleware' => 'web', 'prefix' => '$LOWER_NAME$', 'namespace' => '$MODULE_NAMESPACE$\$STUDLY_NAME$\Http\Controllers'], function()
 {
 	Route::get('/', '$STUDLY_NAME$Controller@index');
 });

Commands/stubs/scaffold/provider.stub

@@ -13,13 +13,13 @@ class $CLASS$ extends ServiceProvider {
 
 	/**
 	 * Boot the application events.
-	 * 
+	 *
 	 * @return void
 	 */
 	public function boot()
 	{
-		$this->registerConfig();
 		$this->registerTranslations();
+		$this->registerConfig();
 		$this->registerViews();
 	}
 
@@ -29,46 +29,48 @@ class $CLASS$ extends ServiceProvider {
 	 * @return void
 	 */
 	public function register()
-	{		
+	{
 		//
 	}
 
 	/**
 	 * Register config.
-	 * 
+	 *
 	 * @return void
 	 */
 	protected function registerConfig()
 	{
 		$this->publishes([
-		    __DIR__.'/../Config/config.php' => config_path('$LOWER_NAME$.php'),
+		    __DIR__.'/../$PATH_CONFIG$/config.php' => config_path('$LOWER_NAME$.php'),
 		]);
 		$this->mergeConfigFrom(
-		    __DIR__.'/../Config/config.php', '$LOWER_NAME$'
+		    __DIR__.'/../$PATH_CONFIG$/config.php', '$LOWER_NAME$'
 		);
 	}
 
 	/**
 	 * Register views.
-	 * 
+	 *
 	 * @return void
 	 */
 	public function registerViews()
 	{
-		$viewPath = base_path('views/modules/$LOWER_NAME$');
+		$viewPath = base_path('resources/views/modules/$LOWER_NAME$');
 
-		$sourcePath = __DIR__.'/../Resources/views';
+		$sourcePath = __DIR__.'/../$PATH_VIEWS$';
 
 		$this->publishes([
 			$sourcePath => $viewPath
 		]);
 
-		$this->loadViewsFrom([$viewPath, $sourcePath], '$LOWER_NAME$');
+		$this->loadViewsFrom(array_merge(array_map(function ($path) {
+			return $path . '/modules/$LOWER_NAME$';
+		}, \Config::get('view.paths')), [$sourcePath]), '$LOWER_NAME$');
 	}
 
 	/**
 	 * Register translations.
-	 * 
+	 *
 	 * @return void
 	 */
 	public function registerTranslations()
@@ -78,7 +80,7 @@ class $CLASS$ extends ServiceProvider {
 		if (is_dir($langPath)) {
 			$this->loadTranslationsFrom($langPath, '$LOWER_NAME$');
 		} else {
-			$this->loadTranslationsFrom(__DIR__ .'/../Resources/lang', '$LOWER_NAME$');
+			$this->loadTranslationsFrom(__DIR__ .'/../$PATH_LANG$', '$LOWER_NAME$');
 		}
 	}
 

Commands/stubs/views/index.stub

@@ -8,4 +8,4 @@
 		This view is loaded from module: {!! config('$LOWER_NAME$.name') !!}
 	</p>
 
-@stop
+@endsection

Json.php

@@ -118,7 +118,13 @@ public function getContents()
      */
     public function getAttributes()
     {
-        return json_decode($this->getContents(), 1);
+        if (config('modules.cache.enabled') === false) {
+            return json_decode($this->getContents(), 1);
+        }
+
+        return app('cache')->remember($this->getPath(), config('modules.cache.lifetime'), function () {
+            return json_decode($this->getContents(), 1);
+        });
     }
 
     /**

Module.php

@@ -169,9 +169,13 @@ protected function registerTranslation()
      *
      * @return Json
      */
-    public function json()
+    public function json($file = null)
     {
-        return new Json($this->getPath().'/module.json', $this->app['files']);
+        if (is_null($file)) {
+            $file = 'module.json';
+        }
+
+        return new Json($this->getPath() . '/' . $file, $this->app['files']);
     }
 
     /**
@@ -187,6 +191,19 @@ public function get($key, $default = null)
         return $this->json()->get($key, $default);
     }
 
+    /**
+     * Get a specific data from composer.json file by given the key.
+     *
+     * @param $key
+     * @param null $default
+     *
+     * @return mixed
+     */
+    public function getComposerAttr($key, $default = null)
+    {
+        return $this->json('composer.json')->get($key, $default);
+    }
+
     /**
      * Register the module.
      */

ModulesServiceProvider.php

@@ -64,7 +64,9 @@ protected function registerNamespaces()
     {
         $configPath = __DIR__.'/src/config/config.php';
         $this->mergeConfigFrom($configPath, 'modules');
-        $this->publishes([$configPath => config_path('modules.php')]);
+        $this->publishes([
+            $configPath => config_path('modules.php')
+        ], 'config');
     }
 
     /**
@@ -88,7 +90,7 @@ protected function registerHtml()
      */
     protected function registerServices()
     {
-        $this->app->bindShared('modules', function ($app) {
+        $this->app->singleton('modules', function ($app) {
             $path = $app['config']->get('modules.paths.modules');
 
             return new Repository($app, $path);