From 1af6861f8db57b54ba19b80964eb00c5f7340bfb Mon Sep 17 00:00:00 2001
From: Richard Walters <rwalters@digitalstirling.com>
Date: Mon, 2 Jul 2018 21:21:48 -0700
Subject: Add capability to compare Uri objects.

* Code the neat example in section 6.2.2 of the RFC.
* Add equality/inequality operators for Uri.
---
 include/Uri/Uri.hpp   | 24 ++++++++++++++++++++++++
 src/Uri.cpp           | 22 ++++++++++++++++++++++
 test/src/UriTests.cpp | 11 +++++++++++
 3 files changed, 57 insertions(+)

diff --git a/include/Uri/Uri.hpp b/include/Uri/Uri.hpp
index afdb631..b64f0da 100644
--- a/include/Uri/Uri.hpp
+++ b/include/Uri/Uri.hpp
@@ -36,6 +36,30 @@ namespace Uri {
          */
         Uri();
 
+        /**
+         * This is the equality comparison operator for the class.
+         *
+         * @param[in] other
+         *     This is the other URI to which to compare this URI.
+         *
+         * @return
+         *     An indication of whether or not the two URIs are
+         *     equal is returned.
+         */
+        bool operator==(const Uri& other) const;
+
+        /**
+         * This is the inequality comparison operator for the class.
+         *
+         * @param[in] other
+         *     This is the other URI to which to compare this URI.
+         *
+         * @return
+         *     An indication of whether or not the two URIs are
+         *     not equal is returned.
+         */
+        bool operator!=(const Uri& other) const;
+
         /**
          * This method builds the URI from the elements parsed
          * from the given string rendering of a URI.
diff --git a/src/Uri.cpp b/src/Uri.cpp
index 0153e5f..35631cf 100644
--- a/src/Uri.cpp
+++ b/src/Uri.cpp
@@ -586,6 +586,28 @@ namespace Uri {
     {
     }
 
+    bool Uri::operator==(const Uri& other) const {
+        return (
+            (impl_->scheme == other.impl_->scheme)
+            && (impl_->userInfo == other.impl_->userInfo)
+            && (impl_->host == other.impl_->host)
+            && (
+                (!impl_->hasPort && !other.impl_->hasPort)
+                || (
+                    (impl_->hasPort && other.impl_->hasPort)
+                    && (impl_->port == other.impl_->port)
+                )
+            )
+            && (impl_->path == other.impl_->path)
+            && (impl_->query == other.impl_->query)
+            && (impl_->fragment == other.impl_->fragment)
+        );
+    }
+
+    bool Uri::operator!=(const Uri& other) const {
+        return !(*this == other);
+    }
+
     bool Uri::ParseFromString(const std::string& uriString) {
         // First parse the scheme.
         // Limit our search so we don't scan into the authority
diff --git a/test/src/UriTests.cpp b/test/src/UriTests.cpp
index cbc8b8a..4275de6 100644
--- a/test/src/UriTests.cpp
+++ b/test/src/UriTests.cpp
@@ -603,3 +603,14 @@ TEST(UriTests, NormalizePath) {
         ++index;
     }
 }
+
+TEST(UriTests, ConstructNormalizeAndCompareEquivalentUris) {
+    // This was inspired by section 6.2.2
+    // of RFC 3986 (https://tools.ietf.org/html/rfc3986).
+    Uri::Uri uri1, uri2;
+    ASSERT_TRUE(uri1.ParseFromString("example://a/b/c/%7Bfoo%7D"));
+    ASSERT_TRUE(uri2.ParseFromString("eXAMPLE://a/./b/../b/%63/%7bfoo%7d"));
+    ASSERT_NE(uri1, uri2);
+    uri2.NormalizePath();
+    ASSERT_EQ(uri1, uri2);
+}
-- 
cgit v1.2.3