Handle nil urls for skipped versions (#6)

Author: achempion

lib/waffle_ecto/definition.ex

@@ -25,11 +25,13 @@ defmodule Waffle.Ecto.Definition do
         if options[:signed] do
           url
         else
-          case updated_at do
-            %NaiveDateTime{} ->
+          case {url, updated_at} do
+            {nil, _} -> nil
+
+            {_, %NaiveDateTime{}} ->
               version_url(updated_at, url)
 
-            string when is_bitstring(updated_at) ->
+            {_, string} when is_bitstring(updated_at) ->
               version_url(NaiveDateTime.from_iso8601!(string), url)
 
             _ ->

test/definition_test.exs

@@ -25,4 +25,10 @@ defmodule WaffleTest.Ecto.Definition do
     url = DummyDefinitionTwo.url({%{file_name: "test.png", updated_at: nil}, :scope}, :original, [])
     assert url == "fallback"
   end
+
+  test "url is nil if version is skipped" do
+    updated_at = NaiveDateTime.from_erl!({{2015, 1, 1}, {1, 1, 1}})
+    url = DummyDefinitionTwo.url({%{file_name: "test.png", updated_at: updated_at}, :scope}, :skipped, [])
+    assert is_nil(url)
+  end
 end

test/schema_test.exs

@@ -100,17 +100,17 @@ defmodule WaffleTest.Ecto.Schema do
   end
 
   test_with_mock "allow_paths => true", DummyDefinition, [store: fn({"/path/to/my/file.png", %TestUser{}}) -> {:ok, "file.png"} end] do
-    _changeset = TestUser.path_changeset(%TestUser{}, %{"avatar" => "/path/to/my/file.png"})
+    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"})
+    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"})
+    TestUser.url_changeset(%TestUser{}, %{"avatar" => "/path/to/my/file.png"})
     assert not called DummyDefinition.store({"/path/to/my/file.png", %TestUser{}})
   end
 end

test/support/dummy_definition_two.ex

@@ -1,4 +1,5 @@
 defmodule DummyDefinitionTwo do
+  def url(_, :skipped, _), do: nil
   def url(_, :original, _), do: "fallback"
   def url(_, :signed, _), do: "fallback?a=1&b=2"
   def store({file, _}), do: {:ok, file}