Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bypass delete on skipped versions #8

Merged
merged 2 commits into from
Aug 30, 2019
Merged

Bypass delete on skipped versions #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0116f69
Bypass delete on skipped versions
dmarkow Jul 18, 2019
6166042
add versions configuration to the test for local storage
achempion Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/waffle/actions/delete.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 10 additions & 4 deletions test/storage/local_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ 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
@versions [:original, :thumb, :skipped]

def transform(:thumb, _), do: {:convert, "-strip -thumbnail 10x10"}
def transform(:original, _), do: :noaction
def transform(:skipped, _), do: :skip
def __versions, do: [:original, :thumb, :skipped]

def storage_dir(_, _), do: "waffletest/uploads"
def __storage, do: Waffle.Storage.Local

def filename(:original, {file, _}), do: "original-#{Path.basename(file.file_name, Path.extname(file.file_name))}"
def filename(:thumb, {file, _}), do: "1/thumb-#{Path.basename(file.file_name, Path.extname(file.file_name))}"
def filename(:skipped, {file, _}), do: "1/skipped-#{Path.basename(file.file_name, Path.extname(file.file_name))}"
Expand All @@ -44,6 +45,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")
Expand Down