carrierwave-aliyun 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c88a9af587b855318be9ced43af6fd29e964f40
-  data.tar.gz: ecab21ea3488317eeb406fdf71024181e1610328
+  metadata.gz: 2b7c6794e4b53be8b1781733433933bb0fcec534
+  data.tar.gz: cbec6afebb360c4085155ce1f93d96657306c075
 SHA512:
-  metadata.gz: 37a7b3e42a51bae11d7cd9f829c827f4eea442e79aa34895e835a3a95203a37702f1d1a6a9fde48eed1afa9346e0d70486a378ddac37f89c4caf21f958e36315
-  data.tar.gz: e9418dafc9f763fc80006d13e99a5c968349a06fbb3b7675944eb99d7927de4fde32e680e2a3270cb7b12f1bd8f69837813fb838415c5cb73b6d268f59e5c3fa
+  metadata.gz: a51ac3e32565f55992a3ca2ff282c958c30da2be5739a27faf5aafe5e735cef28e54aa1384f9417dc40f8dfdfbf79e826d1a166d70a502c7838a224e9c0e49f3
+  data.tar.gz: 189874b6216fb7345d8799cb33284f9104d8a64d5444bae4ebee61d57e52c792daf9bbaece22a0fe5b218e7f776cabf73641c62d6435ceef21417c17dbf49457

data/Changelogs.md

@@ -1,3 +1,7 @@
+## 0.3.1
+
+* 修复当文件名中包含了 "+"，在 OSS 中上传会遇到签名不对应的问题；
+
 ## 0.3.0
 
 * 新增 `aliyun_area` 参数，用于配置 OSS 所在地区数据中心；
@@ -32,4 +36,4 @@
 
 ## 0.1.0
 
-* 功能实现.
+* 功能实现.

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -52,10 +52,26 @@ module CarrierWave
             "Host" => @aliyun_upload_host,
             "Expect" => "100-Continue"
           }
-          RestClient.put(URI.encode(url), file, headers)
+          RestClient.put(URI.encode(url).gsub("+", "%2B"), file, headers)
           return path_to_url(path, :get => true)
         end
 
+
+=begin rdoc
+读取文件
+
+== 参数:
+- path - remote 存储路径
+
+== 返回值:
+图片文件
+=end
+        def get(path)
+          path = format_path(path)
+          url = path_to_url(path)
+          RestClient.get(URI.encode(url))
+        end
+
 =begin rdoc
 删除 Remote 的文件
 
@@ -75,7 +91,7 @@ module CarrierWave
             "Authorization" => sign("DELETE", bucket_path, "", "" ,date)
           }
           url = path_to_url(path)
-          RestClient.delete(URI.encode(url), headers)
+          RestClient.delete(URI.encode(url).gsub("+", "%2B"), headers)
           return path_to_url(path, :get => true)
         end
 
@@ -145,7 +161,8 @@ module CarrierWave
         #
         def read
           object = oss_connection.get(@path)
-          object.data
+          @headers = object.headers
+          object.body
         end
 
         ##
@@ -166,6 +183,14 @@ module CarrierWave
           oss_connection.path_to_url(@path, :get => true)
         end
 
+        def content_type
+          headers[:content_type]
+        end
+
+        def content_type=(new_content_type)
+          headers[:content_type] = new_content_type
+        end
+
         def store(file, opts = {})
           oss_connection.put(@path, file, opts)
         end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.7
 description: Aliyun OSS support for Carrierwave
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Changelogs.md
 - Gemfile
 - README.md
@@ -72,17 +72,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave
@@ -93,3 +93,4 @@ test_files:
 - spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
+has_rdoc: