universal_s3_uploader 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2afa7fb47ca9bbf0f491f66fb111a96719cbdc51
-  data.tar.gz: c231e4e729768f9a4435a3cf1c427f383f26d955
+  metadata.gz: 73f63e41f9b6f24c596350c0bca808fe50e11c1b
+  data.tar.gz: 4b3f18c431c25c02d01920cdd2fc8bed9b2da69c
 SHA512:
-  metadata.gz: 0791030c19dce94ff8140e3bb63009525f4f6c6121e25c5d2dd446f29c68bb553a4bb716c8ac276063f88d32fbdc0347fc5b863e17a7b2e4990f3d63b5c38e2e
-  data.tar.gz: 873e03c3affcf548645e5a653820b9bbb8923c093f5490cfcc17aa5d5601f91c2f1b57c9bd9808623f2976541f81cf15830e490c071e22b80cbb805c21412b9c
+  metadata.gz: 93e288b7fe0f14291dc9040ec6e6e98c7fd19b3cfe55fed8c8840a56d6c03e5a0d266f751d0a29da266542957bf56e845d48a663a459ca1ab2c12026c07b0eb3
+  data.tar.gz: 518f68496c4e1e4c7e77fc1902641ed0bf76bd681280f8a3cbe6949c2137cc01999ac8b3aec58b0a09b6c7a616f577b6d3bb75cb8e358eb34c10e786477c9def

data/lib/universal_s3_uploader/version.rb

@@ -1,3 +1,3 @@
 module UniversalS3Uploader
-	VERSION = "0.0.9"
+	VERSION = "0.1.0"
 end

data/lib/universal_s3_uploader/view_helper.rb

@@ -1,11 +1,9 @@
 module UniversalS3Uploader
 	module ViewHelper
-		def universal_s3_uploader_tag(key, policy_name, options = {})
+		def universal_s3_uploader_tag(key, policy_name, id)
 			uh = UploaderHelper.new(policy_name)
 
-			form_tag(uh.url, {method: 'POST', enctype: 'multipart/form-data', authenticity_token: false, class: 'universal_s3_uploader'}.merge(options)) do
-				uh.tags(key).html_safe
-			end
+			uh.tags(key, id).html_safe
 		end
 
 		class UploaderHelper
@@ -20,7 +18,7 @@ module UniversalS3Uploader
 				@policy = @config[policy_name]
 				@policy['conditions'] << ["starts-with", "$Filename", ""]	# for Flash upload
 				if @policy['expiration'] == '' || @policy['expiration'].nil?
-					@policy['expiration'] = 1.hour.from_now.iso8601
+					@policy['expiration'] = 1.hour.from_now.gmtime.iso8601
 				end
 			end
 
@@ -36,30 +34,36 @@ module UniversalS3Uploader
 				raise 'No bucket name in policy Exception'
 			end
 
-			def tags(key)
+			def tags(key, id)
 				av = ActionView::Base.new
-				tag = ''
+
+				def div_tag(name, value)
+					"<div class=#{name} data-value=#{value}></div>"
+				end
+
+				tag = "<div class='universal_s3_uploader' id='#{id}' action='#{url}'>"
 
 				([{key: key}] + @policy['conditions']).each do |condition|
 					if condition.class == Hash
-						tag += av.hidden_field_tag condition.keys.first, condition.values.first, id: nil
+						tag += div_tag condition.keys.first, condition.values.first
 					elsif condition.class == Array
 						if condition[0] == 'eq' || condition[0] == 'starts-with'
-							tag += av.hidden_field_tag condition[1][1..-1], condition[2], id: nil unless condition[1] == '$key'
+							tag += div_tag condition[1][1..-1], condition[2] unless condition[1] == '$key'
 						end
 					else
 						raise 'Something in policy unexpected'
 					end
 				end
-				tag += av.hidden_field_tag :AWSAccessKeyId, @config['access_key_id'], id: nil
-				tag += av.hidden_field_tag :Policy, policy_encoded, id: nil
-				tag += av.hidden_field_tag :Signature, signature, id: nil
+				tag += div_tag 'AWSAccessKeyId', @config['access_key_id']
+				tag += div_tag 'Policy', policy_encoded
+				tag += div_tag 'Signature', signature
 				tag += av.file_field_tag :file, multiple: true, accept: 'image/*'
 
 				tag += '<object id="flashUploader" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=11,1,0,0">'
 				tag += '<param name="movie" value="/assets/UniversalS3Uploader.swf">'
 				tag += '<param name="wmode" value="transparent">'
 				tag += '</object>'
+				tag += '</div>'
 			end
 
 			def bucket

data/vendor/assets/javascripts/universal_s3_uploader.js

@@ -49,8 +49,6 @@
 
     UniversalS3Uploader.prototype.init = function()
     {
-      this.element.children('div').remove();
-
       if (supportFormData)  // if supports HTML5 FormData
       {
         this.element.children('object#flashUploader').remove();
@@ -80,9 +78,10 @@
       {
         var flashObject = this.element.children('object').get(0);
 
-        this.element.children('input[type=hidden]').each(function ()
+        flashObject.sendDivId(this.element.attr('id'));
+        this.element.children('div').each(function ()
         {
-          flashObject.sendFormData(this.name, this.value);
+          flashObject.sendFormData(this.className, $(this).data('value'));
         });
       }
     };
@@ -101,9 +100,9 @@
     UniversalS3Uploader.prototype.upload = function(file, index)
     {
       var fd = new FormData();
-      this.element.children('input[type=hidden]').each(function()
+      this.element.children('div').each(function()
       {
-        fd.append(this.name, this.value);
+        fd.append(this.className, $(this).data('value'));
       });
       fd.append('file', file);
 

metadata

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