s3ff 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc078113b6351a5dda92bb1c3189286ca517dbf3
-  data.tar.gz: ef1aefe00901a9166e318f1ab0fd8011e449235a
+  metadata.gz: c8cde9503b4b5fe42ca23124262e40975130876c
+  data.tar.gz: f021ac639a3ab7f6b0286418bb12ca9738a6864e
 SHA512:
-  metadata.gz: 6dc6c08065b46cb03343b79c0894fbce1c72ce0c0f38ab8c754a172fca523fc9436cf0ef2f89eb0d677e72b57a2927d55649c53d939630350cfeb151b3c9e252
-  data.tar.gz: e181edc54fb874ab9360ce8dfd8eed8e61e0ded34ca4af9e6f800e3593f127a53aec5976c64387baabe96d2e64de2fcb7b931ed4eaf91df10f98bc346e34bcc2
+  metadata.gz: 6fe225163985de90c5986e27d69a1e68bf1b02c0c1974be65e4f03c6efb4b4fdd92932dd465bc29da14e2097f0c657abe09906719fecd63fa0c252ed9306eb3a
+  data.tar.gz: e4e0c31d105ad69b3738b7b70c734a45469fdf22b7b2608b168775c8a0410195bc53d266bd068b7a659d47c3f8f77538f2833b0b0efb7d020467ff3c7c766193

data/app/assets/javascripts/s3ff.js

@@ -10,6 +10,14 @@ $(function() {
   }
   if (! iCanHasCORSRequest()) return;
 
+  function makeArray(value) {
+    if (Array.isArray(value)) {
+      return value;
+    } else {
+      return Array(value);
+    }
+  }
+
   $(document).on('page:change', function() {
     if (!window.s3ff) {
       window.s3ff = {
@@ -19,9 +27,10 @@ $(function() {
 
           var that = $(this).addClass('s3ff_enabled');
           var multi = that.attr('multiple');
-          var placeholder = that.data('placeholder');
-          var obj = that.data('s3ff') || [ {} ];
-          $.each(obj, function() { this.placeholder = placeholder; });
+          var placeholders = makeArray(that.data('placeholder'));
+          var obj = that.data('s3ff') || placeholders;
+          function assign_matching_placeholder(i) { this.placeholder = (placeholders[i] || (placeholders[0] && {})); };
+          $.each(obj, assign_matching_placeholder);
           var wrap = that.wrap('<div class="s3ff_fileinput_wrap"></div>').parent();
           var dom = $('<label class="s3ff_fileinput_label"></label>').attr('for', that.attr('id'));
           wrap.after(dom);
@@ -43,16 +52,17 @@ $(function() {
           var s3ff_handlers = {
             drop: function(e, data) {
               if ((e.delegatedEvent || e.originalEvent).target.parentNode != wrap[0]) return e.preventDefault();
+              $.each(data.files, assign_matching_placeholder);
               $.observable(obj).refresh(data.files);
             },
             change: function(e, data) {
+              $.each(data.files, assign_matching_placeholder);
               $.observable(obj).refresh(data.files);
             },
             send: function(e, data) {
               $.each(obj, function() {
                 if (data.files[0].unique_id == this.unique_id) {
                   this.progress_pct = "0%";
-                  this.placeholder = placeholder;
                 }
               });
               $.observable(obj).refresh(obj);

data/lib/s3ff/version.rb

@@ -1,3 +1,3 @@
 module S3FF
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

data/lib/s3ff.rb

@@ -19,18 +19,18 @@ S3FileField::FormBuilder.class_eval do
     if new_direct_url.present?
       # this means we're re-rendering :. we should prepopulate the s3ff fields to avoid re-uploading
       options[:data] ||= {}
-      options[:data].merge!({
-        s3ff: [{
-          fieldname: "#{object_name.to_s}[#{direct_url_attr}]",
-          unique_id: "#{object_name.to_s.parameterize}#{SecureRandom.hex}",
-          result: {
-            filename: changes["#{method}_file_name"].try(:last) || File.basename(new_direct_url),
-            filesize: changes["#{method}_file_size"].try(:last),
-            filetype: changes["#{method}_content_type"].try(:last),
-            url: new_direct_url,
-          },
-        }],
-      })
+      options[:data][:s3ff] ||= begin
+        [*new_direct_url].collect do |url|
+          {
+            fieldname: "#{object_name.to_s}[#{direct_url_attr}]#{options[:multiple] ? '[]' : ''}",
+            unique_id: "#{object_name.to_s.parameterize}#{SecureRandom.hex}",
+            result: {
+              filename: File.basename(url),
+              url: url,
+            },
+          }
+        end
+      end
     end
     s3_file_field_without_s3ff(method, options)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3ff
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Chew Choon Keat