Merge pull request #11 from glynos/master

Changes to URI

Author: deanberris

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) Glyn Matthews 2012.
+# Copyright (c) Glyn Matthews 2012, 2013.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
@@ -10,7 +10,7 @@ project(Uri)
 find_package(Threads REQUIRED)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
-find_package(Boost 1.53 REQUIRED)
+find_package(Boost 1.53 REQUIRED system filesystem)
 
 include_directories(${Uri_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
 

src/CMakeLists.txt

@@ -1,15 +1,15 @@
-# Copyright (c) Glyn Matthews 2012.
+# Copyright (c) Glyn Matthews 2012, 2013.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
 set(Uri_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/uri.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/uri_io.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/uri_builder.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/detail/uri_parse.cpp)
 if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
   add_library(cppnetlib-uri ${Uri_SRCS})
+  target_link_libraries(cppnetlib-uri ${Boost_LIBRARIES})
   install(
     TARGETS
     cppnetlib-uri

src/network/uri/config.hpp

@@ -18,23 +18,5 @@
 #define NETWORK_URI_DECL
 #endif // defined(BOOST_ALL_DYN_LINK) || defined(BOOST_URI_DYN_LINK)
 
-#if !defined(BOOST_NO_CXX11_NOEXCEPT)
-#define NETWORK_URI_NOEXCEPT noexcept
-#else
-#define NETWORK_URI_NOEXCEPT
-#endif // !defined(BOOST_NO_CXX11_NOEXCEPT)
-
-#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
-#define NETWORK_URI_DEFAULTED_FUNCTION = default
-#else
-#define NETWORK_URI_DEFAULTED_FUNCTION
-#endif // !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
-
-#if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
-#define NETWORK_URI_DELETED_FUNCTION = delete
-#else
-#define NETWORK_URI_DELETED_FUNCTION
-#endif // !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
-
 
 #endif // NETWORK_URI_CONFIG_INC

src/network/uri/decode.hpp

@@ -0,0 +1,83 @@
+// Copyright (c) Glyn Matthews 2011, 2012, 2013.
+// Copyright 2012 Dean Michael Berris <[email protected]>
+// Copyright 2012 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef NETWORK_URI_DECODE_INC
+#define NETWORK_URI_DECODE_INC
+
+#include <iterator>
+#include <cassert>
+
+namespace network {
+  namespace detail {
+    template <
+      typename CharT
+      >
+    CharT letter_to_hex(CharT in) {
+      if ((in >= '0') && (in <= '9')) {
+	return in - '0';
+      }
+
+      if ((in >= 'a') && (in <= 'f')) {
+        return in + 10 - 'a';
+      }
+
+      if ((in >= 'A') && (in <= 'F')) {
+	return in + 10 - 'A';
+      }
+      // throw
+      return CharT();
+    }
+
+    template <
+      class InputIterator,
+      typename CharT
+      >
+    InputIterator decode_char(InputIterator it, CharT &v) {
+      assert(*it == '%');
+      ++it;
+      auto v0 = detail::letter_to_hex(*it);
+      ++it;
+      auto v1 = detail::letter_to_hex(*it);
+      ++it;
+      v = (0x10 * v0) + v1;
+      return it;
+    }
+
+    template <
+      class InputIterator,
+      class OutputIterator
+      >
+    OutputIterator decode(InputIterator in_begin,
+			  InputIterator in_end,
+			  OutputIterator out_begin) {
+      auto it = in_begin;
+      auto out = out_begin;
+      while (it != in_end) {
+	if (*it == '%') {
+	  it = decode_char(it, *out);
+	  ++out;
+	}
+	else {
+	  *out++ = *it++;
+	}
+      }
+      return out;
+    }
+
+    template <
+      class String
+      >
+    String decode(const String &source) {
+      String unencoded;
+      decode(std::begin(source), std::end(source),
+	     std::back_inserter(unencoded));
+      return unencoded;
+    }
+  } // namespace detail
+} // namespace network
+
+#endif // NETWORK_URI_DECODE_INC