Merge pull request #1185 from meh/uri-to_binary

Implement Binary.Chars for URI.Info

Author: José Valim

lib/elixir/lib/uri.ex

@@ -150,7 +150,8 @@ defmodule URI do
     scheme_specific(scheme, info)
   end
 
-  defp scheme_specific(scheme, info) do
+  @doc false
+  def scheme_module(scheme) do
     if scheme do
       module =
         try do
@@ -160,10 +161,14 @@ defmodule URI do
         end
 
       if module && Code.ensure_loaded?(module) do
-        module.parse(default_port(info, module))
-      else
-        info
+        module
       end
+    end
+  end
+
+  defp scheme_specific(scheme, info) do
+    if module = scheme_module(scheme) do
+      module.parse(default_port(info, module))
     else
       info
     end
@@ -202,3 +207,22 @@ defmodule URI do
     :ok
   end
 end
+
+defimpl Binary.Chars, for: URI.Info do
+  def to_binary(uri) do
+    result = ""
+
+    if module = URI.scheme_module(uri.scheme) do
+      if module.default_port == uri.port, do: uri = uri.port(nil)
+    end
+
+    if uri.scheme,   do: result = result <> uri.scheme <> "://"
+    if uri.userinfo, do: result = result <> uri.userinfo <> "@"
+    if uri.host,     do: result = result <> uri.host
+    if uri.port,     do: result = result <> ":" <> integer_to_binary(uri.port)
+    if uri.query,    do: result = result <> "?" <> uri.query
+    if uri.fragment, do: result = result <> "#" <> uri.fragment
+
+    result
+  end
+end

lib/elixir/test/elixir/uri_test.exs

@@ -129,4 +129,13 @@ defmodule URITest do
     assert URI.parse("http://GoOgLe.CoM").host == "google.com"
     assert URI.parse("http://LOL:[email protected]").authority == "LOL:[email protected]"
   end
+
+  test :to_binary do
+    assert to_binary(URI.parse("http://google.com")) == "http://google.com"
+    assert to_binary(URI.parse("http://google.com:443")) == "http://google.com:443"
+    assert to_binary(URI.parse("https://google.com:443")) == "https://google.com"
+    assert to_binary(URI.parse("http://lol:[email protected]")) == "http://lol:[email protected]"
+    assert to_binary(URI.parse("http://google.com?q=lol")) == "http://google.com?q=lol"
+    assert to_binary(URI.parse("http://google.com?q=lol#omg")) == "http://google.com?q=lol#omg"
+  end
 end