Updated to 1.0.2 version

Author: josantonius

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.0.2 - 2017-05-31
+
+* Some bugs were fixed.
+
+* Added argument in `getModulesInfo` method to filter modules by category.
+
+* Added `Eliasis\Module\Module::exists($id)` method.
+
+* Required `Josantonius/Json` library.
+
 ## 1.0.1 - 2017-05-27
 
 * The following parameters were added for the module configuration file:
@@ -9,6 +19,7 @@
 	category → Required → Category: Extension, component, widget, plugin...
 
 ## 1.0.0 - 2017-05-07
+
 * Added `Eliasis\Module\Module` class.
 * Added `Eliasis\Module\Module::getInstance()` method.
 * Added `Eliasis\Module\Module::loadModules()` method.
@@ -27,6 +38,9 @@
 * Added `Eliasis\Module\Module->_addResources()` method.
 * Added `Eliasis\Module\Module::__callstatic()` method.
 
+* Required `Eliasis-Framework/Eliasis` framework.
+* Required `Josantonius/Hook` library.
+
 * Bug fixed when creating status file.
 
 * The module path was added to the getModulesInfo method.

README-ES.md

@@ -62,7 +62,7 @@ Module::loadModules();
 Module::getStates();
 Module::changeState();
 Module::remove();
-Module->getModulesInfo();
+Module::getModulesInfo();
 ```
 
 ### Uso

README.md

@@ -62,7 +62,7 @@ Module::loadModules();
 Module::getStates();
 Module::changeState();
 Module::remove();
-Module->getModulesInfo();
+Module::getModulesInfo();
 ```
 ### Usage
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name":        "eliasis-framework/module",
-    "version":     "1.0.1",
+    "version":     "1.0.2",
     "description": "PHP library for adding addition of modules for Eliasis Framework.",
     "type":        "library",
     "keywords": [

src/Module.php

@@ -201,33 +201,15 @@ private static function _add($module, $path) {
      *
      * @since 1.0.0
      *
-     * @throws ModuleException → file not found
-     *
      * @return array → modules states
      */
     public static function getStates() {
 
         if (is_null(self::$states)) {
 
-            $path = App::ROOT() . 'modules' . App::DS;
-
-            $filepath = $path . App::modules('states-file');
-
-            if (is_file($filepath)) {
-
-                $file = file_get_contents($filepath);
-                
-                return self::$states = json_decode($file, true);
-            
-            } else {
-
-                return self::_setStates();
-
-            }
-            
-            $message = 'modules-states.jsond file not found in';
+            $filepath = App::MODULES() . App::modules('states-file');
 
-            throw new ModuleException($message . ' ' . $path, 605);
+            self::$states = Json::fileToArray($filepath);
         }
 
         return self::$states;
@@ -237,25 +219,12 @@ public static function getStates() {
      * Save states for modules.
      *
      * @since 1.0.0
-     *
-     * @throws ModuleException → file could not be created
      */
     private static function _setStates() {
 
-        $path = App::ROOT() . 'modules' . App::DS;
-
-        $filepath = $path . App::modules('states-file');
-
-        $json = json_encode(self::$states, JSON_PRETTY_PRINT);
-        
-        if (!$file = fopen($filepath, 'w+')) { 
-
-            $message = 'modules-states.jsond could not be created in';
-            
-            throw new ModuleException($message . ' ' . $filepath, 300);
-        }
+        $filepath = App::MODULES() . App::modules('states-file');
 
-        fwrite($file, $json);
+        Json::ArrayToFile(self::$states, $filepath);
     }
 
     /**
@@ -324,6 +293,45 @@ private function _setAction($action) {
         self::$states[App::$id][self::$id]['action'] = $action;
     }
 
+    /**
+     * Delete module.
+     *
+     * @since 1.0.0
+     *
+     * @param boolean $moduleName → plugin name to delete
+     * @param boolean $deleteAll  → delete the entire directory or
+     *                              leave only the configuration file.
+     *
+     * @return string → module state
+     */
+    public static function remove($moduleName = null, $deleteAll = true) {
+
+        $instance = self::getInstance();
+
+        self::$id = ($moduleName) ? $moduleName : self::$id;
+
+        if (isset($instance->modules[App::$id][self::$id]['path']['root'])) {
+
+            $instance->_setState('remove');
+
+            $instance->changeState();
+
+            $path = $instance->modules[App::$id][self::$id]['path']['root'];
+
+            //$instance->_deleteDir($path, $deleteAll);
+
+            if ($deleteAll) {
+            
+                unset($this->modules[App::$id][self::$id]);
+                unset(self::$states[App::$id][self::$id]);
+            }
+
+            self::_setStates();
+        }
+
+        return 'uninstalled';
+    }
+
     /**
      * Change module state.
      *
@@ -378,45 +386,6 @@ public static function changeState($moduleName = null) {
         return $state;
     }
 
-    /**
-     * Delete module.
-     *
-     * @since 1.0.0
-     *
-     * @param boolean $moduleName → plugin name to delete
-     * @param boolean $deleteAll  → delete the entire directory or
-     *                              leave only the configuration file.
-     *
-     * @return string → module state
-     */
-    public static function remove($moduleName = null, $deleteAll = true) {
-
-        $instance = self::getInstance();
-
-        self::$id = ($moduleName) ? $moduleName : self::$id;
-
-        if (isset($instance->modules[App::$id][self::$id]['path']['root'])) {
-
-            $instance->_setState('remove');
-
-            $instance->changeState();
-
-            $path = $instance->modules[App::$id][self::$id]['path']['root'];
-
-            //$instance->_deleteDir($path, $deleteAll);
-
-            if ($deleteAll) {
-            
-                unset($this->modules[App::$id][self::$id]);
-                unset(self::$states[App::$id][self::$id]);
-            }
-
-            self::_setStates();
-        }
-
-        return 'uninstalled';
-    }
-
     /**
      * Delete module.
      *
@@ -486,9 +455,11 @@ private function _deleteDir($modulePath, $deleteAll) {
      *
      * @since 1.0.0
      *
+     * @param string $category → module category
+     *
      * @return array $data → modules info
      */
-    public static function getModulesInfo() {
+    public static function getModulesInfo($category = 'all') {
 
         $data = [];
 
@@ -500,6 +471,11 @@ public static function getModulesInfo() {
 
             $module = $instance->modules[App::$id][$module];
 
+            if ($category !== 'all' && $module['category'] !== $category) {
+
+                continue;
+            }
+
             $data[] = [
 
                 'id'          => $module['id'],
@@ -576,6 +552,22 @@ private function _addResources() {
             }
         }
     }
+                                                                      
+    /**
+     * Check if module exists.
+     *
+     * @since 1.0.2
+     *
+     * @param string $id → module id
+     *
+     * @return boolean
+     */
+    public static function exists($id) {
+
+        $instance = self::getInstance();
+
+        return array_key_exists($id, $instance->modules[App::$id]);
+    }
 
     /**
      * Receives the name of the module to execute: Module::ModuleName();
@@ -603,10 +595,11 @@ public static function __callstatic($index, $params = '') {
         self::$id = $index;
 
         $method = (isset($params[0])) ? $params[0] : '';
+        $args   = (isset($params[1])) ? $params[1] : [];
 
         if (method_exists($instance, $method)) {
 
-            call_user_func([$instance, $method]);
+            return call_user_func_array([$instance, $method], $args);
         }
 
         $column[] = $instance->modules[App::$id][$index];