Switched to Singleton enabled by default for ease of use for #1

Utilize a custom radDotEnv_DisableSingleton define to disable.

Author: darianmiller

demo/radDotEnv.DemoConsoleApp.MainU.pas

@@ -11,25 +11,17 @@ implementation
   radDotEnv;
 
 procedure MainDemo;
-var
-  env:iDotEnv;
 begin
-  //alternatively, define a new define radDotEnv_SINGLETON and use the global DotEnv
-  env := NewDotEnv.UseRetrieveOption(TRetrieveOption.PreferDotEnv)
-                  .UseSetOption(TSetOption.AlwaysSet)
-                  .UseEscapeSequenceInterpolationOption(TEscapeSequenceInterpolationOption.SupportEscapesInDoubleQuotedValues)
-                  .Load;
-
 (*
 Demo .env file contents =
 USER=admin
 EMAIL="${USER}@example.org"
 DATABASE_URL="postgres://${USER}@localhost/my_database"
 *)
 
-  WriteLn('USER=' + env.Get('USER'));   //should be:  "USER=admin"
-  WriteLn('EMAIL=' + env.Get('EMAIL'));  //should be:  "[email protected]"
-  WriteLn('DATABASE_URL=' + env.Get('DATABASE_URL')); //should be: "DATABASEURL=postgres://admin@localhost/my_database"
+  WriteLn('USER=' + DotEnv.Get('USER'));   //should be:  "USER=admin"
+  WriteLn('EMAIL=' + DotEnv.Get('EMAIL'));  //should be:  "[email protected]"
+  WriteLn('DATABASE_URL=' + DotEnv.Get('DATABASE_URL')); //should be: "DATABASEURL=postgres://admin@localhost/my_database"
 
   ReadLn;
 end;

demo/radDotEnv.DemoConsoleApp.dproj

@@ -35,16 +35,9 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
-        <Cfg_2_Win32>true</Cfg_2_Win32>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
         <SanitizedProjectName>radDotEnv_DemoConsoleApp</SanitizedProjectName>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
-        <DCC_Define>radDotEnv_SINGLETON;$(DCC_Define)</DCC_Define>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -81,9 +74,6 @@
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_Locale>1033</VerInfo_Locale>
-    </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>

source/radDotEnv.pas

@@ -7,8 +7,8 @@
 
 interface
 
-// Compiler define option to create a singleton DotEnv variable during initialization for ease of use
-{.$DEFINE radDotEnv_SINGLETON }
+// Compiler define option to disable the creation of a singleton DotEnv variable during initialization if desired
+{.$DEFINE radDotEnv_DisableSingleton }
 
 uses
   System.SysUtils,
@@ -119,7 +119,7 @@ function NewDotEnv:iDotEnv; overload;
 function NewDotEnv(const Options:TDotEnvOptions):iDotEnv; overload;
 
 
-{$IFDEF radDotEnv_SINGLETON}
+{$IFNDEF radDotEnv_DisableSingleton}
 var
   DotEnv:iDotEnv;
   {$IFEND}
@@ -944,8 +944,9 @@ procedure TDotEnv.GuardedParseDotEnvFileContents(const Contents:string);
 initialization
 
 LoadGuard := TObject.Create;
-{$IFDEF radDotEnv_SINGLETON}
-DotEnv := NewDotEnv;
+
+{$IFNDEF radDotEnv_DisableSingleton}
+DotEnv := NewDotEnv.Load;
 {$IFEND}
 
 finalization