Use ranges v3 (#131)

* Replaced some skyr functions with range v3, and removed some redundant code

* Added range-v3 to CI builds

* Disabled MSVC 2017 because of range-v3 support

* Resolved some missing directories from install step that were removed

* Removed a lot of redundant code from percent_encoding

* Fixed missing header in json.hpp

* Cleaned up redundant code in unicode functions and iterators

* constexpr crazy

* Corrected includes

Author: glynos

.appveyor.yml

@@ -1,5 +1,5 @@
 image:
- - Visual Studio 2017
+# - Visual Studio 2017
  - Visual Studio 2019
 
 platform:
@@ -17,7 +17,7 @@ install:
   - cd C:\Tools\vcpkg
   - git pull
   - .\bootstrap-vcpkg.bat
-  - vcpkg install tl-expected catch2 nlohmann-json fmt --triplet x64-windows
+  - vcpkg install tl-expected range-v3 catch2 nlohmann-json fmt --triplet x64-windows
   - vcpkg integrate install
   - cd %APPVEYOR_BUILD_FOLDER%
 

.travis.yml

@@ -109,7 +109,7 @@ install:
   - git checkout -b master origin/master
   - export
   - ./bootstrap-vcpkg.sh
-  - ./vcpkg install tl-expected catch2 nlohmann-json fmt
+  - ./vcpkg install tl-expected range-v3 catch2 nlohmann-json fmt
   - popd
 
 cache:

CMakeLists.txt

@@ -32,6 +32,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(tl-expected CONFIG REQUIRED)
+find_package(range-v3 CONFIG REQUIRED)
 
 if (skyr_ENABLE_JSON_FUNCTIONS)
     find_package(nlohmann_json CONFIG REQUIRED)
@@ -119,7 +120,6 @@ install(
         "${PROJECT_SOURCE_DIR}/include/skyr/domain"
         "${PROJECT_SOURCE_DIR}/include/skyr/network"
         "${PROJECT_SOURCE_DIR}/include/skyr/percent_encoding"
-        "${PROJECT_SOURCE_DIR}/include/skyr/query"
         DESTINATION
         include/skyr
 )
@@ -131,8 +131,6 @@ install(
         "${PROJECT_SOURCE_DIR}/include/skyr/v1/network"
         "${PROJECT_SOURCE_DIR}/include/skyr/v1/percent_encoding"
         "${PROJECT_SOURCE_DIR}/include/skyr/v1/platform"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/query"
-        "${PROJECT_SOURCE_DIR}/include/skyr/v1/ranges"
         "${PROJECT_SOURCE_DIR}/include/skyr/v1/string"
         "${PROJECT_SOURCE_DIR}/include/skyr/v1/traits"
         "${PROJECT_SOURCE_DIR}/include/skyr/v1/unicode"

README.md

@@ -63,7 +63,7 @@ Using `vcpkg`, install the library dependencies:
 > git fetch origin master
 > git checkout -b master origin/master
 > ./bootstrap-vcpkg.sh
-> ./vcpkg install tl-expected catch2 nlohmann-json fmt
+> ./vcpkg install tl-expected range-v3 catch2 nlohmann-json fmt
 ```
 
 ### Building the project with `CMake` and `Ninja`
@@ -166,6 +166,7 @@ Here is the ``CMake`` script to build the example:
 project(my_project)
 
 find_package(tl-expected CONFIG REQUIRED)
+find_package(range-v3 CONFIG REQUIRED)
 find_package(skyr-url CONFIG REQUIRED)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -193,7 +194,8 @@ Search parameters:
 
 ## Dependencies
 
-This library uses [expected](https://github.com/TartanLlama/expected).
+This library uses [expected](https://github.com/TartanLlama/expected)
+and [Range v3](https://github.com/ericniebler/range-v3).
 
 The tests use [Catch2](https://github.com/catchorg/catch2),
 [nlohmann-json](https://github.com/nlohmann/json) and
@@ -224,9 +226,10 @@ MacOS:
 
 Windows:
 
-* Microsoft Visual C++ 2017
 * Microsoft Visual C++ 2019
 
+Microsoft Visual C++ 2017 is supported below version 0.11.
+
 ## License
 
 This library is released under the Boost Software License (please see

include/skyr/query/query_parameter_range.hpp

@@ -7,11 +7,12 @@
 #define SKYR_V1_JSON_JSON_HPP
 
 #include <string>
-#include <system_error>
+#include <optional>
 #include <vector>
 #include <tl/expected.hpp>
+#include <range/v3/view/split_when.hpp>
+#include <range/v3/view/transform.hpp>
 #include <nlohmann/json.hpp>
-#include <skyr/v1/query/query_parameter_range.hpp>
 #include <skyr/v1/percent_encoding/percent_encode.hpp>
 #include <skyr/v1/percent_encoding/percent_decode.hpp>
 
@@ -65,25 +66,40 @@ inline auto decode_query(std::string_view query, char separator='&', char equal=
     query.remove_prefix(1);
   }
 
+  static constexpr auto is_separator = [] (auto &&c) {
+    return c == '&' || c == ';';
+  };
+
+  static constexpr auto to_nvp = [] (auto &&param) -> std::pair<std::string_view, std::optional<std::string_view>> {
+    auto element = std::string_view(std::addressof(*std::begin(param)), ranges::distance(param));
+    auto delim = element.find_first_of("=");
+    if (delim != std::string_view::npos) {
+      return { element.substr(0, delim), element.substr(delim + 1) };
+    }
+    else {
+      return { element, std::nullopt };
+    }
+  };
+
   nlohmann::json object;
-  for (auto [key, value] : query_parameter_range(query)) {
-    const auto key_ = skyr::percent_decode(key).value();
+  for (auto [name, value] : query | ranges::views::split_when(is_separator) | ranges::views::transform(to_nvp)) {
+    const auto name_ = skyr::percent_decode(name).value();
     const auto value_ = value? skyr::percent_decode(value.value()).value() : std::string();
 
-    if (object.contains(key_)) {
-      auto current_value = object[key_];
+    if (object.contains(name_)) {
+      auto current_value = object[name_];
       if (current_value.is_string()) {
         auto prev_value = current_value.get<std::string>();
-        object[key_] = std::vector<std::string>{prev_value, value_};
+        object[name_] = std::vector<std::string>{prev_value, value_};
       }
       else if (current_value.is_array()) {
         auto values = current_value.get<std::vector<std::string>>();
         values.emplace_back(value_);
-        object[key_] = values;
+        object[name_] = values;
       }
     }
     else {
-      object[key_] = value_;
+      object[name_] = value_;
     }
   }
   return object;

include/skyr/v1/json/json.hpp

@@ -15,9 +15,17 @@ namespace skyr {
 inline namespace v1 {
 /// Percent decodes the input
 /// \returns The percent decoded output when successful, an error otherwise.
-inline auto percent_decode(std::string_view input) {
-  using namespace v1::percent_encoding;
-  return as<std::string>(input | views::decode);
+inline auto percent_decode(std::string_view input) -> tl::expected<std::string, percent_encoding::percent_encode_errc> {
+  auto result = std::string{};
+
+  auto range = percent_encoding::percent_decode_range{input};
+  for (auto it = std::cbegin(range); it != std::cend(range); ++it) {
+    if (!*it) {
+      return tl::make_unexpected((*it).error());
+    }
+    result.push_back((*it).value());
+  }
+  return result;
 }
 }  // namespace v1
 }  // namespace skyr