😉 wokrking serialization of tuples to json.

Author: daminetreg

pre/json/detail/dejsonizer.hpp

@@ -181,7 +181,16 @@ namespace pre { namespace json { namespace detail {
 
       auto t = boost::pfr::structure_tie(value);
       boost::hana::for_each(t, 
-      [this]<cx::static_string key_, class TVal>(pre::cx::key_value_pair<key_, TVal>& x) {
+      [this](auto& x) {
+        this->operator()(x);
+      });
+    }
+
+    //! tuples
+    template<requirements::tuple_like T>
+    void operator()(T& value) const {
+      boost::hana::for_each(value, 
+      [this](auto& x) {
         this->operator()(x);
       });
     }

pre/json/detail/jsonizer.hpp

@@ -137,7 +137,16 @@ namespace pre { namespace json { namespace detail {
     void operator()(const T& value) const {
       auto t = boost::pfr::structure_tie(value);
       boost::hana::for_each(t, 
-      [this]<cx::static_string key_, class TVal>(pre::cx::key_value_pair<key_, TVal> x) {
+      [this](const auto& x) {
+        this->operator()(x);
+      });
+    }
+
+    //! tuples
+    template<requirements::tuple_like T>
+    void operator()(const T& value) const {
+      boost::hana::for_each(value, 
+      [this](const auto& x) {
         this->operator()(x);
       });
     }

pre/json/detail/sfinae_enabler.hpp

@@ -68,6 +68,29 @@ namespace pre { namespace json { namespace detail {
       traits::is_associative_container<T>::value 
     ,T>::type;
 
+    namespace requirements {
+      template<class T, std::size_t N>
+      concept has_tuple_element =
+        requires(T t) {
+          typename std::tuple_element_t<N, std::remove_const_t<T>>;
+          { get<N>(t) } -> std::convertible_to<const std::tuple_element_t<N, T>&>;
+        };
+
+      template<class T>
+      concept tuple_like = !std::is_reference_v<T> 
+        && requires(T t) { 
+          typename std::tuple_size<T>::type; 
+          requires std::derived_from<
+            std::tuple_size<T>, 
+            std::integral_constant<std::size_t, std::tuple_size_v<T>>
+          >;
+        } && []<std::size_t... N>(std::index_sequence<N...>) { 
+          return (has_tuple_element<T, N> && ...); 
+        }(std::make_index_sequence<std::tuple_size_v<T>>());
+
+      template<class T>
+      concept not_tuple_like = !tuple_like<T>;
+    }
 }}}
 
 #endif

test/dejsonize_test.cpp

@@ -666,5 +666,66 @@ BOOST_AUTO_TEST_CASE (compile_time_named_fields_no_adapt_struct) {
     BOOST_REQUIRE(vals == val_deserialized);
   }
 
+  {
+    using pre::cx::key_value_pair;
+    using namespace datamodel;
+    using namespace std::literals;
+
+    auto val = std::make_tuple(
+      key_value_pair<"ssh_public_key"         , std::string>  {"key"s},
+      key_value_pair<"environment_name"       , std::string>  {"env"s},
+      key_value_pair<"environment_zip_hash"   , std::string>  {"zip_hash"s},
+      key_value_pair<"job_size"               , std::size_t>  {434343},
+      key_value_pair<"environment_zip"        , std::string>  {"zip"s},
+      key_value_pair<"user"                   , cashier>      {{ .section="wine & spirits", .checkout_number=27}} 
+    );
+
+    auto val_json = pre::json::to_json(val);
+    std::cout << val_json.dump(2) << std::endl;
+
+    auto val_deserialized = pre::json::from_json<decltype(val)>(val_json); 
+
+    auto val_reserialized = pre::json::to_json(val_deserialized);
+    std::cout << val_reserialized.dump(2) << std::endl;
+
+    BOOST_REQUIRE(val == val_deserialized);
+  }
+
+
+    {
+    using pre::cx::key_value_pair;
+    using namespace datamodel;
+    using namespace std::literals;
+
+    auto val = std::make_tuple(
+      key_value_pair<"ssh_public_key"         , std::string>  {"key"s},
+      key_value_pair<"environment_name"       , std::string>  {"env"s},
+      key_value_pair<"environment_zip_hash"   , std::string>  {"zip_hash"s},
+      key_value_pair<"job_size"               , std::size_t>  {434343},
+      key_value_pair<"environment_zip"        , std::string>  {"zip"s},
+      key_value_pair<"user"                   , cashier>      {{ .section="wine & spirits", .checkout_number=27}} 
+    );
+
+    std::vector vals { val };
+    vals.push_back(std::make_tuple(
+      key_value_pair<"ssh_public_key"         , std::string>  {"yoooo"s},
+      key_value_pair<"environment_name"       , std::string>  {"woui"s},
+      key_value_pair<"environment_zip_hash"   , std::string>  {"noooooo"s},
+      key_value_pair<"job_size"               , std::size_t>  {540210},
+      key_value_pair<"environment_zip"        , std::string>  {"timeeeee"s},
+      key_value_pair<"user"                   , cashier>      {{ .section="Gemüse", .checkout_number=3486}} 
+    ));
+
+    auto val_json = pre::json::to_json(vals);
+    std::cout << val_json.dump(2) << std::endl;
+
+    auto val_deserialized = pre::json::from_json<decltype(vals)>(val_json); 
+
+    auto val_reserialized = pre::json::to_json(val_deserialized);
+    std::cout << val_reserialized.dump(2) << std::endl;
+
+    BOOST_REQUIRE(vals == val_deserialized);
+  }
+
 
 }