Merge branch 'hotfix/65'

Close #65

Author: weierophinney

config/module.config.php

@@ -110,7 +110,7 @@
                 ),
                 'zftool-create-action' => array(
                     'options' => array(
-                        'route'    => 'create action <name> <controller> <module>',
+                        'route'    => 'create action <name> <controllerName> <module>',
                         'defaults' => array(
                             'controller' => 'ZFTool\Controller\Create',
                             'action'     => 'method',

src/ZFTool/Controller/CreateController.php

@@ -10,6 +10,7 @@
 use Zend\Console\ColorInterface as Color;
 use Zend\Code\Generator;
 use Zend\Code\Reflection;
+use Zend\Filter\Word\CamelCaseToDash as CamelCaseToDashFilter;
 
 class CreateController extends AbstractActionController
 {
@@ -136,7 +137,10 @@ public function controllerAction()
             )
         );
 
-        $dir = $path . "/module/$module/view/" . strtolower($module) . "/" . strtolower($name);
+        $filter = new CamelCaseToDashFilter();
+        $viewfolder = strtolower($filter->filter($module));
+
+        $dir = $path . "/module/$module/view/$viewfolder/" . strtolower($filter->filter($name));
         if (!file_exists($dir)) {
             mkdir($dir, 0777, true);
         }
@@ -156,46 +160,42 @@ public function controllerAction()
 
     public function methodAction()
     {
-        $console->writeLine("Creating action '$action' in controller '$module\\$controller'.", Color::YELLOW);
+        $console        = $this->getServiceLocator()->get('console');
+        $request        = $this->getRequest();
+        $action         = $request->getParam('name');
+        $controller     = $request->getParam('controllerName');
+        $module         = $request->getParam('module');
+        $path           = $request->getParam('path', '.');
+        $ucController   = ucfirst($controller);
+        $controllerPath = sprintf('%s/module/%s/src/%s/Controller/%sController.php', $path, $module, $module, $ucController);
+        $class          = sprintf('%s\\Controller\\%sController', $module, $ucController);
 
-        $console = $this->getServiceLocator()->get('console');
-        $tmpDir  = sys_get_temp_dir();
 
-        $request = $this->getRequest();
-        $name    = $request->getParam('name');
-        $ctrl    = $request->getParam('controller');
-        $module  = $request->getParam('module');
-        $path    = $request->getParam('path', '.');
+        $console->writeLine("Creating action '$action' in controller '$module\\Controller\\$controller'.", Color::YELLOW);
 
         if (!file_exists("$path/module") || !file_exists("$path/config/application.config.php")) {
             return $this->sendError(
-                "The path $path doesn't contain a ZF2 application. I cannot create a module here."
+                "The path $path doesn't contain a ZF2 application. I cannot create a controller action."
             );
         }
-        if (!file_exists("$path/module/$module/src/$module/Controller/$ctrl")) {
+        if (!file_exists($controllerPath)) {
             return $this->sendError(
-                "The controller $name does not exists in module $module."
+                "The controller $controller does not exists in module $module. I cannot create a controller action."
             );
         }
 
-        $ucName     = ucfirst($ctrl);
-        $ctrlPath   = $path . '/module/' . $module . '/src/' . $module . '/Controller/' . $ucName.'Controller.php';
-        $controller = $ucName . 'Controller';
-        $action     = strtolower($name);
-
-        $code = new Generator\FileGenerate::fromRelection(
-            new Reflection\FileReflection($ctrlPath)
-        );
+        $fileReflection  = new Reflection\FileReflection($controllerPath, true);
+        $classReflection = $fileReflection->getClass($class);
 
-        $new_code = Generator\ClassGenerator::fromReflection($class);
+        $classGenerator = Generator\ClassGenerator::fromReflection($classReflection);
 
-        if ($new_code->hasMethod($action . 'Action')) {
+        if ($classGenerator->hasMethod($action . 'Action')) {
             return $this->sendError(
-                "The action $action already exists in controller $ctrl of module $module."
+                "The action $action already exists in controller $controller of module $module."
             );
         }
 
-        $new_code->addMethods(array(
+        $classGenerator->addMethods(array(
             new Generator\MethodGenerator(
                 $action . 'Action',
                 array(),
@@ -204,26 +204,32 @@ public function methodAction()
             ),
         ));
 
-        $file = new Generator\FileGenerator(
+        $fileGenerator = new Generator\FileGenerator(
             array(
-                'classes'  => array($new_code),
+                'classes'  => array($classGenerator),
             )
         );
 
-        $make_phtml = true;
-        $phtmlPath  = $path . "/module/$module/view/" . strtolower($module) . "/" . strtolower($ctrl) . '/' . $action . '.phtml';
-        if (file_exists($phtmlPath)) {
-            $make_phtml = false;
-        }
-
-        if ($make_phtml) {
-            if (file_put_contents($phtmlPath, 'Action "'.$action.'", controller "'.$ucName.'", module "'.$module.'".')) {
-                $phtml = true;
+        $filter    = new CamelCaseToDashFilter();
+        $phtmlPath = sprintf(
+            '%s/module/%s/view/%s/%s/%s.phtml',
+            $path,
+            $module,
+            strtolower($filter->filter($module)),
+            strtolower($filter->filter($controller)),
+            strtolower($filter->filter($action))
+        );
+        if (!file_exists($phtmlPath)) {
+            $contents = sprintf("Module: %s\nController: %s\nAction: %s", $module, $controller, $action);
+            if (file_put_contents($phtmlPath, $contents)) {
+                $console->writeLine(sprintf("Created view script at %s", $phtmlPath), Color::GREEN);
+            } else {
+                $console->writeLine(sprintf("An error occurred when attempting to create view script at location %s", $phtmlPath), Color::RED);
             }
         }
 
-        if (file_put_contents($ctrlPath, $file->generate())) {
-            $console->writeLine("The action $action has been created in controller $module\\$controller.", Color::GREEN);
+        if (file_put_contents($controllerPath, $fileGenerator->generate())) {
+            $console->writeLine(sprintf('The action %s has been created in controller %s\\Controller\\%s.', $action, $module, $controller), Color::GREEN);
         } else {
             $console->writeLine("There was an error during action creation.", Color::RED);
         }
@@ -252,7 +258,9 @@ public function moduleAction()
             );
         }
 
-        $viewfolder = strtolower($name);
+        $filter = new CamelCaseToDashFilter();
+        $viewfolder = strtolower($filter->filter($name));
+
         $name = ucfirst($name);
         mkdir("$path/module/$name/config", 0777, true);
         mkdir("$path/module/$name/src/$name/Controller", 0777, true);

src/ZFTool/Module.php

@@ -88,9 +88,9 @@ public function getConsoleUsage(ConsoleAdapterInterface $console)
             array('<path>', 'The root path of a ZF2 application where to create the controller'),
 
             'Action creation:',
-            'create action <name> <controller> <module> [<path>]' => 'create an action in a controller',
+            'create action <name> <controllerName> <module> [<path>]' => 'create an action in a controller',
             array('<name>', 'The name of the action to be created'),
-            array('<controller>', 'The name of the controller in which the action should be created'),
+            array('<controllerName>', 'The name of the controller in which the action should be created'),
             array('<module>', 'The module containing the controller'),
             array('<path>', 'The root path of a ZF2 application where to create the action'),