From 083155d3b0b27981fba255319178121888507563 Mon Sep 17 00:00:00 2001 From: Andy Fletcher Date: Thu, 27 Apr 2017 14:53:53 +0100 Subject: [PATCH 1/2] /unsafe added to urls created by toMetaUnsafe() The meta url generator doesn't work as is for unsafe urls and should work the same way as the regular toUrlSafe method --- src/main/java/com/squareup/pollexor/ThumborUrlBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/squareup/pollexor/ThumborUrlBuilder.java b/src/main/java/com/squareup/pollexor/ThumborUrlBuilder.java index 6b3fff9..7cad83d 100644 --- a/src/main/java/com/squareup/pollexor/ThumborUrlBuilder.java +++ b/src/main/java/com/squareup/pollexor/ThumborUrlBuilder.java @@ -405,7 +405,7 @@ public String toMeta() { /** Build an unsafe version of the metadata URL. */ public String toMetaUnsafe() { - return host + assembleConfig(true); + return host + PREFIX_UNSAFE + assembleConfig(true); } /** From 0011cd6167c09e5627953a38d7ed4a148d351870 Mon Sep 17 00:00:00 2001 From: Andy Fletcher Date: Tue, 2 May 2017 16:54:48 +0100 Subject: [PATCH 2/2] Test updated to match expected behaviour See https://github.com/thumbor/thumbor/wiki/Usage#metadata-endpoint --- .../java/com/squareup/pollexor/ThumborUrlBuilderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/squareup/pollexor/ThumborUrlBuilderTest.java b/src/test/java/com/squareup/pollexor/ThumborUrlBuilderTest.java index 8a9ab29..8ce363d 100644 --- a/src/test/java/com/squareup/pollexor/ThumborUrlBuilderTest.java +++ b/src/test/java/com/squareup/pollexor/ThumborUrlBuilderTest.java @@ -81,7 +81,7 @@ public class ThumborUrlBuilderTest { } @Test public void testBuildMeta() { - assertThat(unsafe.buildImage("a.com/b.png").toMeta()).startsWith("/meta/"); + assertThat(unsafe.buildImage("a.com/b.png").toMeta()).startsWith("/unsafe/meta/"); } @Test public void testSafeUrlCanStillBuildUnsafe() { @@ -91,7 +91,7 @@ public class ThumborUrlBuilderTest { } @Test public void testSafeMetaUrlCanStillBuildUnsafe() { - String expected = "/meta/a.com/b.png"; + String expected = "/unsafe/meta/a.com/b.png"; String actual = safe.buildImage("a.com/b.png").toMetaUnsafe(); assertThat(actual).isEqualTo(expected); }