Merge pull request #90 from joebew42/allow_urls-feature

fixes #89: add the allow_urls feature

lib/arc_ecto/schema.ex

@@ -41,10 +41,10 @@ defmodule Arc.Ecto.Schema do
 
             # If casting a binary (path), ensure we've explicitly allowed paths
             {field, path}, fields when is_binary(path) ->
-              if Keyword.get(options, :allow_paths, false) do
-                [{field, {path, scope}} | fields]
-              else
-                fields
+              cond do
+                Keyword.get(options, :allow_urls, false) and Regex.match?( ~r/^https?:\/\// , path) -> [{field, {path, scope}} | fields]
+                Keyword.get(options, :allow_paths, false) -> [{field, {path, scope}} | fields]
+                true -> fields
               end
           end)
           |> Enum.into(%{})

test/schema_test.exs

@@ -27,6 +27,13 @@ defmodule ArcTest.Ecto.Schema do
       |> validate_required(:avatar)
     end
 
+    def url_changeset(user, params \\ :invalid) do
+      user
+      |> cast(params, ~w(first_name)a)
+      |> cast_attachments(params, ~w(avatar)a, allow_urls: true)
+      |> validate_required(:avatar)
+    end
+
     def changeset2(user, params \\ :invalid) do
       user
       |> cast(params, ~w(first_name)a)
@@ -96,4 +103,14 @@ defmodule ArcTest.Ecto.Schema do
     _changeset = TestUser.path_changeset(%TestUser{}, %{"avatar" => "/path/to/my/file.png"})
     assert called DummyDefinition.store({"/path/to/my/file.png", %TestUser{}})
   end
+
+  test_with_mock "allow_urls => true", DummyDefinition, [store: fn({"http://external.url/file.png", %TestUser{}}) -> {:ok, "file.png"} end] do
+    changeset = TestUser.url_changeset(%TestUser{}, %{"avatar" => "http://external.url/file.png"})
+    assert called DummyDefinition.store({"http://external.url/file.png", %TestUser{}})
+  end
+
+  test_with_mock "allow_urls => true with an invalid URL", DummyDefinition, [store: fn({"/path/to/my/file.png", %TestUser{}}) -> {:ok, "file.png"} end] do
+    changeset = TestUser.url_changeset(%TestUser{}, %{"avatar" => "/path/to/my/file.png"})
+    assert not called DummyDefinition.store({"/path/to/my/file.png", %TestUser{}})
+  end
 end