s3_relay 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb3749db208e34c25730efc1bac3cdaa60cbbca
-  data.tar.gz: 5ab8beaaa957f5abcf41f687d82e2f7c06deea37
+  metadata.gz: 7cb796ed4a1f0134a5e67322bb2e198362daa846
+  data.tar.gz: cb022aa8cf619ba5e239bef972c69abd4a6017f6
 SHA512:
-  metadata.gz: 4d6166f156b612b5619c355a19b42ede0dc6572505cd301985916c809ac6822729dd30c92a58a25bb92fc14a10d3f2cc01047ad305372abc1b31e3d101a03b22
-  data.tar.gz: 28f2e274966d3a849afaa2ecbaaca004c28f7de45d7fd35b9c95da668c1a0a54cec1e83d6e9253f5c56217357fca44f28e82ebcf4dc575a2dcea2aeda22ba23e
+  metadata.gz: 5526db7bf2a0782f2b8efc298bac34458583c111080bf2698d6a8247bb1b345515819699e8e8e7b27ced4f0fc755fa839f4d57e2e6ee1efb2f1d8fef9c101540
+  data.tar.gz: 585e6e39dd6564e0713575680155aea61a26ea9ab6e00aadc5d70abeba0521210e2d021da53537dbcfb37dca9bb82f290fb25f31977215c1080b8e5ced8f9e6d

data/app/assets/javascripts/s3_relay.coffee

@@ -4,18 +4,15 @@ displayFailedUpload = (progressColumn=null) ->
   else
     alert("File could not be uploaded")
 
-publishEvent = (name, detail) ->
-  ev = document.createEvent "CustomEvent"
-  ev.initCustomEvent name, true, false, detail
-  document.dispatchEvent ev
+publishEvent = (target, name, detail) ->
+  $(target).trigger( name, detail )
 
-saveUrl = (container, uuid, filename, contentType, publicUrl) ->
+saveUrl = (container, uuid, filename, contentType, publicUrl, progressColumn, fileColumn) ->
   privateUrl = null
 
   $.ajax
     type: "POST"
     url: "/s3_relay/uploads"
-    async: false
     data:
       parent_type: container.data("parentType")
       parent_id: container.data("parentId")
@@ -26,7 +23,15 @@ saveUrl = (container, uuid, filename, contentType, publicUrl) ->
       public_url: publicUrl
     success: (data, status, xhr) ->
       privateUrl = data.private_url
-      publishEvent "upload:success", { uuid: uuid }
+      if privateUrl == null
+        displayFailedUpload(progressColumn)
+      else
+        fileColumn.html("<a href='#{privateUrl}'>#{filename}</a>")
+
+        virtualAttr = "#{container.data('parentType')}[new_#{container.data('association')}_uuids]"
+        hiddenField = "<input type='hidden' name='#{virtualAttr}[]' value='#{uuid}' />"
+        container.append(hiddenField)
+      publishEvent(container, "upload:success", [ uuid, filename, privateUrl ])
     error: (xhr) ->
       console.log xhr.responseText
 
@@ -44,7 +49,6 @@ uploadFile = (container, file) ->
   $.ajax
     type: "GET"
     url: "/s3_relay/uploads/new"
-    async: false
     success: (data, status, xhr) ->
       formData = new FormData()
       xhr = new XMLHttpRequest()
@@ -72,8 +76,8 @@ uploadFile = (container, file) ->
       progressMeter = $(".s3r-meter", progressColumn)
 
       xhr.upload.addEventListener "progress", (ev) ->
-        if ev.position
-          percentage = ((ev.position / ev.totalSize) * 100.0).toFixed(0)
+        if ev.loaded
+          percentage = ((ev.loaded / ev.total) * 100.0).toFixed(0)
           progressBar.show()
           progressMeter.css "width", "#{percentage}%"
         else
@@ -87,17 +91,7 @@ uploadFile = (container, file) ->
           if xhr.status == 201
             contentType = file.type
             publicUrl = $("Location", xhr.responseXML).text()
-            privateUrl = saveUrl(container, uuid, fileName, contentType, publicUrl)
-
-            if privateUrl == null
-              displayFailedUpload(progressColumn)
-            else
-              fileColumn.html("<a href='#{privateUrl}'>#{fileName}</a>")
-
-              virtualAttr = "#{container.data('parentType')}[new_#{container.data('association')}_uuids]"
-              hiddenField = "<input type='hidden' name='#{virtualAttr}[]' value='#{uuid}' />"
-              container.append(hiddenField)
-
+            saveUrl(container, uuid, fileName, contentType, publicUrl, progressColumn, fileColumn)
           else
             displayFailedUpload(progressColumn)
             console.log $("Message", xhr.responseXML).text()

data/lib/s3_relay/version.rb

@@ -1,3 +1,3 @@
 module S3Relay
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_relay
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kenny Johnston