qiniu_direct_uploader 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5793e5a915c28e2171149c0fe1e067525d0cfa1f
-  data.tar.gz: bc5bcc684bf40246d633f4c2b410ff159c636f7c
+  metadata.gz: c9279d8ae2d3be7053661b01faebde1d86a8f328
+  data.tar.gz: 8065ce19db3050fe11d618166da923715109385a
 SHA512:
-  metadata.gz: 39fcd260ddfcdde4003ec4c99d9477b9fc6dafd7aa3775597d54643b3f11bac680c06471ddee8ac1b1042b5537f41835542099a6a5614e4c079cacf5155b2e08
-  data.tar.gz: 6984584afe35741ba5bb797169ed4ba26d133bb5dccb3c682c2c4fbc2146f43d45f818095ee76e78d899ca269d3fd2314238fb54bc1df87a4658c20a6583e058
+  metadata.gz: aff2043144df9708abf37df382d37b0a92c8d0c8209cdd67d0b0911262a359d6313bb0a698249a3742f3e3d4458dbef0a907fe568f7420f0945bd48f11f1e616
+  data.tar.gz: 5e1b148b0fcfce0b523e18d4ee725dd17c481e4256159afb9808a9019925919611ca2b5bf4dc5ab74b1438d6122eb4019c4ad84060e100fb1e4e8ef5131f726c

data/README.md

@@ -25,7 +25,7 @@ see the example project: https://github.com/huobazi/qiniu-direct-upload-example
 <%= qiniu_uploader_form callback_url: items_path,
   bucket:        'spec-test',
   id:            "photograph-uploader",
-  key:           "items/#{Date.today.strftime('%Y/%m')}/{timestamp}-{unique-id}-#{SecureRandom.hex}-{filename}",
+  save_key:       "uploads/items/$(year)/$(mon)/$(day)/$(etag)/$(fname)",
   custom_fields: {aaa:1,bbb:2},
   progress_bar_id: 'progress-bar',
   drop_paste_zone_id: 'dropzone' do %>

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

@@ -46,23 +46,12 @@ $.fn.QiniuUploader = (options) ->
       form.submit() for form in formsForSubmit
       false
 
-  generateRandomString= (length) ->
-    chars = "abcdefghiklmno0123456789pqrstuvwxyz"
-    text = ""
-    i = 0
-    while i < length
-      randomPoz = Math.floor(Math.random() * chars.length)
-      text += chars.substring(randomPoz, randomPoz + 1)
-      i++
-    text
-
   setUploadForm = ->
     inner_settings =
       dropZone: dropPasteZone
       pasteZone: dropPasteZone
       add: (e, data) ->
         file = data.files[0]
-        file.uniqueId = generateRandomString(10) + Math.random().toString(36).substr(2,12)
 
         unless settings.onFilesAdd and not settings.onFilesAdd(file)
           currentFiles.push data
@@ -117,9 +106,6 @@ $.fn.QiniuUploader = (options) ->
         data = form.serializeArray()
 
         key = $uploadForm.data("key")
-          .replace('{timestamp}', new Date().getTime())
-          .replace('{unique-id}', @files[0].uniqueId)
-          .replace('{filename}', @files[0].name)
 
         # substitute upload timestamp and uniqueId into key
         keyField = $.grep data, (n) ->

data/lib/qiniu_direct_uploader/uploader.rb

@@ -31,23 +31,19 @@ module QiniuDirectUploader
     end
 
     def fields
-      {
-        key: key,
-        token: @options[:token] || token
-      }
+      the_fields = {}
+      the_fields[:token] = @options[:token] || token
+      the_fields[:key] = @options[:key] if @options[:key]
+      the_fields
     end
 
     def custom_fields
       @options[:custom_fields]
     end
 
-    def default_key
-      "uploads/{timestamp}-{unique-id}-#{SecureRandom.hex}-{filename}"
-    end
-
-    def key
-      return @options[:key] if @options[:key]
-      return  default_key
+    def save_key
+      return @options[:save_key] if @options[:save_key]
+      "uploads/$(year)/$(mon)/$(day)/$(etag)/$(fname)"
     end
 
     def action
@@ -77,9 +73,10 @@ module QiniuDirectUploader
     end
 
     def token
-      put_policy = Qiniu::Auth::PutPolicy.new( @options[:bucket], nil, @options[:expires_in], nil )
+      put_policy = Qiniu::Auth::PutPolicy.new( @options[:bucket], @options[:key], @options[:expires_in], nil )
       put_policy.return_body = return_body
-      put_policy.end_user = @options[:customer]
+      put_policy.save_key = save_key
+      put_policy.end_user = @options[:customer] if @options[:customer]
 
       Qiniu::Auth.generate_uptoken(put_policy)
     end

data/lib/qiniu_direct_uploader/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module QiniuDirectUploader
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiniu_direct_uploader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails