carrierwave-aliyun 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e1a032a15f971ac7d1557dbae299ad9076d140
-  data.tar.gz: 85fe40058d6305cadb67a3a1c60485ad70abf25f
+  metadata.gz: a8cb423fe32332c16b3621cb4b986b4c33288e73
+  data.tar.gz: 6693a677b786138041c6d4cd44032afd9ae6269f
 SHA512:
-  metadata.gz: 3723c0a1664b2f323f07100a85fba1de96636e6542c4b3ddeb57996c56e16e55633a36676d0c13455500139236c33283c9313f8facea5d195443234da6bb61a4
-  data.tar.gz: 2e936b1cf3a2eded52064bb2382acb6800390ca09fbe6f6845c69396738215aa953e783ed7b2e8684c1d634399ad30a6191bd5d8fb2516a5c6fd325258e215ac
+  metadata.gz: 67d2dc2aad2650f46f0378594694016ce88a7d217c8ba48a1a087f7ae510884e65356666d1d3a6ee8101478a06d5e543ac7f9532df0c47619966845b94023b9f
+  data.tar.gz: f5a212545459c9604ea38eb6ba7d2839c7f4b830838b25590de9df6c451d34c3a932f188397456006119a3e2f90445014bcd2097d507f8daf69ce42779ea1cb1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.6
+
+* 修正上传中文文件名无法成功的问题；
+
 ## 0.3.5
 
 * CarrierWave::Storage::Aliyun::File 继承 CarrierWave::SanitizedFile 以实现一些方法；

data/lib/carrierwave/aliyun/version.rb

@@ -1,7 +1,7 @@
 module CarrierWave
   module Aliyun
     class Version
-      MAJOR, MINOR, PATCH = 0, 3, 5
+      MAJOR, MINOR, PATCH = 0, 3, 6
 
       ##
       # Returns the major version ( big release based off of multiple minor releases )

data/lib/carrierwave/storage/aliyun.rb

@@ -49,7 +49,7 @@ module CarrierWave
           content_type = options[:content_type] || "image/jpg"
           date         = gmtdate
           url          = path_to_url(path)
-          
+
           host = URI.parse(url).host
 
           auth_sign    = sign("PUT", bucket_path, content_md5, content_type,date)
@@ -62,7 +62,7 @@ module CarrierWave
             "Expect"         => "100-Continue"
           }
 
-          RestClient.put(URI.encode(url).gsub("+", "%2B"), file, headers)
+          RestClient.put(url, file, headers)
           return path_to_url(path, :get => true)
         end
 
@@ -72,9 +72,20 @@ module CarrierWave
         # returns:
         # file data
         def get(path)
-          path = format_path(path)
-          url  = path_to_url(path)
-          RestClient.get(URI.encode(url))
+          path        = format_path(path)
+          bucket_path = get_bucket_path(path)
+          date        = gmtdate
+          url         = path_to_url(path)
+          host        = URI.parse(url).host
+          headers     = {
+            "Host"          => host,
+            "Date"          => date,
+            "Authorization" => sign("GET", bucket_path, "", "" ,date)
+          }
+
+          # path = format_path(path)
+          # url  = path_to_url(path)
+          RestClient.get(url, headers)
         end
 
         # 删除 Remote 的文件
@@ -95,8 +106,8 @@ module CarrierWave
             "Date"          => date,
             "Authorization" => sign("DELETE", bucket_path, "", "" ,date)
           }
-          
-          RestClient.delete(URI.encode(url).gsub("+", "%2B"), headers)
+
+          RestClient.delete(url, headers)
           return path_to_url(path, :get => true)
         end
 
@@ -130,7 +141,7 @@ module CarrierWave
         private
         def sign(verb, path, content_md5 = '', content_type = '', date)
           canonicalized_oss_headers = ''
-          canonicalized_resource = "/#{path}"
+          canonicalized_resource = "/#{URI.decode(path)}"
           string_to_sign = "#{verb}\n\n#{content_type}\n#{date}\n#{canonicalized_oss_headers}#{canonicalized_resource}"
           digest = OpenSSL::Digest.new('sha1')
           h = OpenSSL::HMAC.digest(digest, @aliyun_access_key, string_to_sign)
@@ -142,7 +153,7 @@ module CarrierWave
       class File < CarrierWave::SanitizedFile
         def initialize(uploader, base, path)
           @uploader = uploader
-          @path     = path
+          @path     = URI.encode(path)
           @base     = base
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave
@@ -93,4 +93,3 @@ test_files:
 - spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
-has_rdoc: