escaped uris

src/UriBuilder.Fluent.UnitTests/ExtensionTests.cs

@@ -35,17 +35,6 @@ namespace FluentUriBuilder.Tests
                     .WithParameter("awesome", "yodawg");
             Assert.Equal("http://awesome.com/?awesome=yodawg", url.Uri.ToString());
         }
-        
-        [Fact]
-        public void PathAndQuery()
-        {
-            var url = new UriBuilder().WithPathSegment("/awesome/v1/").WithParameter("awesome", "cool").PathAndQuery();
-            Assert.Equal("/awesome/v1/?awesome=cool", url);
-            url = new UriBuilder().WithPathSegment("/awesome/v1").WithParameter("awesome", "cool").PathAndQuery();
-            Assert.Equal("/awesome/v1?awesome=cool", url);
-            url = new UriBuilder().WithPathSegment("/awesome/v1").PathAndQuery();
-            Assert.Equal("/awesome/v1", url);
-        }
 
         [Fact]
         public void TestAddParameterArray()

src/UriBuilder.Fluent.UnitTests/project.json

@@ -9,7 +9,7 @@
   },
 
   "frameworks": {
-
+    "net461": {},
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {

src/UriBuilder.Fluent/TerribleDevUriExtensions.cs

@@ -57,7 +57,8 @@ namespace System
             foreach(var value in valuesEnum)
             {
                 var toSValue = value?.ToString();
-                if(string.IsNullOrWhiteSpace(toSValue)) continue;
+                //whitespace is valid
+                if(string.IsNullOrEmpty(toSValue)) continue;
                 // we can't just have an = sign since its valid to have query string paramters with no value;
                 if(!validValueHit) toSValue = "=" + value;
                 validValueHit = true;
@@ -118,7 +119,7 @@ namespace System
         /// </summary>
         /// <param name="bld"></param>
         /// <param name="host"></param>
-        /// <exception cref="ArgumentNullException">You must pass a ho0st</exception>
+        /// <exception cref="ArgumentNullException">You must pass a host</exception>
         /// <returns></returns>
         public static UriBuilder WithHost(this UriBuilder bld, string host)
         {
@@ -127,11 +128,6 @@ namespace System
             return bld;
         }
 
-        public static string PathAndQuery(this UriBuilder bld)
-        {
-            return bld.Path + bld.Query;
-        }
-
         /// <summary>
         /// Use Https?
         /// </summary>
@@ -143,5 +139,7 @@ namespace System
             bld.Scheme = predicate ? "https" : "http";
             return bld;
         }
+        public static string ToEscapedString(this Uri bld) => Uri.EscapeUriString(bld.ToString());
+        public static string ToEscapedString(this UriBuilder bld) => Uri.EscapeUriString(bld.Uri.ToString());
     }
 }

src/UriBuilder.Fluent/project.json

@@ -14,19 +14,15 @@
           "extension"
       ]
   },
+  "dependencies": {
+    "NETStandard.Library": "1.6.0"
+  },
   "authors": [
       "Tommy Parnell"
   ],
   "frameworks": {
     "netstandard1.1": {
-      "imports": "dnxcore50",
-        "dependencies": {
-         "NETStandard.Library": "1.6.0"
-        }
-    },
-    "net40": {
       "imports": "dnxcore50"
-    },
-    "net45":{}
+    }
   }
 }