Changed whitespace encoding to %21 instead of '+'

fernandezpablo85 · fernandezpablo85 · commit 50c35bc6860a · 2010-09-17T23:23:02.000-03:00
Changed version number for release
diff --git a/src/main/java/org/scribe/utils/URLUtils.java b/src/main/java/org/scribe/utils/URLUtils.java
@@ -41,7 +41,7 @@ public static String percentEncode(String string)
     Preconditions.checkNotNull(string, "Cannot encode null string");
     try
     {
-      return URLEncoder.encode(string, UTF_8);
+      return URLEncoder.encode(string, UTF_8).replaceAll("\\+", "%20");
     } 
     catch (UnsupportedEncodingException uee)
     {
diff --git a/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java b/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java
@@ -41,4 +41,12 @@ public void shouldThrowExceptionIfRquestHasNoOAuthParameters()
     OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
     extractor.extract(request);
   }
+  
+  @Test
+  public void shouldProperlyEncodeSpaces()
+  {
+    String expected = "GET&http%3A%2F%2Fexample.com&body%3Dthis%2520param%2520has%2520whitespace%26oauth_callback%3Dhttp%253A%252F%252Fexample%252Fcallback%26oauth_consumer_key%3DAS%2523%2524%255E*%2540%2526%26oauth_signature%3DOAuth-Signature%26oauth_timestamp%3D123456";
+    request.addBodyParameter("body", "this param has whitespace");
+    assertEquals(expected, extractor.extract(request));
+  }
 }
diff --git a/src/test/java/org/scribe/model/RequestTest.java b/src/test/java/org/scribe/model/RequestTest.java
@@ -52,7 +52,7 @@ public void shouldSetBodyParamsAndHeaders()
     postRequest.addBodyParameter("param", "value");
     postRequest.addBodyParameter("param two", "value with spaces");
     postRequest.send();
-    assertEquals("param+two=value+with+spaces&param=value", postRequest.getBodyContents());
+    assertEquals("param%20two=value%20with%20spaces&param=value", postRequest.getBodyContents());
     assertTrue(connection.getHeaders().containsKey("Content-Length"));
   }
 
diff --git a/src/test/java/org/scribe/utils/URLUtilsTest.java b/src/test/java/org/scribe/utils/URLUtilsTest.java
@@ -23,7 +23,7 @@ public void shouldPercentEncodeMap()
     params.put("key with spaces", "value with spaces");
     params.put("&symbols!", "#!");
 
-    String expected = "key=value&key+with+spaces=value+with+spaces&%26symbols%21=%23%21";
+    String expected = "key=value&key%20with%20spaces=value%20with%20spaces&%26symbols%21=%23%21";
     assertEquals(expected, URLUtils.formURLEncodeMap(params));
   }
 
@@ -39,7 +39,7 @@ public void shouldReturnEmptyStringForEmptyMap()
   public void shouldPercentEncodeString()
   {
     String toEncode = "this is a test &^";
-    String expected = "this+is+a+test+%26%5E";
+    String expected = "this%20is%20a%20test%20%26%5E";
     assertEquals(expected, URLUtils.percentEncode(toEncode));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static String percentEncode(String string)`
`41`	`41`	`Preconditions.checkNotNull(string, "Cannot encode null string");`
`42`	`42`	`try`
`43`	`43`	`{`
`44`		`- return URLEncoder.encode(string, UTF_8);`
	`44`	`+ return URLEncoder.encode(string, UTF_8).replaceAll("\\+", "%20");`
`45`	`45`	`}`
`46`	`46`	`catch (UnsupportedEncodingException uee)`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,12 @@ public void shouldThrowExceptionIfRquestHasNoOAuthParameters()`
`41`	`41`	`OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");`
`42`	`42`	`extractor.extract(request);`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ @Test`
	`46`	`+ public void shouldProperlyEncodeSpaces()`
	`47`	`+ {`
	`48`	`+ String expected = "GET&http%3A%2F%2Fexample.com&body%3Dthis%2520param%2520has%2520whitespace%26oauth_callback%3Dhttp%253A%252F%252Fexample%252Fcallback%26oauth_consumer_key%3DAS%2523%2524%255E*%2540%2526%26oauth_signature%3DOAuth-Signature%26oauth_timestamp%3D123456";`
	`49`	`+ request.addBodyParameter("body", "this param has whitespace");`
	`50`	`+ assertEquals(expected, extractor.extract(request));`
	`51`	`+ }`
`44`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void shouldSetBodyParamsAndHeaders()`
`52`	`52`	`postRequest.addBodyParameter("param", "value");`
`53`	`53`	`postRequest.addBodyParameter("param two", "value with spaces");`
`54`	`54`	`postRequest.send();`
`55`		`- assertEquals("param+two=value+with+spaces&param=value", postRequest.getBodyContents());`
	`55`	`+ assertEquals("param%20two=value%20with%20spaces&param=value", postRequest.getBodyContents());`
`56`	`56`	`assertTrue(connection.getHeaders().containsKey("Content-Length"));`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void shouldPercentEncodeMap()`
`23`	`23`	`params.put("key with spaces", "value with spaces");`
`24`	`24`	`params.put("&symbols!", "#!");`
`25`	`25`
`26`		`- String expected = "key=value&key+with+spaces=value+with+spaces&%26symbols%21=%23%21";`
	`26`	`+ String expected = "key=value&key%20with%20spaces=value%20with%20spaces&%26symbols%21=%23%21";`
`27`	`27`	`assertEquals(expected, URLUtils.formURLEncodeMap(params));`
`28`	`28`	`}`
`29`	`29`
`@@ -39,7 +39,7 @@ public void shouldReturnEmptyStringForEmptyMap()`
`39`	`39`	`public void shouldPercentEncodeString()`
`40`	`40`	`{`
`41`	`41`	`String toEncode = "this is a test &^";`
`42`		`- String expected = "this+is+a+test+%26%5E";`
	`42`	`+ String expected = "this%20is%20a%20test%20%26%5E";`
`43`	`43`	`assertEquals(expected, URLUtils.percentEncode(toEncode));`
`44`	`44`	`}`
`45`	`45`