carrierwave-aliyun 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbbd6d9b648b70321516cf2719ed5561f0eeed67
-  data.tar.gz: 50993ea58483e6b9ef829b10189bfb372b9350b1
+  metadata.gz: 26578c252fe9854ba9c649f43f34085a9e08d8a9
+  data.tar.gz: 4aa49c1451a5552aa9918bc5482bbfbc143e329f
 SHA512:
-  metadata.gz: 1f080757c46c13e1d5b9a704131c507711cc72d99fb29b011ea0bf919fefec62f1a236b924a6792da473fe9d47f7ddfa829ba59b3b11cb1150e8a93a80f9cb69
-  data.tar.gz: 8e5a6bc22996c840400830e544f93c912041d5efcf40071a1307320062d7f7a9db4e793dcd2a66388249552f0ff20d0904ed188bc32af398f930d9e24b3fc52d
+  metadata.gz: b0ed5151b787618e4496807b065ec493c3a60e141ac7286d9eab5acdbd8c1fa74197b328867243daa62979defd237642a518fd97b9fa2f06eb2aa9aab3dcdb4a
+  data.tar.gz: 6a4a619a5e131a94bc2a4b3e1c8e12eeb26143a074227b3d9ff59f8425a71f00a3e6e602cfa5e14a0159b1dbb7c53e223a06d1b1ca21d75e02faf7450403d97c

data/Changelogs.md

@@ -1,3 +1,8 @@
+## 0.2.1
+
+* 避免计算上传文件的时候读取所有内容到内存，之前的做法对于大文件会耗费过多的内存；
+* Carrierwave::Storage::Aliyum::Connection 的 put 方法接口变化，file 现在应该传一个 File 的实例。
+
 ## 0.2.0
 
 * Aliyun OSS 新的[三级域名规则支持](http://bbs.aliyun.com/read.php?tid=139226) by [chaixl](https://github.com/chaixl)

data/carrierwave-aliyun.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.license       = 'MIT'
 
   s.add_dependency "carrierwave", [">= 0.5.7"]
   s.add_dependency "rest-client", [">= 1.6.7"]

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -8,7 +8,7 @@ require 'uri'
 module CarrierWave
   module Storage
     class Aliyun < Abstract
-      
+
       class Connection
         def initialize(options={})
           @aliyun_access_id = options[:aliyun_access_id]
@@ -23,26 +23,47 @@ module CarrierWave
           @aliyun_host = options[:aliyun_host] || "#{@aliyun_bucket}.oss.aliyuncs.com"
         end
 
-        def put(path, file_data, options={})
+=begin rdoc
+上传文件
+
+== 参数:
+- path - remote 存储路径
+- file - 需要上传文件的 File 对象
+- options:
+  - content_type - 上传文件的 MimeType，默认 `image/jpg`
+
+== 返回值:
+图片的下载地址
+=end
+        def put(path, file, options={})
           path = format_path(path)
           bucket_path = get_bucket_path(path)
-          content_md5 = Digest::MD5.hexdigest(file_data)
+          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, 
+            "Authorization" => auth_sign,
             "Content-Type" => content_type,
-            "Content-Length" => file_data.length,
+            "Content-Length" => file.size,
             "Date" => date,
             "Host" => @aliyun_upload_host,
             "Expect" => "100-Continue"
           }
-          RestClient.put(URI.encode(url), file_data, headers)
+          RestClient.put(URI.encode(url), file, headers)
           return path_to_url(path, :get => true)
         end
-        
+
+=begin rdoc
+删除 Remote 的文件
+
+== 参数:
+- path - remote 存储路径
+
+== 返回值:
+图片的下载地址
+=end
         def delete(path)
           path = format_path(path)
           bucket_path = get_bucket_path(path)
@@ -56,22 +77,26 @@ module CarrierWave
           RestClient.delete(URI.encode(url), headers)
           return path_to_url(path, :get => true)
         end
-        
+
+        ##
+        # 阿里云需要的 GMT 时间格式
         def gmtdate
           Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
         end
-        
+
         def format_path(path)
           return "" if path.blank?
           path.gsub!(/^\//,"")
-          
+
           path
         end
 
         def get_bucket_path(path)
           [@aliyun_bucket,path].join("/")
         end
-        
+
+        ##
+        # 根据配置返回完整的上传文件的访问地址
         def path_to_url(path, opts = {})
           if opts[:get]
             "http://#{@aliyun_host}/#{path}"
@@ -80,10 +105,10 @@ module CarrierWave
           end
         end
 
-      private      
+      private
         def sign(verb, path, content_md5 = '', content_type = '', date)
           canonicalized_oss_headers = ''
-          canonicalized_resource = "/#{path}"          
+          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')
           h = OpenSSL::HMAC.digest(digest, @aliyun_access_key, string_to_sign)
@@ -140,8 +165,8 @@ module CarrierWave
           oss_connection.path_to_url(@path, :get => true)
         end
 
-        def store(data, opts = {})
-          oss_connection.put(@path, data, opts)
+        def store(file, opts = {})
+          oss_connection.put(@path, file, opts)
         end
 
         private
@@ -156,22 +181,22 @@ module CarrierWave
 
           def oss_connection
             return @oss_connection if @oss_connection
-         
+
             config = {
-              :aliyun_access_id => @uploader.aliyun_access_id, 
-              :aliyun_access_key => @uploader.aliyun_access_key, 
+              :aliyun_access_id => @uploader.aliyun_access_id,
+              :aliyun_access_key => @uploader.aliyun_access_key,
               :aliyun_bucket => @uploader.aliyun_bucket,
               :aliyun_internal => @uploader.aliyun_internal,
               :aliyun_host => @uploader.aliyun_host
             }
             @oss_connection ||= CarrierWave::Storage::Aliyun::Connection.new(config)
           end
-          
+
       end
-      
+
       def store!(file)
         f = CarrierWave::Storage::Aliyun::File.new(uploader, self, uploader.store_path)
-        f.store(file.read, :content_type => file.content_type)
+        f.store(::File.open(file.file), :content_type => file.content_type)
         f
       end
 

data/spec/aliyun_spec.rb

@@ -13,12 +13,12 @@ describe "Aliyun" do
   end
   
   it "should put" do
-    url = @connection.put("a/a.jpg",load_file("foo.jpg").read)
+    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
     Net::HTTP.get_response(URI.parse(url)).code.should == "200"
   end
 
   it "should put with / prefix" do
-    url = @connection.put("/a/a.jpg",load_file("foo.jpg").read)
+    url = @connection.put("/a/a.jpg",load_file("foo.jpg"))
     Net::HTTP.get_response(URI.parse(url)).code.should == "200"
   end
   
@@ -28,14 +28,14 @@ describe "Aliyun" do
   end
   
   it "should use default domain" do
-    url = @connection.put("a/a.jpg",load_file("foo.jpg").read)
+    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
     url.should == "http://#{ALIYUN_BUCKET}.oss.aliyuncs.com/a/a.jpg"
   end
   
   it "should support custom domain" do
     @opts[:aliyun_host] = "foo.bar.com"
     @connection = CarrierWave::Storage::Aliyun::Connection.new(@opts)
-    url = @connection.put("a/a.jpg",load_file("foo.jpg").read)
+    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
     url.should == "http://foo.bar.com/a/a.jpg"
   end
 end

data/spec/spec_helper.rb

@@ -24,9 +24,9 @@ end
 ActiveRecord::Migration.verbose = false
 
 # 测试的时候需要修改这个地方
-ALIYUN_ACCESS_ID = "7ewl4zm3mhi45vko9zx022ul"
-ALIYUN_ACCESS_KEY = 'Ajpi7IRKDKdXYHHFFoS89uQJQE8='
-ALIYUN_BUCKET = "carrierwave"
+ALIYUN_ACCESS_ID = "osOXJ5VeQVgDLMs3"
+ALIYUN_ACCESS_KEY = 'm2LSEotGzDFrtHLeG1e6OATUTQ5ypR'
+ALIYUN_BUCKET = "bison-dev"
 
 CarrierWave.configure do |config|
   config.storage = :aliyun

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -62,7 +62,8 @@ files:
 - spec/spec_helper.rb
 - spec/upload_spec.rb
 homepage: https://github.com/huacnlee/carrierwave-aliyun
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -91,3 +92,4 @@ test_files:
 - spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
+has_rdoc: