Merge branch 'delete-skipped-files' of github.com:dmarkow/arc into fe…

…ature/arc-pull-286

lib/waffle/actions/delete.ex

@@ -40,6 +40,11 @@ defmodule Waffle.Actions.Delete do
   end
 
   defp delete_version(definition, version, {file, scope}) do
-    definition.__storage.delete(definition, version, {file, scope})
+    conversion = definition.transform(version, {file, scope})
+    if conversion == :skip do
+      :ok
+    else
+      definition.__storage.delete(definition, version, {file, scope})
+    end
   end
 end

test/storage/local_test.exs

@@ -13,9 +13,7 @@ defmodule WaffleTest.Storage.Local do
 
 
   defmodule DummyDefinition do
-    use Waffle.Actions.Store
-    use Waffle.Definition.Storage
-    use Waffle.Actions.Url
+    use Waffle.Definition
 
     @acl :public_read
     def transform(:thumb, _), do: {:convert, "-strip -thumbnail 10x10"}
@@ -44,6 +42,11 @@ defmodule WaffleTest.Storage.Local do
     refute File.exists?("waffletest/uploads/1/thumb-image.png")
   end
 
+  test "deleting when there's a skipped version" do
+    DummyDefinition.store(@img)
+    assert :ok = DummyDefinition.delete(@img)
+  end
+
   test "save binary" do
     Waffle.Storage.Local.put(DummyDefinition, :original, {Waffle.File.new(%{binary: "binary", filename: "binary.png"}), nil})
     assert true == File.exists?("waffletest/uploads/binary.png")