carrierwave-aliyun 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7c6794e4b53be8b1781733433933bb0fcec534
-  data.tar.gz: cbec6afebb360c4085155ce1f93d96657306c075
+  metadata.gz: 25e4c65f600597e1c2cc8ec0e9f4cf06044b0e60
+  data.tar.gz: 364f0df6e6f470ec901df437f0831a2f1c473040
 SHA512:
-  metadata.gz: a51ac3e32565f55992a3ca2ff282c958c30da2be5739a27faf5aafe5e735cef28e54aa1384f9417dc40f8dfdfbf79e826d1a166d70a502c7838a224e9c0e49f3
-  data.tar.gz: 189874b6216fb7345d8799cb33284f9104d8a64d5444bae4ebee61d57e52c792daf9bbaece22a0fe5b218e7f776cabf73641c62d6435ceef21417c17dbf49457
+  metadata.gz: 60925c4e88c63a2bc82caf7856c7703cf55b9cd634f855b931d2aee9a2150b915627c1e341cbb9ace24f7d9d303bae67871e118132f51976e81a26c0364ed0c2
+  data.tar.gz: 4e82ed9ba1c8c212bfc22f9299c778e1ee16b741a271a31408df58ed5230c23abe308a25a75bc34549e3dcceb9c945625acf79c47b8e6a2124b28e384644506b

data/Changelogs.md

@@ -1,3 +1,7 @@
+## 0.3.2
+
+* 请注意 `config.aliyun_host` 要求修改带 HTTP 协议，以便支持设置 http:// 或 https://.
+
 ## 0.3.1
 
 * 修复当文件名中包含了 "+"，在 OSS 中上传会遇到签名不对应的问题；

data/README.md

@@ -23,18 +23,18 @@ gem 'carrierwave-aliyun'
 
 ```ruby
 CarrierWave.configure do |config|
-  config.storage = :aliyun
-  config.aliyun_access_id = "xxxxxx"
+  config.storage           = :aliyun
+  config.aliyun_access_id  = "xxxxxx"
   config.aliyun_access_key = 'xxxxxx'
   # 你需要在 Aliyum OSS 上面提前创建一个 Bucket
-  config.aliyun_bucket = "simple"
+  config.aliyun_bucket     = "simple"
   # 是否使用内部连接，true - 使用 Aliyun 局域网的方式访问  false - 外部网络访问
-  config.aliyun_internal = true
+  config.aliyun_internal   = true
   # 配置存储的地区数据中心，默认: cn-hangzhou
-  # config.aliyun_area = "cn-hangzhou" 
+  # config.aliyun_area     = "cn-hangzhou"
   # 使用自定义域名，设定此项，carrierwave 返回的 URL 将会用自定义域名
   # 自定于域名请 CNAME 到 you_bucket_name.oss.aliyuncs.com (you_bucket_name 是你的 bucket 的名称)
-  config.aliyun_host = "foo.bar.com" 
+  config.aliyun_host       = "http://foo.bar.com"
 end
 ```
 

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -11,91 +11,93 @@ module CarrierWave
 
       class Connection
         def initialize(options={})
-          @aliyun_access_id = options[:aliyun_access_id]
+          @aliyun_access_id  = options[:aliyun_access_id]
           @aliyun_access_key = options[:aliyun_access_key]
-          @aliyun_bucket = options[:aliyun_bucket]
-          @aliyun_area   = options[:aliyun_area] || 'cn-hangzhou'
+          @aliyun_bucket     = options[:aliyun_bucket]
+          @aliyun_area       = options[:aliyun_area] || 'cn-hangzhou'
+
           # Host for upload
-          @aliyun_upload_host = "#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
           if options[:aliyun_internal] == true
-            @aliyun_upload_host = "#{@aliyun_bucket}.oss-#{@aliyun_area}-internal.aliyuncs.com"
+            @aliyun_upload_host = "http://#{@aliyun_bucket}.oss-#{@aliyun_area}-internal.aliyuncs.com"
+          else
+            @aliyun_upload_host = "http://#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
           end
+          
           # Host for get request
-          @aliyun_host = options[:aliyun_host] || "#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
-        end
+          @aliyun_host = options[:aliyun_host] || "http://#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
 
-=begin rdoc
-上传文件
-
-== 参数:
-- path - remote 存储路径
-- file - 需要上传文件的 File 对象
-- options:
-  - content_type - 上传文件的 MimeType，默认 `image/jpg`
+          if not @aliyun_host.include?("http")
+            raise "config.aliyun_host requirement include http:// or https://, but you give: #{@aliyun_host}"
+          end
+        end
 
-== 返回值:
-图片的下载地址
-=end
+        # 上传文件
+        # params:
+        # - path - remote 存储路径
+        # - file - 需要上传文件的 File 对象
+        # - options:
+        #   - content_type - 上传文件的 MimeType，默认 `image/jpg`
+        # returns:
+        # 图片的下载地址
         def put(path, file, options={})
-          path = format_path(path)
-          bucket_path = get_bucket_path(path)
-          content_md5 = Digest::MD5.file(file)
+          path         = format_path(path)
+          bucket_path  = get_bucket_path(path)
+          content_md5  = Digest::MD5.file(file)
           content_type = options[:content_type] || "image/jpg"
-          date = gmtdate
-          url = path_to_url(path)
-          auth_sign = sign("PUT", bucket_path, content_md5, content_type,date)
-          headers = {
-            "Authorization" => auth_sign,
-            "Content-Type" => content_type,
+          date         = gmtdate
+          url          = path_to_url(path)
+          
+          host = URI.parse(url).host
+
+          auth_sign    = sign("PUT", bucket_path, content_md5, content_type,date)
+          headers      = {
+            "Authorization"  => auth_sign,
+            "Content-Type"   => content_type,
             "Content-Length" => file.size,
-            "Date" => date,
-            "Host" => @aliyun_upload_host,
-            "Expect" => "100-Continue"
+            "Date"           => date,
+            "Host"           => host,
+            "Expect"         => "100-Continue"
           }
+
           RestClient.put(URI.encode(url).gsub("+", "%2B"), file, headers)
           return path_to_url(path, :get => true)
         end
 
-
-=begin rdoc
-读取文件
-
-== 参数:
-- path - remote 存储路径
-
-== 返回值:
-图片文件
-=end
+        # 读取文件
+        # params:
+        # - path - remote 存储路径
+        # returns:
+        # file data
         def get(path)
           path = format_path(path)
-          url = path_to_url(path)
+          url  = path_to_url(path)
           RestClient.get(URI.encode(url))
         end
 
-=begin rdoc
-删除 Remote 的文件
-
-== 参数:
-- path - remote 存储路径
-
-== 返回值:
-图片的下载地址
-=end
+        # 删除 Remote 的文件
+        #
+        # params:
+        # - path - remote 存储路径
+        #
+        # returns:
+        # 图片的下载地址
         def delete(path)
-          path = format_path(path)
+          path        = format_path(path)
           bucket_path = get_bucket_path(path)
-          date = gmtdate
-          headers = {
-            "Host" => @aliyun_upload_host,
-            "Date" => date,
+          date        = gmtdate
+          url         = path_to_url(path)
+          host        = URI.parse(url).host
+          headers     = {
+            "Host"          => host,
+            "Date"          => date,
             "Authorization" => sign("DELETE", bucket_path, "", "" ,date)
           }
-          url = path_to_url(path)
+          
           RestClient.delete(URI.encode(url).gsub("+", "%2B"), headers)
           return path_to_url(path, :get => true)
         end
 
-        ##
+        #
         # 阿里云需要的 GMT 时间格式
         def gmtdate
           Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
@@ -116,18 +118,18 @@ module CarrierWave
         # 根据配置返回完整的上传文件的访问地址
         def path_to_url(path, opts = {})
           if opts[:get]
-            "http://#{@aliyun_host}/#{path}"
+            "#{@aliyun_host}/#{path}"
           else
-            "http://#{@aliyun_upload_host}/#{path}"
+            "#{@aliyun_upload_host}/#{path}"
           end
         end
 
-      private
+        private
         def sign(verb, path, content_md5 = '', content_type = '', date)
           canonicalized_oss_headers = ''
           canonicalized_resource = "/#{path}"
           string_to_sign = "#{verb}\n\n#{content_type}\n#{date}\n#{canonicalized_oss_headers}#{canonicalized_resource}"
-          digest = OpenSSL::Digest::Digest.new('sha1')
+          digest = OpenSSL::Digest.new('sha1')
           h = OpenSSL::HMAC.digest(digest, @aliyun_access_key, string_to_sign)
           h = Base64.encode64(h)
           "OSS #{@aliyun_access_id}:#{h}"
@@ -137,8 +139,8 @@ module CarrierWave
       class File
         def initialize(uploader, base, path)
           @uploader = uploader
-          @path = path
-          @base = base
+          @path     = path
+          @base     = base
         end
 
         ##
@@ -209,12 +211,12 @@ module CarrierWave
             return @oss_connection if @oss_connection
 
             config = {
-              :aliyun_access_id => @uploader.aliyun_access_id,
+              :aliyun_access_id  => @uploader.aliyun_access_id,
               :aliyun_access_key => @uploader.aliyun_access_key,
-              :aliyun_area => @uploader.aliyun_area,
-              :aliyun_bucket => @uploader.aliyun_bucket,
-              :aliyun_internal => @uploader.aliyun_internal,
-              :aliyun_host => @uploader.aliyun_host
+              :aliyun_area       => @uploader.aliyun_area,
+              :aliyun_bucket     => @uploader.aliyun_bucket,
+              :aliyun_internal   => @uploader.aliyun_internal,
+              :aliyun_host       => @uploader.aliyun_host
             }
             @oss_connection ||= CarrierWave::Storage::Aliyun::Connection.new(config)
           end

data/spec/aliyun_spec.rb

@@ -7,7 +7,10 @@ describe "Aliyun" do
     @opts = {
       :aliyun_access_id => ALIYUN_ACCESS_ID,
       :aliyun_access_key => ALIYUN_ACCESS_KEY,
-      :aliyun_bucket => ALIYUN_BUCKET
+      :aliyun_bucket => ALIYUN_BUCKET,
+      :aliyun_area => "cn-hangzhou",
+      :aliyun_internal => true,
+      :aliyun_host => "http://bison-dev.cn-hangzhou.oss.aliyun-inc.com"
     }
     @connection = CarrierWave::Storage::Aliyun::Connection.new(@opts)
   end
@@ -27,13 +30,12 @@ describe "Aliyun" do
     Net::HTTP.get_response(URI.parse(url)).code.should == "404"
   end
   
-  it "should use default domain" do
-    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
-    url.should == "http://#{ALIYUN_BUCKET}.oss-cn-hangzhou.aliyuncs.com/a/a.jpg"
-  end
-  
   it "should support custom domain" do
-    @opts[:aliyun_host] = "foo.bar.com"
+    @opts[:aliyun_host] = "https://foo.bar.com"
+    @connection = CarrierWave::Storage::Aliyun::Connection.new(@opts)
+    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
+    url.should == "https://foo.bar.com/a/a.jpg"
+    @opts[:aliyun_host] = "http://foo.bar.com"
     @connection = CarrierWave::Storage::Aliyun::Connection.new(@opts)
     url = @connection.put("a/a.jpg",load_file("foo.jpg"))
     url.should == "http://foo.bar.com/a/a.jpg"

data/spec/spec_helper.rb

@@ -34,7 +34,8 @@ CarrierWave.configure do |config|
   config.aliyun_access_key = ALIYUN_ACCESS_KEY
   config.aliyun_bucket = ALIYUN_BUCKET
   config.aliyun_area = "cn-hangzhou"
-  # config.aliyun_internal = false
+  config.aliyun_internal = true
+  config.aliyun_host = "http://bison-dev.cn-hangzhou.oss.aliyun-inc.com"
 end
 
 def load_file(fname)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-12-15 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.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave