Merge pull request #18 from javadev/add-new-api

Added support for new api convert(types) and transform(options).

Author: rkoopmans

CHANGES.md

@@ -1,5 +1,11 @@
 ## 1.8.0
 * Added new property extension().
+* Added new methods convert(new Options().with("type", "image/webp")) and
+  transform(new Options().with("background", "black")).
+
+## 1.7.0
+* Updated dependent libraries.
+* Minimum java version is 1.8.
 
 ## 1.6.1
 * Fixes to depedency paths in OSGi imported packages.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013-2018 Tinify
+Copyright (c) 2013-2022 Tinify
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/main/java/com/tinify/Source.java

@@ -36,6 +36,14 @@ public final Source resize(final Options options) {
         return new Source(url, new Options(commands).with("resize", options));
     }
 
+    public final Source convert(final Options options) {
+        return new Source(url, new Options(commands).with("convert", options));
+    }
+
+    public final Source transform(final Options options) {
+        return new Source(url, new Options(commands).with("transform", options));
+    }
+
     public final ResultMeta store(final Options options) {
         Options params = new Options(commands).with("store", options);
         Client.Response response = Tinify.client().request(Client.Method.POST, url, params);

src/test/java/com/tinify/Integration.java

@@ -129,4 +129,42 @@ public void shouldPreserveMetadata() throws java.lang.Exception {
         assertThat(contents, containsString(new String(new byte[] {0, 0, 0, (byte)0x89})));
         assertThat(contents, containsString(("Copyright Voormedia")));
     }
+
+    @Test
+    public void shouldConvertFile() throws java.lang.Exception {
+        Path tempFile = Files.createTempFile("tinify_", null);
+        tempFile.toFile().deleteOnExit();
+
+        Result result = optimized.convert(new Options().with("type", "image/webp")).result();
+        result.toFile(tempFile.toString());
+
+        long size = new File(tempFile.toString()).length();
+
+        assertThat(result.width(), is(equalTo(137)));
+        assertThat(result.height(), is(equalTo(21)));
+        assertThat(result.mediaType(), is(equalTo("image/webp")));
+
+        assertThat(size, greaterThan((long) 1000));
+        assertThat(size, lessThan((long) 2000));
+    }
+
+    @Test
+    public void shouldTransformFile() throws java.lang.Exception {
+        Path tempFile = Files.createTempFile("tinify_", null);
+        tempFile.toFile().deleteOnExit();
+        Result result = optimized.transform(new Options().with("background", "black")).result();
+        result.toFile(tempFile.toString());
+
+        long size = new File(tempFile.toString()).length();
+        String contents = new String(Files.readAllBytes(Paths.get(tempFile.toString())));
+
+        assertThat(result.width(), is(equalTo(137)));
+        assertThat(result.height(), is(equalTo(21)));
+
+        assertThat(size, greaterThan((long) 1000));
+        assertThat(size, lessThan((long) 2000));
+
+        /* width == 137 */
+        assertThat(contents, containsString(new String(new byte[] {0, 0, 0, (byte)0x89})));
+    }
 }

src/test/java/com/tinify/SourceTest.java

@@ -242,6 +242,25 @@ public void withValidApiKeyPreserveShouldReturnSource() throws Exception, Interr
         assertEquals("png file", request1.getBody().readUtf8());
     }
 
+    @Test
+    public void withValidApiKeyConvertShouldReturnSource() throws Exception, InterruptedException {
+        Tinify.setKey("valid");
+
+        server.enqueue(new MockResponse()
+                .setResponseCode(201)
+                .addHeader("Location", "https://api.tinify.com/some/location"));
+
+        server.enqueue(new MockResponse()
+                .setResponseCode(200)
+                .setBody("copyrighted file"));
+
+        assertThat(Source.fromBuffer("png file".getBytes()).convert(new Options().with("type", "image/webp")),
+               isA(Source.class));
+
+        RecordedRequest request1 = server.takeRequest(3, TimeUnit.SECONDS);
+        assertEquals("png file", request1.getBody().readUtf8());
+    }
+
     @Test
     public void withValidApiKeyPreserveShouldReturnSourceWithData() throws Exception, IOException, InterruptedException {
         Tinify.setKey("valid");
@@ -356,6 +375,30 @@ public void withValidApiKeyResizeShouldReturnSourceWithData() throws Exception,
         assertJsonEquals("{\"resize\":{\"width\":100,\"height\":60}}", request2.getBody().readUtf8());
     }
 
+    @Test
+    public void withValidApiKeyTransformShouldReturnSourceWithData() throws Exception, IOException, InterruptedException {
+        Tinify.setKey("valid");
+
+        server.enqueue(new MockResponse()
+                .setResponseCode(201)
+                .addHeader("Location", "https://api.tinify.com/some/location"));
+
+        server.enqueue(new MockResponse()
+                .setResponseCode(200)
+                .setBody("small file"));
+
+        Options options = new Options().with("background", "black");
+
+        assertThat(Source.fromBuffer("png file".getBytes()).transform(options).toBuffer(),
+                is(equalTo("small file".getBytes())));
+
+        RecordedRequest request1 = server.takeRequest(3, TimeUnit.SECONDS);
+        assertEquals("png file", request1.getBody().readUtf8());
+
+        RecordedRequest request2 = server.takeRequest(3, TimeUnit.SECONDS);
+        assertJsonEquals("{\"transform\":{\"background\":\"black\"}}", request2.getBody().readUtf8());
+    }
+
     @Test
     public void withValidApiKeyStoreShouldReturnResultMeta() throws Exception, InterruptedException {
         Tinify.setKey("valid");