s3_file_field 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e91d0fe38036204121030961fcdbdecc3d1894e8
-  data.tar.gz: 65089c91fcc1692718f6398424e48c473124c638
+  metadata.gz: 771a79d8a1002b47f2dfcf1f24022292a5212590
+  data.tar.gz: 4ebc755adee94a38cd0baac8dfb6657b9f637a2d
 SHA512:
-  metadata.gz: a47af2e0ae5bc848109a16db1631dbd9a57eb75129e96fa74f7d12be6bbc2efd965646da4da014d126fe14ec1c48056be7601ded752ad4b9b81d1cfac3600f49
-  data.tar.gz: 6317d5350477e4f5fc340fc121cedb1103d4144c0149a0545e53c8c3365dd214e67856dc682791a4da4747cdd0ac3a3c1e84514cef17e6dfb3a57922dbb5eaef
+  metadata.gz: d5e2da78facafbcd31cf7d597e5bed3cf335ae20efcfc2864b08a4035d2a6c4f18b60426bffe0d1437bb1354f29ce35256b8c8c8b48741e231e0979939807dc9
+  data.tar.gz: cdd64aa49a7b27bb78974baab71c2796e41cb092ff3492e6298af99fe39d88902e3eccd3a03dbe0de19ea1a9240aef194acfada54d68bea25f7a78b635e2a764

data/README.md

@@ -7,7 +7,7 @@ jQuery File Upload extension for direct uploading to Amazon S3 using CORS
 
 Works as an extension of [jQuery File Upload](http://blueimp.github.io/jQuery-File-Upload/) JavaScript plugin and supports IE 7-10.
 
-Note: Since 1.0.2 gem works with both Rails 3 and Rails 4.
+It supports multiple upload, and per-input configuration.
 
 ## Installation
 

data/app/assets/javascripts/s3_file_field.js.coffee

@@ -63,7 +63,7 @@ jQuery.fn.S3FileField = (options) ->
       if add? then add(e, data) else data.submit()
 
     done: (e, data) ->
-      data.result = build_content_object data.files[0]
+      data.result = build_content_object(data.files[0], data.result)
       done(e, data) if done?
 
     fail: (e, data) ->
@@ -85,11 +85,24 @@ jQuery.fn.S3FileField = (options) ->
 
   jQuery.extend settings, options
 
-  build_content_object = (file) ->
-    domain = settings.url.replace(/\/+$/, '').replace(/^(https?:)?/, 'https:')
+  to_s3_filename = (filename) ->
+    trimmed = filename.replace(/^\s+|\s+$/g,'')
+    strip_before_slash = trimmed.split('\\').slice(-1)[0]
+    double_encode_quote = strip_before_slash.replace('"', '%22')
+    encodeURIComponent(double_encode_quote)
+
+  build_content_object = (file, result) ->
+
     content = {}
-    content.filepath   = finalFormData[file.unique_id]['key'].replace('/${filename}', '')
-    content.url        = domain + '/' + content.filepath + '/' + file.name
+
+    if result # Use the S3 response to set the URL to avoid character encodings bugs
+      content.url            = $(result).find("Location").text()
+      content.filepath       = $('<a />').attr('href', content.url)[0].pathname
+    else # IE <= 9 returns null result so hack is necessary
+      domain = settings.url.replace(/\/+$/, '').replace(/^(https?:)?/, 'https:')
+      content.filepath   = finalFormData[file.unique_id]['key'].replace('/${filename}', '')
+      content.url        = domain + '/' + content.filepath + '/' + to_s3_filename(file.name)
+
     content.filename   = file.name
     content.filesize   = file.size if 'size' of file
     content.filetype   = file.type if 'type' of file

data/lib/s3_file_field/config_aws.rb

@@ -4,7 +4,7 @@ module S3FileField
   class Config
     include Singleton
 
-    ATTRIBUTES = [:access_key_id, :secret_access_key, :bucket, :prefix_to_clean, :region, :url]
+    ATTRIBUTES = [:access_key_id, :secret_access_key, :bucket, :prefix_to_clean, :region, :url, :key_starts_with]
 
     attr_accessor *ATTRIBUTES
   end

data/lib/s3_file_field/s3_uploader.rb

@@ -12,7 +12,8 @@ module S3FileField
         expiration: 10.hours.from_now.utc.iso8601,
         max_file_size: 500.megabytes,
         conditions: [],
-        key_starts_with: 'uploads/'
+        key_starts_with: S3FileField.config.key_starts_with || 'uploads/',
+        region: S3FileField.config.region || 's3'
       }
 
       @key = original_options[:key]
@@ -59,7 +60,7 @@ module S3FileField
     end
 
     def url
-      "//#{@options[:bucket]}.s3.amazonaws.com/"
+      "//#{@options[:bucket]}.#{@options[:region]}.amazonaws.com/"
     end
 
     def policy
@@ -84,7 +85,7 @@ module S3FileField
     def signature
       Base64.encode64(
         OpenSSL::HMAC.digest(
-          OpenSSL::Digest::Digest.new('sha1'),
+          OpenSSL::Digest.new('sha1'),
           @options[:secret_access_key], policy
         )
       ).gsub("\n", '')

data/lib/s3_file_field/version.rb

@@ -1,3 +1,3 @@
 module S3FileField
-  VERSION = "1.0.7"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_file_field
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Stankiewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -130,15 +130,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- app/assets/javascripts/s3_file_field.js.coffee
+- lib/s3_file_field.rb
 - lib/s3_file_field/config_aws.rb
 - lib/s3_file_field/engine.rb
 - lib/s3_file_field/form_helper.rb
 - lib/s3_file_field/railtie.rb
 - lib/s3_file_field/s3_uploader.rb
 - lib/s3_file_field/version.rb
-- lib/s3_file_field.rb
-- app/assets/javascripts/s3_file_field.js.coffee
-- README.md
 homepage: https://github.com/sheerun/s3_file_field
 licenses:
 - MIT
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: jQuery File Upload extension for direct uploading to Amazon S3 using CORS