Delphi/delphimvcframework
1
0
Fork 0
mirror of https://github.com/danieleteti/delphimvcframework.git synced 2024-11-15 07:45:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIXED some problems with built-in actions

Browse Source 
Polished the IDE Expert
Preparing for RC3
This commit is contained in:
Daniele Teti 2017-05-10 23:28:13 +02:00
parent 607c939b1d
commit 7900898df8
6 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
contributors.txt
View File

@ -1,19 +1,25 @@
Daniele Teti
Role: Founder, Lead Developer
email: d.teti@bittime.it
blog: www.danieleteti.it
company: www.bittimeprofessionals.it
country: ITALY
Role : Founder, Lead Developer
email : d.teti@bittime.it
blog : www.danieleteti.it
company : www.bittimeprofessionals.it
country : ITALY
Daniele Spinetti
Role: Expert, Senior Developer
email: d.spinetti@bittime.it
blog: www.danielespinetti.it
company: www.bittimeprofessionals.it
country: ITALY
Role : Expert, Senior Developer
email : d.spinetti@bittime.it
blog : www.danielespinetti.it
company : www.bittimeprofessionals.it
country : ITALY
Nick Hodges
Role : Expert, Senior Developer
blog : www.nickhodges.com, www.codingindelphi.com/blog/
company : www.embarcadero.com
country : USA
Ezequiel Juliano Müller
Role: Expert, Senior Developer
email: ezequieljuliano@gmail.com
blog: www.ezequieljuliano.com.br
country: BRAZIL
Role : Expert, Senior Developer
email : ezequieljuliano@gmail.com
blog : www.ezequieljuliano.com.br
country : BRAZIL

50
ideexpert/DMVC.Expert.CodeGen.Templates.pas
View File

@ -59,13 +59,13 @@ resourcestring
'var' + sLineBreak +
' lServer: TIdHTTPWebBrokerBridge;' + sLineBreak +
' lCustomHandler: TMVCCustomREPLCommandsHandler;' + sLineBreak +
' lCmd, lStartupCommand: string;' + sLineBreak +
' lCmd: string;' + sLineBreak +
'begin' + sLineBreak +
' Writeln(''** DMVCFramework Server ** build '' + DMVCFRAMEWORK_VERSION);' + sLineBreak +
' if ParamCount >= 1 then' + sLineBreak +
' lStartupCommand := ParamStr(1)' + sLineBreak +
' lCmd := ParamStr(1)' + sLineBreak +
' else' + sLineBreak +
' lStartupCommand := ''start'';' + sLineBreak +
' lCmd := ''start'';' + sLineBreak +
'' + sLineBreak +
' lCustomHandler := function(const Value: String; const Server: TIdHTTPWebBrokerBridge; out Handled: Boolean): THandleCommandResult' + sLineBreak +
' begin' + sLineBreak +
@ -103,32 +103,28 @@ resourcestring
'' + sLineBreak +
' WriteLn(''Write "quit" or "exit" to shutdown the server'');' + sLineBreak +
' repeat' + sLineBreak +
' // TextColor(RED);' + sLineBreak +
' // TextColor(LightRed);' + sLineBreak +
' Write(''-> '');' + sLineBreak +
' // TextColor(White);' + sLineBreak +
' if lStartupCommand.IsEmpty then' + sLineBreak +
' ReadLn(lCmd)' + sLineBreak +
' else' + sLineBreak +
' if lCmd.IsEmpty then' + sLineBreak +
' begin' + sLineBreak +
' lCmd := lStartupCommand;' + sLineBreak +
' lStartupCommand := '''';' + sLineBreak +
' WriteLn(lCmd);' + sLineBreak +
' Write(''-> '');' + sLineBreak +
' ReadLn(lCmd)' + sLineBreak +
' end;' + sLineBreak +
'' + sLineBreak +
' case HandleCommand(lCmd.ToLower, LServer, lCustomHandler) of' + sLineBreak +
' THandleCommandResult.Continue:' + sLineBreak +
' begin' + sLineBreak +
' Continue;' + sLineBreak +
' end;' + sLineBreak +
' THandleCommandResult.Break:' + sLineBreak +
' begin' + sLineBreak +
' Break;' + sLineBreak +
' end;' + sLineBreak +
' THandleCommandResult.Unknown:' + sLineBreak +
' begin' + sLineBreak +
' REPLEmit(''Unknown command: '' + lCmd);' + sLineBreak +
' end;' + sLineBreak +
' try' + sLineBreak +
' case HandleCommand(lCmd.ToLower, LServer, lCustomHandler) of' + sLineBreak +
' THandleCommandResult.Continue:' + sLineBreak +
' begin' + sLineBreak +
' Continue;' + sLineBreak +
' end;' + sLineBreak +
' THandleCommandResult.Break:' + sLineBreak +
' begin' + sLineBreak +
' Break;' + sLineBreak +
' end;' + sLineBreak +
' THandleCommandResult.Unknown:' + sLineBreak +
' begin' + sLineBreak +
' REPLEmit(''Unknown command: '' + lCmd);' + sLineBreak +
' end;' + sLineBreak +
' end;' + sLineBreak +
' finally' + sLineBreak +
' lCmd := '''';' + sLineBreak +
' end;' + sLineBreak +
' until false;' + sLineBreak +
'' + sLineBreak +

4
ideexpert/DMVC_IDE_Expert_D102Tokyo.dpk
View File

@ -50,6 +50,8 @@ contains
DMVC.Expert.CodeGen.NewControllerUnit in 'DMVC.Expert.CodeGen.NewControllerUnit.pas',
DMVC.Expert.NewUnitWizardEx in 'DMVC.Expert.NewUnitWizardEx.pas',
DMVC.Expert.ProjectWizardEx in 'DMVC.Expert.ProjectWizardEx.pas',
DMVC.Expert.CodeGen.NewWebModuleUnit in 'DMVC.Expert.CodeGen.NewWebModuleUnit.pas';
DMVC.Expert.CodeGen.NewWebModuleUnit in 'DMVC.Expert.CodeGen.NewWebModuleUnit.pas',
MVCFramework.TypesAliases in '..\sources\MVCFramework.TypesAliases.pas',
MVCFramework.Commons in '..\sources\MVCFramework.Commons.pas';
end.

6
ideexpert/DMVC_IDE_Expert_D102Tokyo.dproj
View File

@ -65,13 +65,13 @@
<DCC_K>false</DCC_K>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_UsePackage>rtl;IndySystem;IndyProtocols;IndyCore;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_UsePackage>rtl;IndySystem;IndyProtocols;IndyCore;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@ -125,6 +125,8 @@
<DCCReference Include="DMVC.Expert.NewUnitWizardEx.pas"/>
<DCCReference Include="DMVC.Expert.ProjectWizardEx.pas"/>
<DCCReference Include="DMVC.Expert.CodeGen.NewWebModuleUnit.pas"/>
<DCCReference Include="..\sources\MVCFramework.TypesAliases.pas"/>
<DCCReference Include="..\sources\MVCFramework.Commons.pas"/>
<RcItem Include="DMVC.Expert.NewProject.ico">
<ResourceType>ICON</ResourceType>
<ResourceId>DMVCNewProjectIcon</ResourceId>

7
sources/MVCFramework.SysControllers.pas
View File

@ -102,7 +102,7 @@ begin
Jo.AddPair('CPU_architecture', GetEnumName(TypeInfo(TOSVersion.TArchitecture), Ord(TOSVersion.Architecture)));
Jo.AddPair('system_time', FormatDateTime('YYYY-MM-DD HH:NN:SS', Now));
ContentType := TMVCMediaType.APPLICATION_JSON;
Serializer.SerializeObject(Jo);
Render(Jo, False);
finally
Jo.Free;
end;
@ -200,7 +200,7 @@ begin
end;
end;
ContentType := TMVCMediaType.APPLICATION_JSON;
Serializer.SerializeObject(LJoResp);
Render(LJoResp, False);
finally
LJoResp.Free;
end;
@ -234,7 +234,8 @@ begin
Keys := Config.Keys;
for Key in Keys do
Jo.AddPair(Key, Config[Key]);
Serializer.SerializeObject(Jo);
ContentType := TMVCMediaType.APPLICATION_JSON;
Render(Jo, False);
finally
Jo.Free;
end;

2
sources/dmvcframeworkbuildconsts.inc
View File

@ -1,2 +1,2 @@
const
DMVCFRAMEWORK_VERSION = '3.0.0 hydrogen RC1';
DMVCFRAMEWORK_VERSION = '3.0.0 hydrogen RC3';