Support s3 and data:uri urls

tallevami-home · tallevami-home · commit 589523c43c9a · 2013-06-29T22:05:34.000+03:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -236,7 +236,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 			}
 		}
 
-		if (file instanceof String && !((String) file).matches("^https?:.*")) {
+		if (file instanceof String && !((String) file).matches("https?:.*|s3:.*|data:image/\\w*;base64,([a-zA-Z0-9/+\n=]+)")) {
 			file = new File((String) file);
 		}
 		if (file instanceof File) {
diff --git a/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java b/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java
@@ -48,6 +48,30 @@ public void testUpload() throws IOException {
         String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.getStringConfig("api_secret"));
         assertEquals(result.get("signature"), expected_signature);
     }
+    
+    @Test
+	public void testUploadUrl() throws IOException {
+        Map result = cloudinary.uploader().upload("http://cloudinary.com/images/logo.png", Cloudinary.emptyMap());
+        assertEquals(result.get("width"), 241L);
+        assertEquals(result.get("height"), 51L);
+        Map<String, Object> to_sign = new HashMap<String, Object>();
+        to_sign.put("public_id", (String) result.get("public_id"));
+        to_sign.put("version", Cloudinary.asString(result.get("version")));
+        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.getStringConfig("api_secret"));
+        assertEquals(result.get("signature"), expected_signature);
+    }
+
+    @Test
+	public void testUploadDataUri() throws IOException {
+        Map result = cloudinary.uploader().upload("data:image/png;base64,iVBORw0KGgoAA\nAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0l\nEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6\nP9/AFGGFyjOXZtQAAAAAElFTkSuQmCC", Cloudinary.emptyMap());
+        assertEquals(result.get("width"), 16L);
+        assertEquals(result.get("height"), 16L);
+        Map<String, Object> to_sign = new HashMap<String, Object>();
+        to_sign.put("public_id", (String) result.get("public_id"));
+        to_sign.put("version", Cloudinary.asString(result.get("version")));
+        String expected_signature = cloudinary.apiSignRequest(to_sign, cloudinary.getStringConfig("api_secret"));
+        assertEquals(result.get("signature"), expected_signature);
+    }
 
     @Test
 	public void testRename() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
`239`		`- if (file instanceof String && !((String) file).matches("^https?:.*")) {`
	`239`	`+ if (file instanceof String && !((String) file).matches("https?:.\|s3:.\|data:image/\\w*;base64,([a-zA-Z0-9/+\n=]+)")) {`
`240`	`240`	`file = new File((String) file);`
`241`	`241`	`}`
`242`	`242`	`if (file instanceof File) {`