Make URI.encode/1 to conform to RFC 3986

lexmag · lexmag · commit 14722ba10278 · 2014-06-10T16:20:44.000+04:00
diff --git a/lib/elixir/lib/uri.ex b/lib/elixir/lib/uri.ex
@@ -156,15 +156,15 @@ defmodule URI do
   """
   def encode(s), do: for(<<c <- s>>, into: "", do: percent(c))
 
-  defp percent(32), do: <<?+>>
+  defp percent(?~), do: <<?~>>
   defp percent(?-), do: <<?->>
   defp percent(?_), do: <<?_>>
   defp percent(?.), do: <<?.>>
 
   defp percent(c)
-      when c >= ?0 and c <= ?9
-      when c >= ?a and c <= ?z
-      when c >= ?A and c <= ?Z do
+      when c in ?0..?9
+      when c in ?a..?z
+      when c in ?A..?Z do
     <<c>>
   end
 
@@ -187,11 +187,11 @@ defmodule URI do
   end
 
   def decode(<<?%, hex1, hex2, tail :: binary >>, uri) do
-    << bsl(hex_to_dec(hex1, uri), 4) + hex_to_dec(hex2, uri) >> <> decode(tail, uri)
+    <<bsl(hex_to_dec(hex1, uri), 4) + hex_to_dec(hex2, uri)>> <> decode(tail, uri)
   end
 
   def decode(<<head, tail :: binary >>, uri) do
-    <<check_plus(head)>> <> decode(tail, uri)
+    <<head>> <> decode(tail, uri)
   end
 
   def decode(<<>>, _uri), do: <<>>
@@ -203,9 +203,6 @@ defmodule URI do
     raise ArgumentError, "malformed URI #{inspect uri}"
   end
 
-  defp check_plus(?+), do: 32
-  defp check_plus(c),  do: c
-
   @doc """
   Parses a URI into components.
 
diff --git a/lib/elixir/test/elixir/uri_test.exs b/lib/elixir/test/elixir/uri_test.exs
@@ -3,10 +3,9 @@ Code.require_file "test_helper.exs", __DIR__
 defmodule URITest do
   use ExUnit.Case, async: true
 
-  test :encode_with_binary do
-    raw = <<13, 10, 38, 60, 62, 34, 32, 227, 130, 134, 227, 130, 147, 227, 130, 134, 227, 130, 147>>
-    expected = "%0D%0A%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93"
-    assert URI.encode(raw) == expected
+  test :encode do
+    assert URI.encode("4_test.is-s~") == "4_test.is-s~"
+    assert URI.encode("\r\n&<%>\" ゆ") == "%0D%0A%26%3C%25%3E%22%20%E3%82%86"
   end
 
   test :encode_query do
@@ -44,11 +43,12 @@ defmodule URITest do
   end
 
   test :decode do
-    data_to_be_decoded = "%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93"
-    assert URI.decode(data_to_be_decoded) == "&<>\" ゆんゆん"
+    assert URI.decode("%0D%0A%26%3C%25%3E%22%20%E3%82%86") == "\r\n&<%>\" ゆ"
+    assert URI.decode("%2f%41%4a%55") == "/AJU"
+    assert URI.decode("4_t+st.is-s~") == "4_t+st.is-s~"
 
-    assert_raise ArgumentError, ~r/malformed URI/, fn ->
-      assert URI.decode("% invalid")
+    assert_raise ArgumentError, ~R/malformed URI/, fn ->
+      URI.decode("% invalid")
     end
   end
 
@@ -180,9 +180,4 @@ defmodule URITest do
     assert to_string(URI.parse("http://google.com?q=lol")) == "http://google.com?q=lol"
     assert to_string(URI.parse("http://google.com?q=lol#omg")) == "http://google.com?q=lol#omg"
   end
-
-  test :escape do
-    assert URI.decode("%2f%41%4a%55") == "/AJU"
-    assert URI.decode("%2F%41%4A%55") == "/AJU"
-  end
 end
