Merge pull request #10 from mhh1422/master

Updating tests

Author: mhh1422

README.md

@@ -29,20 +29,20 @@ Allows modules structure of your project. Each module can have its views, config
  1. Modify the `config/modules.php` config file as needed.
 
 ## How It Works
-Your modules should go in a root modules folder. By default this is `app/Modules` which maps to the namespace 
+Your modules should go in a root modules folder. By default this is `app/Modules` which maps to the namespace
 `\App\Modules`.
 
-Each of your modules will have its own folder inside the modules root folder, the folder will be named after the module 
+Each of your modules will have its own folder inside the modules root folder, the folder will be named after the module
 name, and will map to the namespace `\App\Modules\{ModuleName}`.
 
-Each module will contain a base module definition class, which (by default) will be named `Module.php` and maps to 
+Each module will contain a base module definition class, which (by default) will be named `Module.php` and maps to
 the namespace `\App\Modules\{ModuleName}\Module`. This class will act as the key generator for the module URLs, routes,
 and other framework-related values.
 
 Each module will contain its data models, controllers, views, routes, and other project files as usual. The `composer`
 PSR-4 loader should take care of loading your module files and classes properly.
 
-Your module controllers (by default go into the `Http/Controllers` folder) should inherite the 
+Your module controllers (by default go into the `Http/Controllers` folder) should inherite the
 `ItvisionSy\Laravel\Modules\Controller` class to make views rendering and other tasks easier.
 
 ## Creating Modules
@@ -52,30 +52,31 @@ php artisan modules:make {id} {name} [--url={url}]
 ```
 Values of `id`, `name`, and `url` are strings, and the URL part is optional and will be used to generate make the
   URLs of the module more human friendly.
-  
+
 This command will create the basic folder structure inside the modules folder, along with the base module and a sample
 routes (inside `Http/routes.php`), controller (inside `Http/Controllers/`), and view (inside `Views`).
 
 As you have the basic structure, you can start creating your files and classes as normal. Nothing special to worry about.
 
 ## What is Store Handler
-It is a feature allows a per-module configuration to be saved in the database, in addition to a flag to identify if a 
+It is a feature allows a per-module configuration to be saved in the database, in addition to a flag to identify if a
 module is enabled or disabled.
 
 You need a class that implements the `ItvisionSy\Laravel\Modules\Interfaces\KeyValueStoreInterface` interface, which
 defines two methods: `set($key, $value)` and `get($key, $default=null)`.
 
-There is a ready made implementation in the `\ItvisionSy\Laravel\Modules\StoreHandlers\SimpleDbStoreHandler` class,
-which utilizes a DB connection (default one by default) to store the config in a simple key/value table.
+There are two ready-made implementations in the `\ItvisionSy\Laravel\Modules\StoreHandlers\` namespace, one is calle
+`MysqlSimpleDbStoreHandler` and the other `SqliteSimpleDbStoreHandler`, which utilizes a DB connection (default one
+by default) to store the config in a simple key/value table.
 
 The feature comes disabled by default by setting the class `\ItvisionSy\Laravel\Modules\StoreHandlers\DummyStoreHandler`
-as the store handler. To enable it, just change the `store_handler` config setting in the `config/modules.php` config 
-file to use the `SimpleDbStoreHandler` class mentioned above.
+as the store handler. To enable it, just change the `store_handler` config setting in the `config/modules.php` config
+file to use one of the two classes mentioned above.
 ```php
 //config/modules.php config file
-return [
-'store_handler' => \ItvisionSy\Laravel\Modules\StoreHandlers\SimpleDbStoreHandler::class,
-];
+
+'store_handler' => \ItvisionSy\Laravel\Modules\StoreHandlers\SqliteSimpleDbStoreHandler::class,
+
 ```
 
 Also, you need to create the database table for the store. We provided a simple artisan command to do that. After you
@@ -84,7 +85,7 @@ have configured everything correctly, simply execute the following command:
 which will take care about creating the database table by executing the following SQL command:
 ```sql
 CREATE TABLE IF NOT EXISTS `modules_storage` (
-  `key` VARCHAR(200) UNIQUE NOT NULL PRIMARY KEY, 
+  `key` VARCHAR(200) UNIQUE NOT NULL PRIMARY KEY,
   `value` VARCHAR(200) NULL
 );
 ```

composer.json

@@ -1,38 +1,39 @@
 {
-  "name": "itvisionsy/laravel-modules",
-  "description": "Laravel 5.1 library to allow modules structure. Each module can have its routes, controllers, views, config, ...",
-  "type": "library",
-  "keywords": [
-    "modules",
-    "laravel"
-  ],
-  "require": {
-    "php": ">=5.5.9",
-    "laravel/framework": "5.1.*"
-  },
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Muhannad Shelleh",
-      "email": "muhannad.shelleh@gmail.com"
-    }
-  ],
-  "autoload": {
-    "psr-4": {
-      "ItvisionSy\\Laravel\\Modules\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "classmap": [
-      "tests/LaravelModulesTestCase.php"
+    "name": "itvisionsy/laravel-modules",
+    "description": "Laravel 5.1 library to allow modules structure. Each module can have its routes, controllers, views, config, ...",
+    "type": "library",
+    "keywords": [
+        "modules",
+        "laravel"
+    ],
+    "require": {
+        "php": ">=5.5.9",
+        "laravel/framework": "5.1.*",
+        "nette/reflection": "^2.4"
+    },
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Muhannad Shelleh",
+            "email": "muhannad.shelleh@gmail.com"
+        }
     ],
-    "psr-4": {
-      "ItvisionSy\\Laravel\\Modules\\Tests\\": "tests/",
-      "App\\": "app/"
+    "autoload": {
+        "psr-4": {
+            "ItvisionSy\\Laravel\\Modules\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "classmap": [
+            "tests/LaravelModulesTestCase.php"
+        ],
+        "psr-4": {
+            "ItvisionSy\\Laravel\\Modules\\Tests\\": "tests/",
+            "App\\": "app/"
+        }
+    },
+    "require-dev": {
+        "laravel/laravel": "^5.1",
+        "phpunit/phpunit": "^5.7"
     }
-  },
-  "require-dev": {
-    "laravel/laravel": "^5.1",
-    "phpunit/phpunit": "^5.7"
-  }
 }

src/Commands/InitiateDatabaseTable.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Bus\SelfHandling;
-use ItvisionSy\Laravel\Modules\StoreHandlers\SimpleDbStoreHandler;
+use ItvisionSy\Laravel\Modules\StoreHandlers\SqliteSimpleDbStoreHandler;
 
 class InitiateDatabaseTable extends Command implements SelfHandling
 {
@@ -28,7 +28,7 @@ public function __construct()
     public function handle()
     {
         try {
-            $result = SimpleDbStoreHandler::createTable();
+            $result = SqliteSimpleDbStoreHandler::createTable();
             if ($result) {
                 $this->info("Table modules_storage created successfully!");
             } else {

src/Commands/MakeModule.php

@@ -5,8 +5,7 @@
 use Illuminate\Contracts\Bus\SelfHandling;
 use Illuminate\Filesystem\Filesystem;
 
-class MakeModule extends \Illuminate\Console\Command implements SelfHandling
-{
+class MakeModule extends \Illuminate\Console\Command implements SelfHandling {
 
     protected $signature = 'make:module
                                 {id : the ID of the module. Should be unique across modules}
@@ -24,8 +23,7 @@ class MakeModule extends \Illuminate\Console\Command implements SelfHandling
      * Create a new command instance.
      * @param Filesystem $fileSystem
      */
-    public function __construct(Filesystem $fileSystem)
-    {
+    public function __construct(Filesystem $fileSystem) {
         parent::__construct();
         $this->fileSystem = $fileSystem;
     }
@@ -35,8 +33,7 @@ public function __construct(Filesystem $fileSystem)
      *
      * @return void
      */
-    public function handle()
-    {
+    public function handle() {
         //input
         $id = $this->argument('id');
         $name = $this->argument('name');
@@ -67,25 +64,22 @@ public function handle()
         $this->copyStub("index.blade.php.stub", "{$path}Views{$ds}index.blade.php", $stubData + []);
 
         $this->info("Module {$id} has been created in {$path}");
-
     }
 
-    protected function makeDirectory($path, $mode = 0777)
-    {
+    protected function makeDirectory($path, $mode = 0777) {
         if (!$this->fileSystem->isDirectory($path)) {
             $this->fileSystem->makeDirectory($path, $mode, true, true);
         }
     }
 
-    protected function copyStub($stubName, $filePath, array $values)
-    {
+    protected function copyStub($stubName, $filePath, array $values) {
         $path = __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'MakeModule' . DIRECTORY_SEPARATOR . $stubName;
         $content = preg_replace_callback("/\{\{([a-zA-Z_\-]+)\}\}/", function ($matches) use ($values) {
             return $values[$matches[1]];
         }, file_get_contents($path));
-        if ($this->fileSystem->exists($filePath)) {
-            $this->fileSystem->delete($filePath);
+        if (!$this->fileSystem->exists($filePath)) {
+            $this->fileSystem->put($filePath, $content);
         }
-        $this->fileSystem->put($filePath, $content);
     }
+
 }