Merge remote-tracking branch 'origin/master'

Author: zamronypj

build.cmd

@@ -10,13 +10,14 @@ REM ------------------------------------
 REM -- build script for Windows
 REM ------------------------------------
 
-SET FANO_DIR="vendor/fano"
 
+IF NOT DEFINED FANO_DIR (SET FANO_DIR="vendor/fano")
 IF NOT DEFINED BUILD_TYPE (SET BUILD_TYPE="prod")
 IF NOT DEFINED USER_APP_DIR (SET USER_APP_DIR="src")
 IF NOT DEFINED UNIT_OUTPUT_DIR (SET UNIT_OUTPUT_DIR="bin\unit")
 IF NOT DEFINED EXEC_OUTPUT_DIR (SET EXEC_OUTPUT_DIR="public")
 IF NOT DEFINED EXEC_OUTPUT_NAME (SET EXEC_OUTPUT_NAME="app.cgi")
 IF NOT DEFINED SOURCE_PROGRAM_NAME (SET SOURCE_PROGRAM_NAME="app.pas")
+IF NOT DEFINED FPC_BIN (SET FPC_BIN="fpc")
 
-fpc @vendor/fano/fano.cfg @build.cfg %USER_APP_DIR%\%SOURCE_PROGRAM_NAME%
+%FPC_BIN% @vendor/fano/fano.cfg @build.cfg %USER_APP_DIR%\%SOURCE_PROGRAM_NAME%

build.sh

@@ -11,7 +11,10 @@
 # Build script for Linux
 #------------------------------------------------------
 
+
+if [[ -z "${FANO_DIR}" ]]; then
 export FANO_DIR="vendor/fano"
+fi
 
 if [[ -z "${BUILD_TYPE}" ]]; then
 export BUILD_TYPE="prod"
@@ -34,7 +37,11 @@ export EXEC_OUTPUT_NAME="app.cgi"
 fi
 
 if [[ -z "${SOURCE_PROGRAM_NAME}" ]]; then
-SOURCE_PROGRAM_NAME="app.pas"
+export SOURCE_PROGRAM_NAME="app.pas"
+fi
+
+if [[ -z "${FPC_BIN}" ]]; then
+export FPC_BIN="fpc"
 fi
 
-fpc @vendor/fano/fano.cfg @build.cfg ${USER_APP_DIR}/${SOURCE_PROGRAM_NAME}
+${FPC_BIN} @vendor/fano/fano.cfg @build.cfg ${USER_APP_DIR}/${SOURCE_PROGRAM_NAME}

src/App/User/Models/UserModel.pas

@@ -1,9 +1,9 @@
 (*!------------------------------------------------------------
  * Fano Framework Skeleton Application (https://fanoframework.github.io)
  *
- * @link      https://github.com/fanoframework/fano-app-views
+ * @link      https://github.com/fanoframework/fano-mvc
  * @copyright Copyright (c) 2018 Zamrony P. Juhara
- * @license   https://github.com/fanoframework/fano-app-views/blob/master/LICENSE (GPL 3.0)
+ * @license   https://github.com/fanoframework/fano-mvc/blob/master/LICENSE (GPL 3.0)
  *------------------------------------------------------------- *)
 unit UserModel;
 
@@ -24,7 +24,7 @@ interface
      *
      * @author Zamrony P. Juhara <zamronypj@yahoo.com>
      *------------------------------------------------*)
-    TUserModel = class(TInterfacedObject, IModelReader, IModelReadOnlyData, IDependency)
+    TUserModel = class(TInterfacedObject, IModelReader, IModelResultSet, IDependency)
     private
         jsonData : TJSONData;
         jsonFilename : string;
@@ -33,8 +33,8 @@     TUserModel = class(TInterfacedObject, IModelReader, IModelReadOnlyData, IDep
         constructor create(const jsonDataSrc : string);
         destructor destroy(); override;
 
-        function read(const params : IModelWriteOnlyData = nil) : IModelReadOnlyData;
-        function data() : IModelReadOnlyData;
+        function read(const params : IModelParams = nil) : IModelResultSet;
+        function data() : IModelResultSet;
 
         (*!------------------------------------------------
          * get total data
@@ -87,8 +87,8 @@ implementation
     end;
 
     function TUserModel.read(
-        const params : IModelWriteOnlyData = nil
-    ) : IModelReadOnlyData;
+        const params : IModelParams = nil
+    ) : IModelResultSet;
     var fstr : TFileStream;
     begin
         fstr:= TFileStream.create(jsonFilename, fmOpenRead or fmShareDenyWrite);
@@ -101,7 +101,7 @@ implementation
         result := self;
     end;
 
-    function TUserModel.data() : IModelReadOnlyData;
+    function TUserModel.data() : IModelResultSet;
     begin
         result := self;
     end;

src/App/User/Views/UserListingView.pas

@@ -1,9 +1,9 @@
 (*!------------------------------------------------------------
  * Fano Web Framework Skeleton Application (https://fanoframework.github.io)
  *
- * @link      https://github.com/fanoframework/fano-app
+ * @link      https://github.com/fanoframework/fano-mvc
  * @copyright Copyright (c) 2018 Zamrony P. Juhara
- * @license   https://github.com/fanoframework/fano-app/blob/master/LICENSE (GPL 3.0)
+ * @license   https://github.com/fanoframework/fano-mvc/blob/master/LICENSE (GPL 3.0)
  *------------------------------------------------------------- *)
 unit UserListingView;
 
@@ -64,7 +64,7 @@ implementation
         const viewParams : IViewParameters;
         const response : IResponse
     ) : IResponse;
-    var userData : IModelReadOnlyData;
+    var userData : IModelResultSet;
         respBody : IResponseStream;
     begin
         userData := userModel.data();

src/Templates/footer.html

@@ -1,4 +1,4 @@
-            <!---end content (see header.html)--->
+            <!-- end content (see header.html) -->
         </div>
 
     </section>

src/Templates/header.html

@@ -52,4 +52,4 @@ <h1>Fano</h1>
         </div>
 
         <div class="hero-body">
-            <!---begin content (see footer.html)--->
+            <!-- begin content (see footer.html) -->