0.2.0 (#7)

* Updated to toml++ v3.3.0
* Added `terseKeyValuePairs` to the list of formatting options for `toml.encode`
* Tables can be made inline.
* `toml.decode` can decode date, time and date-time into userdata or plain tables.
* Use luaunit instead of busted for testing
* Boolean values are decoded as booleans instead of integers. (#6)
* Run tests on Windows
* Start preparing for TOMLInt (userdata type for formatted integers)
* If `lua` is not available, use `luajit` (Linux CI)
* Update TOC
* Date, time and date-time should not be quoted by default.
* Update Changelog

Author: LebJe

.github/workflows/buildAndTest-Linux.yml

@@ -24,7 +24,7 @@ jobs:
                   sudo apt update
                   sudo apt install -yq ${{ matrix.lua }} "$C_COMPILER_PACKAGE" "$CXX_COMPILER_PACKAGE"
                   ./scripts/buildLuaRocks.sh
-                  sudo luarocks install busted
+                  sudo luarocks install luaunit
             - name: "Build Project"
               run: |
                   export COMPILER=${{ matrix.compiler }}
@@ -33,4 +33,11 @@ jobs:
                   luarocks config "variables.CMAKE_CXX_COMPILER" "$CXX_COMPILER"
                   sudo CXX="$CXX_COMPILER" CC="$C_COMPILER" luarocks make
             - name: "Test Project"
-              run: "busted"
+              run: |
+                  if ! command -v lua &> /dev/null
+                  then
+                      luajit tests/tests.lua
+                      exit
+                  else
+                      lua tests/tests.lua
+                  fi

.github/workflows/buildAndTest-MacOS.yml

@@ -13,8 +13,8 @@ jobs:
             - name: "Install Dependencies"
               run: |
                   brew install ${{ matrix.lua }} luarocks
-                  luarocks install busted
+                  luarocks install luaunit
             - name: "Build Project"
               run: "luarocks make"
             - name: "Test Project"
-              run: "busted"
+              run: "lua tests/tests.lua"

.github/workflows/buildAndTest-Windows.yml

@@ -43,25 +43,14 @@ jobs:
 
                   LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" config cmake_generator "Ninja Multi-Config"
                   LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" make
-            - name: "Run Example"
+            - name: "Run Tests"
               run: |
                   mkdir LuaRocks\tree\share\lua\5.1\
                   $env:LUAROCKS_TREE=$(Resolve-Path LuaRocks\tree)
                   $env:LUAROCKS_LUADIR=$(Resolve-Path LuaJIT\)
                   $env:LUAROCKS_CONFIG="$(Resolve-Path LuaRocks\tree\luaRocksConfig.lua)"
                   $env:LUA_CPATH="$(Resolve-Path LuaRocks\tree\lib\lua\5.1\)?.dll"
-                  $env:LUA_PATH="$(Resolve-Path LuaRocks\tree\share\lua\5.1\)?.lua"
-                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" install inspect
+                  $env:LUA_PATH="$(Resolve-Path LuaRocks\tree\share\lua\5.1\)?.lua;$($pwd.Path)\?.lua"
+                  LuaRocks\luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" install luaunit
 
-                  LuaJIT\bin\luajit.exe examples\example.lua
-            # - name: "Set up MinGW"
-            #   uses: "egor-tensin/setup-mingw@v2"
-            #   with:
-            #       platform: "x64"
-            # - name: "Install busted"
-            #   run: |
-            #       $env:LUAROCKS_TREE=$(Resolve-Path LuaRocks\tree)
-            #       $env:LUAROCKS_LUADIR=$(Resolve-Path LuaJIT\)
-            #       $env:LUAROCKS_CONFIG="$(Resolve-Path LuaRocks\tree\luaRocksConfig.lua)"
-
-            #       LuaRocks/luarocks.exe --lua-dir "$($env:LUAROCKS_LUADIR)" --tree "$($env:LUAROCKS_TREE)" install busted
+                  LuaJIT\bin\luajit.exe tests\tests.lua

.gitignore

@@ -6,6 +6,8 @@ compile_commands.json
 *.rock
 *.so
 *.dll
-
+.DS_Store
 Brewfile.lock.json
-.vscode
+.vscode/
+.nova/
+.vim/

CHANGELOG.md

@@ -5,6 +5,77 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0](https://github.com/LebJe/toml.lua/releases/tag/0.2.0) - 2023-02-12
+
+### Added
+
+-   Updated to toml++ v3.3.0
+-   Added `terseKeyValuePairs` to the list of formatting options for `toml.encode`
+-   Tables can be made inline.
+-   `toml.decode` can decode date, time and date-time into userdata (as before) or plain tables:
+
+    ```lua
+    local tomlStr = [[
+    date = 1979-05-27
+    time = 07:32:00
+    datetime = 1979-05-27T07:32:00-07:00
+    ]]
+
+    local table1 = toml.decode(tomlStr, { temporalTypesAsUserData = true })
+    local table2 = toml.decode(tomlStr, { temporalTypesAsUserData = false })
+
+    print(inspect(table1))
+    --[[
+    {
+    	date = <userdata 1> -- 1979-05-27,
+    	time = <userdata 2> -- 07:32:00,
+    	datetime = <userdata 3> -- 1979-05-27T07:32:00-07:00
+    }
+    --]]
+
+    print(inspect(table2))
+    --[[
+    {
+    	date = {
+    		day = 27,
+    		month = 5,
+    		year = 1979
+    	},
+    	datetime = {
+    		date = {
+    			day = 27,
+    			month = 5,
+    		year = 1979
+    		},
+    		time = {
+    			hour = 7,
+    			minute = 32,
+    			nanoSecond = 0,
+    			second = 0
+    		},
+    		timeOffset = { minutes = -420 }
+    	},
+    	time = {
+    		hour = 7,
+    		minute = 32,
+    		nanoSecond = 0,
+    		second = 0
+    	}
+    }
+    --]]
+    ```
+
+-   Test suite now runs on Windows
+
+### Changed
+
+-   Use [luaunit](https://github.com/bluebird75/luaunit) instead of [busted](https://github.com/lunarmodules/busted) for testing
+-   `quoteDatesAndTimes` now defaults to `false`.
+
+### Fixed
+
+-   Boolean values are decoded as booleans instead of integers. (#6)
+
 ## [0.1.1](https://github.com/LebJe/toml.lua/releases/tag/0.1.1) - 2022-06-14
 
 ### Added

CMakeLists.txt

@@ -31,7 +31,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # compile in release mode by default
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
+	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif()
 
 include(FetchContent)
@@ -41,23 +41,23 @@ FetchContent_Declare(
 	GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git"
 	GIT_SHALLOW ON
     GIT_SUBMODULES ""
-	GIT_TAG "v3.0.1"
+	GIT_TAG "v3.3.0"
 )
 
 FetchContent_Declare(
 	${SOL2}
 	GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
 	GIT_SHALLOW ON
     GIT_SUBMODULES ""
-	GIT_TAG "v3.2.3"
+	GIT_TAG "v3.3.0"
 )
 
 FetchContent_Declare(
 	${MAGIC_ENUM}
 	GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
 	GIT_SHALLOW ON
     GIT_SUBMODULES ""
-	GIT_TAG "v0.8.0"
+	GIT_TAG "v0.8.2"
 )
 
 FetchContent_GetProperties(${TOML++})
@@ -119,7 +119,8 @@ set(SOURCES
     src/toml.cpp
     src/decoding/decoding.cpp
     src/encoding/encoding.cpp
-    src/DateAndTime/dateAndTime.cpp
+	src/DataTypes/DateAndTime/dateAndTime.cpp
+	src/DataTypes/TOMLInt/TOMLInt.cpp
     src/utilities/utilities.cpp
 )
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Jeff Lebrun
+Copyright (c) 2023 Jeff Lebrun
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal