Skip to content

Commit a871be1

Browse files
Add eval upload parameter (#217)
1 parent 6be288b commit a871be1

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

cloudinary-core/src/main/java/com/cloudinary/Util.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static final Map<String, Object> buildUploadParams(Map options) {
2626
putBoolean(attr, options, params);
2727
}
2828

29+
params.put("eval",(String) options.get("eval"));
2930
params.put("notification_url", (String) options.get("notification_url"));
3031
params.put("eager_notification_url", (String) options.get("eager_notification_url"));
3132
params.put("proxy", (String) options.get("proxy"));

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,14 +714,15 @@ public void testUpdateUploadPreset() throws Exception {
714714
String name = api.createUploadPreset(ObjectUtils.asMap("folder", "folder")).get("name").toString();
715715
Map preset = api.uploadPreset(name, ObjectUtils.emptyMap());
716716
Map settings = (Map) preset.get("settings");
717-
settings.putAll(ObjectUtils.asMap("colors", true, "unsigned", true, "disallow_public_id", true, "live", true));
717+
settings.putAll(ObjectUtils.asMap("colors", true, "unsigned", true, "disallow_public_id", true, "live", true, "eval",AbstractUploaderTest.SRC_TEST_EVAL));
718718
api.updateUploadPreset(name, settings);
719719
settings.remove("unsigned");
720720
preset = api.uploadPreset(name, ObjectUtils.emptyMap());
721721
assertEquals(name, preset.get("name"));
722722
assertEquals(Boolean.TRUE, preset.get("unsigned"));
723723
assertEquals(settings.get("live"), Boolean.TRUE);
724724
assertEquals(settings, preset.get("settings"));
725+
725726
api.deleteUploadPreset(name, ObjectUtils.emptyMap());
726727
}
727728

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ abstract public class AbstractUploaderTest extends MockableTest {
3434
private static final String UPLOADER_TEST_PUBLIC_ID = "uploader_test";
3535
public static final String SRC_FULLY_QUALIFIED_IMAGE="image/upload/" + UPLOADER_TEST_PUBLIC_ID;
3636
public static final String SRC_FULLY_QUALIFIED_VIDEO="video/upload/dog";
37+
public static final String SRC_TEST_EVAL= "if (resource_info['width'] < 450) { upload_options['tags'] = 'a,b' };" + "upload_options['context'] = 'width=' + resource_info['width'];";
38+
private static final ArrayList<String> TEST_EVAL_TAGS_RESULT = new ArrayList<String>(Arrays.asList("a","b"));
39+
3740

3841
@BeforeClass
3942
public static void setUpClass() throws IOException {
@@ -270,6 +273,14 @@ public void testImageUploadTag() {
270273
assertTrue(tag.contains("class='cloudinary-fileupload myclass'"));
271274
}
272275

276+
@Test
277+
public void testEvalUploadParameter() throws IOException {
278+
Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("eval",SRC_TEST_EVAL));
279+
assertEquals(result.get("tags"), TEST_EVAL_TAGS_RESULT);
280+
Map custom= (Map)((Map) result.get("context")).get("custom");
281+
assertEquals(custom.get("width"),Integer.toString(SRC_TEST_IMAGE_W));
282+
}
283+
273284
@Test
274285
public void testSprite() throws Exception {
275286
final String sprite_test_tag = String.format("sprite_test_tag_%d", new java.util.Date().getTime());

0 commit comments

Comments
 (0)