upyun-sdk 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8e3fa6232933b7512f4052c5ac549e1cacf790
-  data.tar.gz: 072ac5d0a2a6b80cfe78f003df2a52ae1fd6aa0d
+  metadata.gz: 4dbfcc73c74693148e1bc9c89ba60cecd5e36929
+  data.tar.gz: 6d242487be12d316c812dafa5930f94685f1ebdc
 SHA512:
-  metadata.gz: 76b8ec04405fa90fd07e4b8f7dc8fb436d8bcb85e6c698b9e9e55c4bb62099ec32eb7583cf7ef8b4bb57e8e1e74d71f44cdbc95376c946b3b10024345e362bf6
-  data.tar.gz: eb7559b2e6ae6f61928cb1a09040d2f10e4ff33558a64f705bfe283ca8aeff5262a60412d086386155651efcba581a261fa8f98a99d1e2367a6cb2462e3d6e7b
+  metadata.gz: 143e2bbb87aff0d49cf64021ce7974739d25d3dd1aa5ca70517af731fb758b7d34fbb9fcc84d71d83a8f890a218a23434aa4b31a4ae6eaea53ddf2aa8241c11d
+  data.tar.gz: b157b659b247e34f0d6daf7040321f907d4424791c87379c888e068d94520dbc3ce8631161ff2e14bc25f036a9765ed0eca6d0060b34dcb1c99e294db43fdbb8

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    upyun-sdk (0.1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec
+  upyun-sdk!

data/LICENSE

@@ -1,22 +1,13 @@
-Copyright (c) 2013 calelelac
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
 
-MIT License
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  0. You just DO WHAT THE FUCK YOU WANT TO.

data/README.md

@@ -46,7 +46,7 @@ up.endpoint = 1
 up.put('/upyun-sdk/ascii.txt', 'abcdefghijklmnopqrstuvwxyz\n')
 ````
 
-其中，参数 `auto_mkdir` 默认为 true，表示自动创建目录；`checksum`，默认 False，表示不进行 MD5 校验; `headers` ，可根据需求设置自定义 HTTP Header，例如作图参数 x-gmkerl-*, 具体请参考 [标准 API 上传文件](http://wiki.upyun.com/index.php?title=%E6%A0%87%E5%87%86API%E4%B8%8A%E4%BC%A0%E6%96%87%E4%BB%B6) 。
+其中，参数 `auto_mkdir` 默认为 true，表示自动创建目录; `checksum`，默认 False，表示不进行 MD5 校验; `headers` ，可根据需求设置自定义 HTTP Header，例如作图参数 x-gmkerl-*, 具体请参考 [标准 API 上传文件](http://wiki.upyun.com/index.php?title=%E6%A0%87%E5%87%86API%E4%B8%8A%E4%BC%A0%E6%96%87%E4%BB%B6) 。
 
 上传成功，返回 true; 失败返回错误信息。
 
@@ -85,7 +85,7 @@ up.delete('/upyun-sdk/temp/')
 ````
 
 注意删除目录时，必须保证目录为空。  
-删除成功，返回 true; 失败则返回 false。
+删除成功，返回 true; 失败则返回错误信息。
 
 ### 获取目录文件列表
 
@@ -94,7 +94,7 @@ res = up.getlist('/upyun-sdk/')
 ````
 
 该方法默认获取根目录列表信息。  
-获取成功，返回一个包含该目录下所有目录或文件条目信息的 Hash 对象数组; 失败则返回错误信息。
+获取成功，返回一个包含该目录下所有目录或文件条目信息的数组; 失败则返回错误信息。
 
 
 ### 获取空间使用情况
@@ -112,4 +112,5 @@ res = up.usage()
 
 ## Thanks
 
-[gccyugi](https://github.com/gccyugi)
+[gccyugi](https://github.com/gccyugi)
+[megayu](https://github.com/megayu)

data/lib/upyun/version.rb

@@ -1,3 +1,3 @@
 module Upyun
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/upyun-sdk.rb

@@ -11,11 +11,11 @@ class UpYun
   attr_accessor :bucket, :username, :password
   attr_reader :endpoint
 
-  def initialize(bucket, username, password, endpoint=nil)
+  def initialize(bucket, username, password, endpoint=0)
     @bucket = bucket
     @username = username
     @password = password
-    self.endpoint = endpoint || 0
+    self.endpoint = endpoint
   end
 
   # public API
@@ -25,32 +25,34 @@ class UpYun
   end
 
   # 上传文件
-  def put(path, data, auto_mkdir=true, checksum=nil, headers=nil)
-    headers = headers || {}
+  def put(path, data, auto_mkdir=true, checksum=nil, options={})
+    headers = {}
     headers['mkdir'] = auto_mkdir.to_s
     headers['Content-MD5'] = checksum if checksum
     headers['Content-Length'] = data.size.to_s
+    headers.merge(options)
     res = http_request('PUT', path, data, headers)
-    res_ok?(res) ? true : res_errmsg(res)
+    res_msg(res)
   end
 
   # 下载文件
   def get(path)
     res = http_request('GET', path)
-    res_ok?(res) ? res.body : res_errmsg(res)
+    res_msg(res, res.body)
   end
 
   # 获取文件信息
   def getinfo(path)
     res = http_request('HEAD', path)
-    if res_ok?(res)
-      return {
+    if res.code.eql? '200'
+      {
         :file_type => res['x-upyun-file-type'],
         :file_size => res['x-upyun-file-size'],
         :file_date => res['x-upyun-file-date']
       }
+    else
+      errmsg(res)
     end
-    res_errmsg(res)
   end
 
   # 创建目录
@@ -58,55 +60,47 @@ class UpYun
     headers = {'folder' => 'true'}
     headers['mkdir'] = auto_mkdir.to_s
     res = http_request('POST', path, nil, headers)
-    res_ok?(res) ? true : res_errmsg(res)
+    res_msg(res)
   end
 
   # 删除目录或文件
   def delete(path)
     res = http_request('DELETE', path)
-    res_ok?(res) ? true : res_errmsg(res)
+    res_msg(res)
   end
 
   # 获取目录文件列表
   def getlist(path='/')
     res = http_request('GET', path)
-    if res_ok?(res)
-      list = res.body.split("\n").map do |file|
-        name, type, size, time = file.split("\t")
-        {
-          :name => name,
-          :type => type,
-          :size => size,
-          :time => time
-        }
+    if res.code.eql? '200'
+      res.body.split("\n").map do |file|
+        Hash[[:name, :type, :size, :time].zip(file.split("\t"))]
       end
-      return list
+    else
+      errmsg(res)
     end
-    res_errmsg(res)
   end
 
   # 获取空间使用情况
   def usage(path='/')
     res = http_request('GET', "#{path}?usage")
-    res_ok?(res) ? res.body : res_errmsg(res)
+    res_msg(res, res.body)
   end
 
   private
 
-  def res_ok?(res)
-    res.code.eql? '200'
+  def res_msg(res, msg=true)
+    (res.code.eql? '200') ? msg : errmsg(res)
   end
 
-  def res_errmsg(res)
-    "#{res.code} #{res.message}"
+  def errmsg(res)
+    { :code => res.code, :message => res.message }
   end
 
-  def http_request(method, path, data=nil, headers=nil)
-    base = "http://#{@endpoint}/#{@bucket}"
-    url = File.join(base, path)
+  def http_request(method, path, data=nil, headers={})
+    url = "http://#{@endpoint}/#{@bucket}#{path}"
     uri = URI.parse(URI.encode(url))
 
-    headers = headers || {}
     date = Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
     length = headers['Content-Length'] || 0
     headers['Date'] = date

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'rspec'
+require 'bundler/setup'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'upyun-sdk'

data/spec/up_spec.rb

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe 'Up' do
+
+  before :all do
+    # @up = UpYun.new('bucket', 'username', 'password', 0)
+    @up = UpYun.new('redmine', 'woohoo', 'MH2RqEFgfoEi', 0)
+  end
+
+  f = 'abcdefghijklmnopqrstuvwxyz\n'
+  dir = '/upyun-sdk'
+
+  context 'put file' do
+    it 'does put file' do
+      @up.put("#{dir}/ascii.txt", f).should be_true
+    end
+  end
+
+  context 'get file' do
+    it  'does get file' do
+      @up.get("#{dir}/ascii.txt").size.should == f.size
+    end
+  end
+
+  context 'getinfo' do
+    it 'do get file info' do
+      @up.getinfo("#{dir}/ascii.txt")[:file_size].to_i.should == f.size
+    end
+  end
+
+  context 'getlist' do
+    it 'do get directory list' do
+      @up.getlist("#{dir}")[0][:size].to_i.should == f.size
+    end
+  end
+
+  context 'usage' do
+    it 'do get directory usage' do
+      @up.usage("#{dir}").to_i.should == f.size
+    end
+  end
+
+  context 'mkdir' do
+    it 'do create directory' do
+      @up.mkdir("#{dir}/temp/").should be_true
+    end
+  end
+
+  context 'delete dir' do
+    it 'do delete directory' do
+      @up.delete("#{dir}/temp/").should be_true
+    end
+  end
+
+  context 'delete file' do
+    it 'do delete file' do
+      @up.delete("#{dir}/ascii.txt").should be_true
+    end
+  end
+end

data/upyun-sdk.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: upyun-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -46,11 +46,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - lib/upyun-sdk.rb
 - lib/upyun/version.rb
+- spec/spec_helper.rb
+- spec/up_spec.rb
 - upyun-sdk.gemspec
 homepage: https://github.com/klwoohoo/upyun-sdk
 licenses:
@@ -76,4 +81,6 @@ rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Upyun SDK for Ruby.
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/up_spec.rb