universal_s3_uploader 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efd8713a674010b67e77f06adb16d6d20c4371c1
-  data.tar.gz: e5d0210a75762e8a86249594178e15c72ee69944
+  metadata.gz: 5f3de3b3418998a1d58ed9cd4612a7a664abba28
+  data.tar.gz: 37537e2dd4809a839a41b7c1c8d5d4d367d0c38f
 SHA512:
-  metadata.gz: 124273e15e959dbe3100eb64b2e0f57a870bfd02016e2cc67cb2a8be19cdfbd3ebe968a521696eb21fa082a12a58d19c760f4ba72cde37f119eafb2b6d1a5887
-  data.tar.gz: 192650294590ae45b3bfa028efce9db97fcaa9a286dd20c4a8d73b55c59f2610f648f90c47062d1f71b9330302e82ef8a5c9dde66c0e1d896825e3789575a3a4
+  metadata.gz: ad78edcf06e8d0978589ebbf7c117d95850c4dd12695019ef46d6122e95032b046d866f4aec9c44728e4c353efe0da4ac9d36c6eea502c399dc72003ba2bee2d
+  data.tar.gz: e66014c7479e7e73e16eaaa40dbe92b82825dcd5fe2b8d1480e7713fcf8e58469dfb8174471f3a31e0a0468535e5c5b49b4280986594e915fbc93ab1764ce3bd

data/lib/universal_s3_uploader/version.rb

@@ -1,3 +1,3 @@
 module UniversalS3Uploader
-	VERSION = '0.1.7'
+	VERSION = '0.1.8'
 end

data/vendor/assets/javascripts/universal_s3_uploader.js

@@ -79,7 +79,7 @@
 
     UniversalS3Uploader.prototype.initExternalInterface = function()
     {
-      var elem = this.element;
+      var context = this;
       var flashObject = this.element.children('object.flash_uploader').get(0);
 
       var interval = setInterval(function()
@@ -88,8 +88,12 @@
         {
           clearInterval(interval);
 
-          flashObject.sendDivId(elem.attr('id'));
-          elem.children('div').each(function ()
+          flashObject.sendDivId(context.element.attr('id'));
+          if (context.options.size)
+          {
+            flashObject.sendSize(context.options.size);
+          }
+          context.element.children('div').each(function ()
           {
             flashObject.sendFormData(this.className, $(this).data('value'));
           });
@@ -108,8 +112,86 @@
       return false;
     };
 
+    UniversalS3Uploader.prototype.dataUrlToBlob = function(dataUrl)
+    {
+      var byteString = atob(dataUrl.split(',')[1]);
+      var ab = new ArrayBuffer(byteString.length);
+      var ia = new Uint8Array(ab);
+      var mimeString = dataUrl.split(',')[0].split(':')[1].split(';')[0];
+      for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i);
+      }
+      return new Blob([ab], { type: mimeString });
+    };
+
+    UniversalS3Uploader.prototype.resizeAndUpload = function(file, size)
+    {
+      var context = this;
+      var img = document.createElement("img");
+      img.src = window.URL.createObjectURL(file);
+      img.onload = function()
+      {
+        var postfix = size[0];
+        var width_desire = size[1];
+        var height_desire = size[2];
+
+        var width = img.width;
+        var height = img.height;
+
+        if (width_desire == -1 && height_desire == -1)
+        {
+          width_desire = width;
+          height_desire = height;
+        }
+        else if (width_desire == -1)
+        {
+          width_desire = width * height_desire / height;
+        }
+        else if (height_desire == -1)
+        {
+          height_desire = height * width_desire / width;
+        }
+
+        var canvas = document.createElement('canvas');
+        canvas.width = width_desire;
+        canvas.height = height_desire;
+        var ctx = canvas.getContext("2d");
+        ctx.drawImage(img, 0, 0, width_desire, height_desire);
+        var dataUrl = canvas.toDataURL("image/png");
+        var blob = context.dataUrlToBlob(dataUrl);
+
+        var fd = new FormData();
+        context.element.children('div').each(function()
+        {
+          if (this.className == 'key' && postfix)
+          {
+            var new_filename = file.name.replace(/(\.[^.]+)$/, '_' + postfix + "$1");
+            var key = $(this).data('value').replace(/\${filename}/, new_filename);
+            fd.append('key', key);
+          }
+          else
+          {
+            fd.append(this.className, $(this).data('value'));
+          }
+        });
+        fd.append('file', blob);
+
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', context.element.attr('action'), true);
+        xhr.send(fd);
+      };
+    };
+
     UniversalS3Uploader.prototype.upload = function(file, index)
     {
+      if (this.options.size)
+      {
+        for (var i = 0; i < this.options.size.length; i++)
+        {
+          this.resizeAndUpload(file, this.options.size[i]);
+        }
+      }
+
       var fd = new FormData();
       this.element.children('div').each(function()
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: universal_s3_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Dohan Kim