* In the tag lib, use the Uploader's tag generator

jbcpollak · jbcpollak · commit c90de4ca8e78 · 2013-04-30T14:29:15.000-04:00
* Allow null file parameters
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -19,8 +19,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntity;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.entity.mime.content.*;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
@@ -242,6 +241,12 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 			multipart.addPart("file", new FileBody((File) file));
 		} else if (file instanceof String) {
 			multipart.addPart("file", new StringBody((String) file));
+        } else if (file instanceof byte[]) {
+            multipart.addPart("file", new ByteArrayBody((byte[]) file, "file"));
+		} else if (file == null) {
+		    // no-problem
+		} else {
+		    throw new IOException("Uprecognized file parameter " + file);
 		}
 		postMethod.setEntity(multipart);
 
diff --git a/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryUploadTag.java b/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryUploadTag.java
@@ -28,53 +28,24 @@ public void doTag() throws JspException, IOException {
         if (cloudinary == null) {
             throw new JspException("Cloudinary config could not be located");
         }
+        Uploader uploader = cloudinary.uploader();
         
-        StringBuilder renderedHtml = new StringBuilder();
-        
-        renderedHtml.append("<input ");
-        
-        Map<String, String> attributes = new HashMap<String, String>();
-        attributes.put("type", "file");
-        attributes.put("name", name);
+        Map<String, Object> htmlOptions = new HashMap<String, Object>();
+        htmlOptions.put("type", "file");
+        htmlOptions.put("name", name);
         if (id != null) {
-            attributes.put("id", id);
+            htmlOptions.put("id", id);
         }
         
         Map<String, String> options = new HashMap<String, String>();
         options.put("resource_type", resourceType);
         if (tags != null) {
             options.put("tags", tags);
         }
-        
-        String cloudinaryUrl = cloudinary.cloudinaryApiUrl("upload", options);
-        
-        Uploader uploader = new Uploader(cloudinary);
-        Map<String, Object> params = uploader.buildUploadParams(options);
-        uploader.signRequestParams(params, options);
-        
-        attributes.put("data-url", cloudinaryUrl);
-        
-        StringBuilder jsonParams = new StringBuilder();
-        jsonParams.append("{");
-        for (Map.Entry<String, Object> entry : params.entrySet()) {
-            if (entry.getValue() != null) {
-                jsonParams.append("'" + entry.getKey() + "':'" + entry.getValue() + "',");
-            }
-        }
-        jsonParams.append("}");
-        String escapedJsonParams = StringEscapeUtils.escapeHtml4(jsonParams.toString());
-        
-        attributes.put("data-form-data", escapedJsonParams);
-        attributes.put("data-cloudinary-field", fieldName);
-        attributes.put("class", "cloudinary-fileupload" + ((extraClasses != null) ? " " + extraClasses : ""));
-        
-        for (Map.Entry<String, String> entry : attributes.entrySet()) {
-            renderedHtml.append(" " + entry.getKey() + "=\"" + entry.getValue() + "\"");
-        }
 
-        renderedHtml.append("/>");
+        String renderedHtml = uploader.imageUploadTag(fieldName, options, htmlOptions);
         
-        getJspContext().getOut().println(renderedHtml.toString());
+        getJspContext().getOut().println(renderedHtml);
     }
 
     public void setId(String id) {
