- fixed bug "ethna add-app-manager" command result was not reflected [Appid]_Controll...

diff --git a/CHANGES b/CHANGES
index 8c3b036..b21ecd9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@
 - "ethna add-view" コマンドにて、locale 及び client encoding のデフォルト設定が誤っていたバグを修正
 - Ethna_Renderer_Rhaco.php を 1.x 系の最新バージョン 1.6.1 に追随 (thanks: id:akiraneko [ethna-users:1081])
 - 複数ファイルをアップロード(つまり配列を使用)する際、必須チェックが機能しなかったバグを修正(thanks: id:syachi5150)
+- ethna add-app-manager コマンドで生成されるアプリケーションマネージャのクラス名が、[Appid]_Controller#getManagerClassName の設定を反映するように修正。
 
 ** 2.5.0-preview2
 

diff --git a/class/Plugin/Generator/Ethna_Plugin_Generator_AppManager.php b/class/Plugin/Generator/Ethna_Plugin_Generator_AppManager.php
index 93fd355..bb5ac85 100644 (file)
--- a/class/Plugin/Generator/Ethna_Plugin_Generator_AppManager.php
+++ b/class/Plugin/Generator/Ethna_Plugin_Generator_AppManager.php
@@ -28,15 +28,14 @@ class Ethna_Plugin_Generator_AppManager extends Ethna_Plugin_Generator
      */
     function generate($manager_name)
     {
-        $manager_id = preg_replace('/_(.)/e', "strtoupper('\$1')", ucfirst($manager_name));
-
+        $class_name = $this->ctl->getManagerClassName($manager_name);
         $app_dir = $this->ctl->getDirectory('app');
-        $app_path = ucfirst($this->ctl->getAppId()) . '_' . $manager_id .'Manager.php';
+        $app_path = "${class_name}.php";
 
         $macro = array();
         $macro['project_id'] = $this->ctl->getAppId();
         $macro['app_path'] = $app_path;
-        $macro['app_manager'] = ucfirst($this->ctl->getAppId()) . '_' . $manager_id;
+        $macro['app_manager'] = $class_name;
 
         $user_macro = $this->_getUserMacro();
         $macro = array_merge($macro, $user_macro);