From a84a17d01e782e1589e20cd40ac13c10ff877187 Mon Sep 17 00:00:00 2001 From: "Stephen M. Pallen" Date: Wed, 29 Mar 2017 10:36:21 -0400 Subject: [PATCH] auto linking working for simple url with no surounding text --- lib/auto_linker.ex | 39 ++++++++++++++++++++++++++++++--------- test/auto_linker_test.exs | 4 +--- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/lib/auto_linker.ex b/lib/auto_linker.ex index 7cf24fb..1678131 100644 --- a/lib/auto_linker.ex +++ b/lib/auto_linker.ex @@ -1,27 +1,43 @@ defmodule AutoLinker do @moduledoc """ - Documentation for AutoLinker. + Create url links from text containing urls. + + Turns an input string like `"Check out google.com"` into + `Check out `"google.com"` + + ## Examples + + iex> AutoLinker.link("google.com") + "google.com" + + iex> AutoLinker.link("google.com", new_window: false, rel: false) + "google.com" + + iex> AutoLinker.link("google.com", new_window: false, rel: false, class: false) + "google.com" """ + @doc """ + Auto link a string. + """ def link(text, opts \\ []) do opts = - :url_linker + :auto_linker |> Application.get_all_env() |> Keyword.merge(opts) - # rel = opts[:rel] || "noopener noreferrer" - # new_window if opts[:target] + parse text, opts end # state = {buffer, acc, state} defp parse(text, opts) do - parse(text, Keyword.get(opts, :scheme, false), {"", "", false}) + parse(text, Keyword.get(opts, :scheme, false), opts, {"", "", false}) end - defp parse("", _scheme, opts ,{_, acc, _}), do: acc + defp parse("", _scheme, _opts ,{_, acc, _}), do: acc defp parse(text, scheme, opts, {buffer, acc, state}) do - acc <> create_link(text, opts) + acc = acc <> create_link(text, opts) parse("", scheme, opts, {buffer, acc, state}) end @@ -29,8 +45,9 @@ defmodule AutoLinker do [] |> build_attrs(url, opts, :rel) |> build_attrs(url, opts, :target) + |> build_attrs(url, opts, :class) |> build_attrs(url, opts, :scheme) - |> build_url(url, opts) + |> format_url(url, opts) end defp build_attrs(attrs, _, opts, :rel) do @@ -41,7 +58,11 @@ defmodule AutoLinker do if Keyword.get(opts, :new_window, true), do: [{:target, :_blank} | attrs], else: attrs end - defp build_attrs(attrs, url, opts, :scheme) do + defp build_attrs(attrs, _, opts, :class) do + if cls = Keyword.get(opts, :class, "auto-linker"), + do: [{:class, cls} | attrs], else: attrs + end + defp build_attrs(attrs, url, _opts, :scheme) do if String.starts_with?(url, ["http://", "https://"]), do: [{:href, url} | attrs], else: [{:href, "http://" <> url} | attrs] end diff --git a/test/auto_linker_test.exs b/test/auto_linker_test.exs index c4928c3..15dd8a4 100644 --- a/test/auto_linker_test.exs +++ b/test/auto_linker_test.exs @@ -2,7 +2,5 @@ defmodule AutoLinkerTest do use ExUnit.Case doctest AutoLinker - test "the truth" do - assert 1 + 1 == 2 - end + end