Merge pull request #2 from viniciussanchez/master

Improvements

Author: viniciussanchez

.gitignore

@@ -1,11 +1,32 @@
-dist/
-**/Win32/
-**/Win64/
-**/Linux64/
-**/__history/
-**/__recovery/
-src/*.~*
-*.res
+# Uncomment these types if you want even more clean repository. But be careful.
+# It can make harm to an existing project source. Read explanations below.
+#
+# Resource files are binaries containing manifest, project icon and version info.
+# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files.
+#*.res
+#
+# Type library file (binary). In old Delphi versions it should be stored.
+# Since Delphi 2009 it is produced from .ridl file and can safely be ignored.
+#*.tlb
+#
+# Diagram Portfolio file. Used by the diagram editor up to Delphi 7.
+# Uncomment this if you are not using diagrams or use newer Delphi version.
+#*.ddp
+#
+# Visual LiveBindings file. Added in Delphi XE2.
+# Uncomment this if you are not using LiveBindings Designer.
+#*.vlb
+#
+# Deployment Manager configuration file for your project. Added in Delphi XE2.
+# Uncomment this if it is not mobile development and you do not use remote debug feature.
+#*.deployproj
+#
+# C++ object files produced when C/C++ Output file generation is configured.
+# Uncomment this if you are not using external objects (zlib library for example).
+#*.obj
+#
+
+# Delphi compiler-generated binaries (safe to delete)
 *.exe
 *.dll
 *.bpl
@@ -23,15 +44,26 @@ src/*.~*
 *.a
 *.o
 *.ocx
+
+# Delphi autogenerated files (duplicated info)
+*.cfg
+*.hpp
+*Resource.rc
+
+# Delphi local files (user-specific info)
 *.local
 *.identcache
 *.projdata
 *.tvsconfig
 *.dsk
-*.dcu
-*.exe
-*.so
+
+# Delphi history and backups
+__history/
+__recovery/
 *.~*
-*.a
+
+# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
 *.stat
-/modules/
+
+# Boss dependency manager vendor folder https://github.com/HashLoad/boss
+modules/

boss-lock.json

@@ -1,11 +1,11 @@
 {
-	"hash": "b14e6a77427d10f868e9622e3b2074b0",
-	"updated": "2019-07-26T10:10:24.8937824-03:00",
+	"hash": "d41d8cd98f00b204e9800998ecf8427e",
+	"updated": "2020-04-15T11:05:15.0912204-03:00",
 	"installedModules": {
-		"github.com/hunsche/datasetconverter4delphi": {
-			"name": "DataSetConverter4Delphi",
-			"version": "2.0.0",
-			"hash": "86494a27f5010c6819d370b1d4008621",
+		"github.com/viniciussanchez/dataset-serialize": {
+			"name": "dataset-serialize",
+			"version": "v2.0.3",
+			"hash": "0eef525d669652f4bb1468bfbdea879b",
 			"artifacts": {},
 			"failed": false,
 			"changed": false

boss.json

@@ -3,9 +3,9 @@
 	"description": "",
 	"version": "1.0.0",
 	"homepage": "",
-	"mainsrc": "src/",
+	"mainsrc": "src",
 	"projects": [],
 	"dependencies": {
-		"github.com/hunsche/DataSetConverter4Delphi": "^2.0.0"
+		"github.com/viniciussanchez/dataset-serialize": "^v2.0.3"
 	}
 }

ragna.dpk

@@ -36,11 +36,12 @@ requires
   FireDACCommon;
 
 contains
-  Ragna.Criteria in 'src\Ragna.Criteria.pas',
-  Ragna.Impl in 'src\Ragna.Impl.pas',
-  Ragna.Intf in 'src\Ragna.Intf.pas',
-  Ragna in 'src\Ragna.pas',
-  Ragna.State in 'src\Ragna.State.pas';
+  Ragna.Intf in 'src\interfaces\Ragna.Intf.pas',
+  Ragna.Criteria.Intf in 'src\interfaces\Ragna.Criteria.Intf.pas',
+  Ragna.Criteria.Impl in 'src\core\Ragna.Criteria.Impl.pas',
+  Ragna.Impl in 'src\core\Ragna.Impl.pas',
+  Ragna in 'src\helpers\Ragna.pas',
+  Ragna.State in 'src\state\Ragna.State.pas',
+  Ragna.Types in 'src\types\Ragna.Types.pas';
 
 end.
-

ragna.dproj

@@ -53,7 +53,7 @@
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
         <SanitizedProjectName>ragna</SanitizedProjectName>
-        <DCC_UnitSearchPath>C:\Users\hunsc\projects\hashload\ragna\modules\DataSetConverter4Delphi\src\;C:\Users\hunsc\projects\hashload\ragna\modules\DataSetConverter4Delphi\unittest\;modules\.dcp;modules\.dcu;modules;modules\DataSetConverter4Delphi\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>modules\.dcp;modules\.dcu;modules;modules\dataset-serialize\samples\src;modules\dataset-serialize\src\core;modules\dataset-serialize\src\helpers;modules\dataset-serialize\src\providers;modules\dataset-serialize\src\singletons;modules\dataset-serialize\src\types;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
         <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
@@ -94,11 +94,13 @@
         <DCCReference Include="FireDAC.dcp"/>
         <DCCReference Include="FireDACCommonDriver.dcp"/>
         <DCCReference Include="FireDACCommon.dcp"/>
-        <DCCReference Include="src\Ragna.Criteria.pas"/>
-        <DCCReference Include="src\Ragna.Impl.pas"/>
-        <DCCReference Include="src\Ragna.Intf.pas"/>
-        <DCCReference Include="src\Ragna.pas"/>
-        <DCCReference Include="src\Ragna.State.pas"/>
+        <DCCReference Include="src\interfaces\Ragna.Intf.pas"/>
+        <DCCReference Include="src\interfaces\Ragna.Criteria.Intf.pas"/>
+        <DCCReference Include="src\core\Ragna.Criteria.Impl.pas"/>
+        <DCCReference Include="src\core\Ragna.Impl.pas"/>
+        <DCCReference Include="src\helpers\Ragna.pas"/>
+        <DCCReference Include="src\state\Ragna.State.pas"/>
+        <DCCReference Include="src\types\Ragna.Types.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -117,8 +119,10 @@
         <BorlandProject>
             <Delphi.Personality>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclDataSnapNativeServer260.bpl">Embarcadero DBExpress DataSnap Native Server Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\dclcxPivotGridOLAPRS26.bpl">ExpressPivotGrid OLAP by Developer Express Inc.</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
                 <Source>
                     <Source Name="MainSource">ragna.dpk</Source>
@@ -130,7 +134,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\..\..\..\Public\Documents\Embarcadero\Studio\19.0\Bpl\ragna.bpl" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="..\..\..\Public\Documents\Embarcadero\Studio\20.0\Bpl\ragna.bpl" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>ragna.bpl</RemoteName>
                         <Overwrite>true</Overwrite>