upyun 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c53c29e162493c788f931b0eab39850a404fe70
-  data.tar.gz: 04a51ddba3f0eff2d3862ee4d3ede5d15f948a96
+  metadata.gz: 1e8945188015a56c10d3c46361797fd39ae8679a
+  data.tar.gz: c694593f3027180c55e9bfb5915f8fbe4ff94fa5
 SHA512:
-  metadata.gz: d26b50b05d5ed484d3b308676772fc84a9f6b2885baef919b421dd4d57dc8632c680510827aae5ef92f7cbabb221f45d328d02c5bd1cb7f91bf3129f83c848f9
-  data.tar.gz: 5f01e1b9c185217cca77b94ac433f2bd379632ee169caf17b74cf0f199044dcbc466fd1f272258b7481816d7c545a3619de251d0852723ff0085149aab5da069
+  metadata.gz: 108b4b9642f54e17b928f7482fa73e9d875d1bc3db952908dc41dabda035d8158dc98eec202afdfb9a41f97ab8452acec0111bca0ee150fb363ac52e4b1e0119
+  data.tar.gz: 1412e721624c65c989ab5e909994663e97ffa613815bdebe4b969e79d56e9bb60f48b7e0453f9d833fdc5727cdbc1dd22eacd08ac6a357dab08fbe21592820ac

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+### v1.0.4
+- 修正上传的参数为文件内容或者是文件描述符
+- ActiveSupport 的依赖放宽到 3.2.8 或以上
+
 ### v1.0.3
 - 请求失败时返回的 Hash 中增加 `:request_id` 字段；
 - 对于图片空间，上传时返回的 Hash 中包含图片详情信息；

data/README.md

@@ -13,7 +13,7 @@
 在 `Gemfile` 中加入以下代码
 
 ```ruby
-gem 'upyun', '~> 1.0.3'
+gem 'upyun', '~> 1.0.4'
 ```
 
 然后执行如下命令安装:
@@ -74,12 +74,13 @@ upyun.endpoint = Upyun::ED_CMCC
 > 这种方式只指定了又拍云必选的 `Date`, `Content-Length` 两个 Header，其它 Header 信息均未指定
 
 ```ruby
-upyun.put('/save/to/path', 'file or binary')
+upyun.put('/save/to/path', File.new('file.txt', 'rb'))  # 上传一个文件
+upyun.put('/save/to/path', 'binary')                    # 直接上传内容
 ```
 **参数**
 
 * `/save/to/path`： 文件在 UPYUN 空间的保存路径
-* `file or binary`：本地文件路径或文件内容
+* `file or binary`：已打开的文件描述符或文件内容，如果为文件描述符，在上传结束后该描述符会自动关闭
 
 ##### 自定义方式
 您也可以选择使用 API 允许的额外可选 HTTP Header 参数，以使用 API 提供的预处理等功能：
@@ -260,8 +261,10 @@ upyun.endpoint = Upyun::ED_CMCC
 > 使用简化版本，将不使用额外的策略参数:
 
 ```ruby
-upyun.upload('file')
+upyun.upload('filepath.png')
+upyun.upload(File.new('filepath.png'))
 ```
+参数可以是文件路径或者已经打开的文件文件描述符
 
 **返回**
 上传结果返回一个 `Hash` 结构:

data/lib/upyun/form.rb

@@ -52,7 +52,7 @@ module Upyun
       payload = {
         policy: policy(base_opts.merge(opts)),
         signature: signature,
-        file: File.new(file, 'rb')
+        file: file.is_a?(File) ? file : File.new(file, 'rb')
       }
 
       rest_client.post(payload, {'User-Agent' => "Upyun-Ruby-SDK-#{VERSION}"}) do |res|

data/lib/upyun/rest.rb

@@ -17,13 +17,9 @@ module Upyun
     end
 
     def put(path, file, headers={})
-      raise ArgumentError, "'file' is not an instance of String" unless file.is_a?(String)
       headers = headers.merge({'mkdir' => true}) unless headers.key?('mkdir')
-      options = if File.file?(file)
-                  {body: File.read(file), length: File.size(file), headers: headers}
-                else
-                  {body: file, length: file.length, headers: headers}
-                end
+      body = file.respond_to?(:read) ? IO.binread(file) : file
+      options = {body: body, length: size(file), headers: headers}
 
       # If the type of current bucket is Picture,
       # put an image maybe return a set of headers
@@ -39,6 +35,8 @@ module Upyun
       end
 
       res == {} ? true : res
+    ensure
+      file.close if file.respond_to?(:close)
     end
 
     def get(path, savepath=nil)
@@ -162,5 +160,13 @@ module Upyun
         sign = "#{method.to_s.upcase}&#{path}&#{date}&#{length}&#{@password}"
         "UpYun #{@operator}:#{md5(sign)}"
       end
+
+      def size(param)
+        if param.respond_to?(:size)
+          param.size
+        elsif param.is_a?(IO)
+          param.stat.size
+        end
+      end
   end
 end

data/lib/upyun/version.rb

@@ -1,3 +1,3 @@
 module Upyun
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/spec_helper.rb

@@ -2,3 +2,9 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'upyun'
+
+class String
+  def self.random(length=5)
+    ('a'..'z').sort_by {rand}[0, length].join
+  end
+end

data/spec/upyun_spec.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require File.dirname(__FILE__) + '/spec_helper'
 require 'uri'
 
@@ -25,10 +24,10 @@ describe "Upyun Restful API Basic testing" do
   end
 
   describe ".put" do
-    before { @path = '/ruby-sdk/foo/test.jpg' }
+    before { @path = "/ruby-sdk/foo/#{String.random}/test.jpg" }
 
     it "PUT a file" do
-      expect(@upyun.put(@path, @file)).to be true
+      expect(@upyun.put(@path, File.new(@file, 'rb'))).to be true
     end
 
     it "PUT a binary string" do
@@ -42,11 +41,11 @@ describe "Upyun Restful API Basic testing" do
         'x-gmkerl-value' => 42,
         'x-gmkerl-unsharp' => true
       }
-      expect(@upyun.put(@path, @file, headers)).to be true
+      expect(@upyun.put(@path, File.new(@file, 'rb'), headers)).to be true
     end
 
-    describe "PUT a file while the path is not encoded" do
-      before(:all) { @path_cn = '/ruby-sdk/这是中文路径/foo.txt' }
+    describe "PUT while the path is not encoded" do
+      before(:all) { @path_cn = '/ruby-sdk/foo/这是中文路径/foo.txt' }
 
       it "should success" do
         expect(@upyun.put(@path_cn, @str)).to be true
@@ -65,7 +64,7 @@ describe "Upyun Restful API Basic testing" do
 
     it "put a file to Picture bucket should return the image's metadata" do
       upyunp = Upyun::Rest.new('sdkimg', 'tester', 'grjxv2mxELR3', {}, Upyun::ED_TELECOM)
-      metas = upyunp.put(@path, @file, content_type: 'image/jpeg')
+      metas = upyunp.put(@path, File.new(@file), content_type: 'image/jpeg')
       expect(metas).to include(:width, :height, :frames, :file_type)
       expect(metas[:width].is_a?(Integer))
       expect(metas[:height].is_a?(Integer))
@@ -78,7 +77,7 @@ describe "Upyun Restful API Basic testing" do
 
   describe ".get" do
     before :all do
-      @path = '/ruby-sdk/foo/test.jpg'
+      @path = "/ruby-sdk/foo/#{String.random}/test.jpg"
       @upyun.put(@path, @str, {'Content-Type' => 'text/plain'})
     end
 
@@ -87,14 +86,14 @@ describe "Upyun Restful API Basic testing" do
     end
 
     it "GET a file and save" do
-      expect(@upyun.get(@path, './save.jpg')).not_to eq(404)
-      expect(File.exists?('./save.jpg')).to be true
+      expect(@upyun.get(@path, './save.jpg')).to eq(@str.length)
+      expect(File.exists?('./save.jpg')).to eq(true)
       expect(File.read('./save.jpg')).to eq(@str)
       File.delete('./save.jpg')
     end
 
     it "GET a not-exist file" do
-      res = @upyun.get('/ruby-sdk/foo/test-not-exist.jpg')
+      res = @upyun.get("/ruby-sdk/foo/#{String.random}/test-not-exist.jpg")
       expect(res.is_a?(Hash) && res[:error][:code] == 404)
     end
 
@@ -103,7 +102,7 @@ describe "Upyun Restful API Basic testing" do
 
   describe ".getinfo" do
     before :all do
-      @dir = '/ruby-sdk/foo'
+      @dir = "/ruby-sdk/foo/#{String.random}"
       @path = "#{@dir}/test.jpg"
       @upyun.put(@path, @str, {'Content-Type' => 'text/plain'})
     end
@@ -123,8 +122,8 @@ describe "Upyun Restful API Basic testing" do
 
   describe ".delete" do
     before do
-      @path = '/ruby-sdk/foo/test.jpg'
-      @upyun.put(@path, @file)
+      @path = "/ruby-sdk/foo/#{String.random}/test.jpg"
+      @upyun.put(@path, File.new(@file))
     end
 
     it "DELETE a file" do
@@ -133,7 +132,7 @@ describe "Upyun Restful API Basic testing" do
   end
 
   describe ".mkdir" do
-    before(:all) { @path = '/ruby-sdk/foo/dir' }
+    before(:all) { @path = "/ruby-sdk/foo/dir/#{String.random}" }
 
     it "should success" do
       expect(@upyun.mkdir(@path)).to be true
@@ -144,8 +143,8 @@ describe "Upyun Restful API Basic testing" do
 
   describe ".getlist" do
     before :all do
-      @dir = '/ruby-sdk/foo'
-      10.times { |i| @upyun.put("#@dir/#{i}", @file) }
+      @dir = "/ruby-sdk/foo/#{String.random}"
+      10.times { |i| @upyun.put("#@dir/#{i}", File.new(@file)) }
     end
 
     it "should get a list of file record" do
@@ -189,7 +188,7 @@ describe "Form Upload", current: true do
   end
 
   describe ".upload" do
-    it "with default attributes should success" do
+    it "with file path should success" do
       res = @form.upload(@file)
       expect(res.keys).to include(:code, :message, :url, :time)
       expect(res[:code]).to eq(200)
@@ -198,6 +197,15 @@ describe "Form Upload", current: true do
       expect(res[:url]).to eq("/#{now.year}/#{now.mon}/#{now.day}/upyun.jpg")
     end
 
+    it "with file descriptor should success" do
+      fd = File.new(@file, 'rb')
+      res = @form.upload(fd)
+      expect(res.keys).to include(:code, :message, :url, :time)
+      expect(res[:code]).to eq(200)
+      expect(res[:message]).to match(/ok/)
+      expect(fd.closed?).to eq(true)
+    end
+
     it "set 'save-key' should success" do
       res = @form.upload(@file, {'save-key' => 'name-ed keypath'})
       expect(res[:code]).to eq(200)

data/upyun.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client", ">= 1.6.7"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", ">= 3.2.8"
 
   spec.add_development_dependency "rspec", "~> 2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upyun
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - jsvisa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement