Fixed scripts.wsjcpp/generate.WsjcppJsonRpc20Handler

Author: sea5kg

CMakeLists.txt

@@ -11,6 +11,12 @@ set(EXECUTABLE_OUTPUT_PATH ${wsjcpp-jsonrpc20_SOURCE_DIR})
 list (APPEND WSJCPP_INCLUDE_DIRS "src")
 
 list (APPEND WSJCPP_SOURCES "src/main.cpp")
+list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20.h")
+list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20.cpp")
+
+# examples
+list (APPEND WSJCPP_SOURCES "./src/examples/wsjcpp_json_rpc20_handler_game_create.h")
+list (APPEND WSJCPP_SOURCES "./src/examples/wsjcpp_json_rpc20_handler_game_create.cpp")
 
 #### BEGIN_WSJCPP_APPEND
 #### END_WSJCPP_APPEND
@@ -28,3 +34,4 @@ install(
         /usr/bin
 )
 
+

README.md

@@ -30,6 +30,32 @@ $ wsjcpp install https://github.com/wsjcpp/wsjcpp-jsonrpc20:master
 * src/wsjcpp_jsonrpc20_export_cli_python.h
 * src/wsjcpp_jsonrpc20_export_cli_python.cpp
 
+## Prepare handler
+
+easy way:
+
+```
+$ wsjcpp generate WsjcppJsonRpc20Handler GameCreate
+```
+
+Will be generated new files 
+
+- ./src/wsjcpp_json_rpc20_handler_game_create.h
+- ./src/wsjcpp_json_rpc20_handler_game_create.cpp
+
+And automaticly included to CMakeLists.txt between `#### BEGIN_WSJCPP_APPEND` and `#### END_WSJCPP_APPEND`
+
+Like this:
+```
+#### BEGIN_WSJCPP_APPEND
+list (APPEND WSJCPP_SOURCES "./src/wsjcpp_json_rpc20_handler_game_create.h")
+list (APPEND WSJCPP_SOURCES "./src/wsjcpp_json_rpc20_handler_game_create.cpp")
+#### END_WSJCPP_APPEND
+```
+
+They will contains class `WsjcppJsonRpc20HandlerGameCreate` with method `game_create`
+
+
 ## Example 
 
 ``` cpp

scripts.wsjcpp/generate.WsjcppJsonRpc20Handler

@@ -5,10 +5,10 @@
 
 make_dir "src"
 
-var argument_processor_name
-set_value argument_processor_name arg1
-normalize_class_name argument_processor_name
-convert_CamelCase_to_snake_case argument_processor_name argument_processor_name
+var method_name
+set_value method_name arg1
+normalize_class_name method_name
+convert_CamelCase_to_snake_case method_name method_name
 
 var class_name
 concat class_name "WsjcppJsonRpc20Handler" arg1
@@ -34,7 +34,7 @@ var content_header
 concat content_header "#ifndef " ifndef_header "
 #define " ifndef_header "
 
-#include <wsjcpp_arguments.h>
+#include <wsjcpp_jsonrpc20.h>
 
 class " class_name " : public WsjcppJsonRpc20HandlerBase {
     public:
@@ -46,45 +46,46 @@ class " class_name " : public WsjcppJsonRpc20HandlerBase {
 
 
 var content_source
-concat content_source  "
+concat content_source "
 #include \"" base_filename ".h\"
+#include <wsjcpp_core.h>
 #include <wsjcpp_jsonrpc20.h>
 
 // ---------------------------------------------------------------------
 // " class_name "
 
 " class_name "::" class_name "() 
-: WsjcppJsonRpc20HandlerBase(\"" argument_processor_name "\", \"TODO description\") {
+: WsjcppJsonRpc20HandlerBase(\"" method_name "\", \"TODO description\") {
     TAG = \"" class_name "\";
     // setAccessUnauthorized(true);
     // setAccessUser(true);
-    // setAccessTester(\"here example of command\");
-    // setAccessAdmin();
-    // void setActivatedFromVersion(\"v0.0.1"); // TODO authomatic set WSJCPP_APP_VERSION
-    // void setDeprecatedFromVersion("");
+    // setAccessTester(true);
+    // setAccessAdmin(true);
+    // void setActivatedFromVersion(\"v0.0.1\"); // TODO authomatic set WSJCPP_APP_VERSION
+    // void setDeprecatedFromVersion(\"\");
 
     // description of input params
-    // requireStringParam(\"uuid\", "object uuid")
+    // requireStringParam(\"uuid\", \"object uuid\")
     //    .addValidator(new WsjcppValidatorUUID());
-    // optionalStringParam(\"name\", "Name of object")
+    // optionalStringParam(\"name\", \"Name of object\")
     //    .addValidator(new WsjcppValidatorStringLength(3,10));
 
-    // requireIntegerParam(\"cost\", "Name of object")
+    // requireIntegerParam(\"cost\", \"Name of object\")
     //    .addValidator(new WsjcppValidatorIntegerMinValue(3))
     //    .addValidator(new WsjcppValidatorIntegerMaxValue(1000));
-    // optionalIntegerParam(\"age\", "Name of object")
+    // optionalIntegerParam(\"age\", \"Name of object\")
     //    .addValidator(new WsjcppValidatorIntegerMinValue(0))
 
-    // requireBooleanParam(\"public\", "True if object is public");
-    // optionalBooleanParam(\"activated\", "If object can handle");
+    // requireBooleanParam(\"public\", \"True if object is public\");
+    // optionalBooleanParam(\"activated\", \"If object can handle\");
 }
 
 // ---------------------------------------------------------------------
 
 void " class_name "::handle(WsjcppJsonRpc20Request *pRequest) {
     WsjcppLog::err(TAG, \"Not implemented\");
     // TODO
-    pRequest->fail(WsjcppJsonRpc20Error(501, "NOT_IMPLEMENTED"));
+    pRequest->fail(WsjcppJsonRpc20Error(501, \"NOT_IMPLEMENTED\"));
 }
 
 "

src/examples/wsjcpp_json_rpc20_handler_game_create.cpp

@@ -0,0 +1,43 @@
+
+#include "wsjcpp_json_rpc20_handler_game_create.h"
+#include <wsjcpp_core.h>
+#include <wsjcpp_jsonrpc20.h>
+
+// ---------------------------------------------------------------------
+// WsjcppJsonRpc20HandlerGameCreate
+
+WsjcppJsonRpc20HandlerGameCreate::WsjcppJsonRpc20HandlerGameCreate() 
+: WsjcppJsonRpc20HandlerBase("game_create", "TODO description") {
+    TAG = "WsjcppJsonRpc20HandlerGameCreate";
+    // setAccessUnauthorized(true);
+    // setAccessUser(true);
+    // setAccessTester(true);
+    // setAccessAdmin(true);
+    // void setActivatedFromVersion("v0.0.1"); // TODO authomatic set WSJCPP_APP_VERSION
+    // void setDeprecatedFromVersion("");
+
+    // description of input params
+    // requireStringParam("uuid", "object uuid")
+    //    .addValidator(new WsjcppValidatorUUID());
+    // optionalStringParam("name", "Name of object")
+    //    .addValidator(new WsjcppValidatorStringLength(3,10));
+
+    // requireIntegerParam("cost", "Name of object")
+    //    .addValidator(new WsjcppValidatorIntegerMinValue(3))
+    //    .addValidator(new WsjcppValidatorIntegerMaxValue(1000));
+    // optionalIntegerParam("age", "Name of object")
+    //    .addValidator(new WsjcppValidatorIntegerMinValue(0))
+
+    // requireBooleanParam("public", "True if object is public");
+    // optionalBooleanParam("activated", "If object can handle");
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20HandlerGameCreate::handle(WsjcppJsonRpc20Request *pRequest) {
+    WsjcppLog::err(TAG, "Not implemented");
+    // TODO
+    pRequest->fail(WsjcppJsonRpc20Error(501, "NOT_IMPLEMENTED"));
+}
+
+

src/examples/wsjcpp_json_rpc20_handler_game_create.h

@@ -0,0 +1,12 @@
+#ifndef WSJCPP_JSON_RPC20_HANDLER_GAME_CREATE_H
+#define WSJCPP_JSON_RPC20_HANDLER_GAME_CREATE_H
+
+#include <wsjcpp_jsonrpc20.h>
+
+class WsjcppJsonRpc20HandlerGameCreate : public WsjcppJsonRpc20HandlerBase {
+    public:
+        WsjcppJsonRpc20HandlerGameCreate();
+        virtual void handle(WsjcppJsonRpc20Request *pRequest) override;
+};
+
+#endif // WSJCPP_JSON_RPC20_HANDLER_GAME_CREATE_H