s3_direct_upload 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1ed6e265b4f74392b3fc0ab3c58b22a19041e61
-  data.tar.gz: 60545e543bac0c5feadf0abd5e5ce268b276e214
+  metadata.gz: c8498cbc874d173965eda14055195f6e79899cad
+  data.tar.gz: 99c83432f1258e3c801001df3ecae08811277d7c
 SHA512:
-  metadata.gz: 4550009b9508b104ec290b3c70a7a6f1263b183c262e1e2e519beb7c8d4ee1b69c747c67c51e0d3e8e6e0619e8de98b3daf666ebe1a536b824934800a41a6c59
-  data.tar.gz: 60c03de6349abdcceadc9e7a03212d26fad2a5c31b50e8d79d78800522e628607a6d3ef343e7801b0739f1ce46eafd9503479e4a14aba6e503a37f967d6da01a
+  metadata.gz: 7e2d46240bd66f0363f1595ff793ca6a49f34f7e1dc5eb8be2bf134d1a652cb7eb1372cb7ea27087305af6b4c89f03263fb4c6aae876b7fbab57d4aadd5e0bda
+  data.tar.gz: e7cce42b04cdb3468f9500cf68103b3f8b82a3a795de65a251d7722d63f2a8f34cc3087a991e1cac1643c825efece57c589a356e30250f13d1a8515d2196c031

data/README.md

@@ -19,6 +19,7 @@ S3DirectUpload.config do |c|
   c.secret_access_key = ""   # your secret access key
   c.bucket = ""              # your bucket name
   c.region = ""              # region prefix of your bucket url (optional), eg. "s3-eu-west-1"
+  c.url = ""                 # S3 API endpoint (optional), eg. "https://#{c.bucket}.s3.amazonaws.com/"
 end
 ```
 
@@ -57,6 +58,8 @@ Create a new view that uses the form helper `s3_uploader_form`:
 <% end %>
 ```
 
+Note: Its required that the file_field_tag is named 'file'.
+
 Then in your application.js.coffee, call the S3Uploader jQuery plugin on the element you created above:
 ```coffeescript
 jQuery ->
@@ -225,7 +228,7 @@ end
 ```
 
 Alternately, if you'd prefer for S3 to delete your old uploads automatically, you can do
-so by setting your bucket's 
+so by setting your bucket's
 [Lifecycle Configuration](http://docs.aws.amazon.com/AmazonS3/latest/UG/LifecycleConfiguration.html).
 
 ## Contributing / TODO

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

@@ -59,21 +59,19 @@ $.fn.S3Uploader = (options) ->
       done: (e, data) ->
         content = build_content_object $uploadForm, data.files[0], data.result
 
-        to = $uploadForm.data('callback-url')
-        if to
+        callback_url = $uploadForm.data('callback-url')
+        if callback_url
           content[$uploadForm.data('callback-param')] = content.url
 
           $.ajax
             type: $uploadForm.data('callback-method')
-            url: to
+            url: callback_url
             data: content
             beforeSend: ( xhr, settings )       -> $uploadForm.trigger( 'ajax:beforeSend', [xhr, settings] )
             complete:   ( xhr, status )         -> $uploadForm.trigger( 'ajax:complete', [xhr, status] )
             success:    ( data, status, xhr )   -> $uploadForm.trigger( 'ajax:success', [data, status, xhr] )
             error:      ( xhr, status, error )  -> $uploadForm.trigger( 'ajax:error', [xhr, status, error] )
 
-          # $.post(to, content)
-
         data.context.remove() if data.context && settings.remove_completed_progress_bar # remove progress bar
         $uploadForm.trigger("s3_upload_complete", [content])
 
@@ -93,7 +91,7 @@ $.fn.S3Uploader = (options) ->
         if "type" of @files[0]
           fileType = @files[0].type
         data.push
-          name: "Content-Type"
+          name: "content-type"
           value: fileType
 
         # substitute upload timestamp and unique_id into key
@@ -115,9 +113,17 @@ $.fn.S3Uploader = (options) ->
     content.filesize   = file.size if 'size' of file
     content.filetype   = file.type if 'type' of file
     content.unique_id  = file.unique_id if 'unique_id' of file
+    content.relativePath = build_relativePath(file) if has_relativePath(file)
     content = $.extend content, settings.additional_data if settings.additional_data
     content
 
+  has_relativePath = (file) ->
+    file.relativePath || file.webkitRelativePath
+
+  build_relativePath = (file) ->
+    file.relativePath || (file.webkitRelativePath.split("/")[0..-2].join("/") + "/" if file.webkitRelativePath)
+
+
   #public methods
   @initialize = ->
     setUploadForm()

data/lib/s3_direct_upload/config_aws.rb

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

data/lib/s3_direct_upload/form_helper.rb

@@ -17,6 +17,7 @@ module S3DirectUpload
           aws_secret_access_key: S3DirectUpload.config.secret_access_key,
           bucket: S3DirectUpload.config.bucket,
           region: S3DirectUpload.config.region || "s3",
+          url: S3DirectUpload.config.url,
           ssl: true,
           acl: "public-read",
           expiration: 10.hours.from_now.utc.iso8601,
@@ -60,7 +61,7 @@ module S3DirectUpload
       end
 
       def url
-        "http#{@options[:ssl] ? 's' : ''}://#{@options[:region]}.amazonaws.com/#{@options[:bucket]}/"
+        @options[:url] || "http#{@options[:ssl] ? 's' : ''}://#{@options[:region]}.amazonaws.com/#{@options[:bucket]}/"
       end
 
       def policy
@@ -75,7 +76,7 @@ module S3DirectUpload
             ["starts-with", "$key", @options[:key_starts_with]],
             ["starts-with", "$x-requested-with", ""],
             ["content-length-range", 0, @options[:max_file_size]],
-            ["starts-with","$Content-Type",""],
+            ["starts-with","$content-type",""],
             {bucket: @options[:bucket]},
             {acl: @options[:acl]},
             {success_action_status: "201"}

data/lib/s3_direct_upload/version.rb

@@ -1,3 +1,3 @@
 module S3DirectUpload
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/tasks/s3_direct_upload.rake

@@ -1,6 +1,6 @@
 namespace :s3_direct_upload do
   desc "Removes old uploads from specified s3 bucket/directory -- Useful when uploads are processed into another directory"
-  task :clean_remote_uploads do
+  task :clean_remote_uploads => :environment do
     require 'thread'
     require 'fog'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Wayne Hoover
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails