upyun 0.7.1 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3e728cd2f23654592cfaea37730c0ad780a31eea
+  data.tar.gz: 41572412bf3d5ea83525082d71851687605fc7bc
+SHA512:
+  metadata.gz: ec030a7fcc5ff6009b077d2408bfa945666bcbeebf49f0fc9fd33dfb2c8635c74e84baea60943bc23c6ba4fcef794d4b6e0aeae92b407be203fda37a32153b62
+  data.tar.gz: 8ad799d0272e685c803308c313bea67d75432331d9964416fba150b8802df9b6e3f8cc7b9b08d3bc97bbe45db111814f12509eabab79a8bd6599bbad7ab5ed83

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -1,18 +1,14 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.DS_Store
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/.rspec

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

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.3
+
+
+script: bundle exec rspec spec
+before_install:
+  - gem update --system
+  - gem --version

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in upyun.gemspec
+gem 'coveralls', require: false
+
 gemspec

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2012 lg2046
+Copyright (c) 2014 jsvisa
 
 MIT License
 
@@ -19,4 +19,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,31 +1,236 @@
-# Upyun
+# UPYUN sdk for Ruby
+[![RubyGems](https://img.shields.io/gem/dtv/upyun.svg?style=flat)](https://rubygems.org/gems/upyun)
+[![Build status](https://img.shields.io/travis/upyun/ruby-sdk.svg?style=flat)](https://travis-ci.org/upyun/ruby-sdk)
+[![Coverage Status](https://img.shields.io/coveralls/upyun/ruby-sdk.svg)](https://coveralls.io/r/upyun/ruby-sdk)
 
-又拍云 ruby api
+[UPYUN](https://www.upyun.com) [Rest API](http://docs.upyun.com/api/rest_api/) 和 [Form API](http://docs.upyun.com/api/form_api/) 的 Ruby SDK !
 
-## Installation
 
-Add this line to your application's Gemfile:
+## 安装说明
 
-    gem 'upyun'
+*Gemfile* 中加入以下代码
 
-And then execute:
+```ruby
+gem 'upyun'
+```
+
+然后执行:
 
     $ bundle
 
-Or install it yourself as:
+或者可以手动安装:
 
     $ gem install upyun
 
-## Usage
+## 基本使用
+
+### Rest API 使用
+
+#### 初始化一个实例
+
+```ruby
+require 'upyun'
+
+upyun = Upyun::Rest.new('bucket', 'operator', 'password', 'endpoint')
+```
+
+其中，参数 `bucket` 为空间名称，`operator` 为授权操作员帐号, `password` 为授权操作员密码，必选。
+
+参数 `endpoint` 为又拍云存储 API 接入点，根据国内的网络情况，又拍云存储 API 提供了电信、联通（网通）、移动（铁通）数个接入点，
+在初始化时可由参数 `endpoint` 进行设置，详情查阅 [API 域名](http://docs.upyun.com/api/)。其可选的值有：
+
+```ruby
+Upyun::ED_AUTO     # 自动判断最优线路
+Upyun::ED_TELECOM  # 电信接入点
+Upyun::ED_UNION    # 联通（网通）接入点
+Upyun::ED_CMCC     # 移动（铁通）接入点
+```
+
+默认设置为 `Upyun::ED_AUTO` ，但是我们推荐根据服务器网络状况，手动设置合理的接入点以获取最佳的访问速度。
+同时，也可以在初始化一个实例之后通过：
+
+```ruby
+upyun.endpoint = Upyun::ED_CMCC
+```
+更改接入点。
+
+#### 上传文件
+
+默认使用 Upyun 基本 Header 头上传文件:
+
+```ruby
+upyun.put('/save/to/path', 'file or binary')
+```
+其中 `/save/to/path` 为文件保存路径，  `file or binary` 为本机上文件路径或者文件内容。
+**注：**
+> 这里只指定了又拍云必选的 `Date`, `Content-Length` 两个 Header，其它 Header 信息均未指定
+
+也可以使用 Upyun 定义的额外 Header 头上传文件，详情查阅 [Rest API](http://docs.upyun.com/api/rest_api/), 如:
+
+```ruby
+headers = {'Content-Type' => 'image/jpeg', 'x-gmkerl-type' => 'fix_width', 'x-gmkerl-value' => 1080}
+upyun.put('/save/to/path', 'file or binary', headers)
+```
+
+上传成功返回 `true`，失败返回一个 `Hash` 结构: `{error: {code: code, message: message}}`,
+其中 `code` 为又拍云返回的错误码, `message` 为错误信息。
+
+
+#### 下载文件
+
+```ruby
+file = upyun.get('/path/to/file')
+```
+
+下载成功返回文件信息，失败返回一个 `Hash`: `{error: {code: code, message: message}}`,
+其中 `code` 为又拍云返回的错误码, `message` 为错误信息。
+
+也可以指定保存路径，下载到的文件将写入到保存路径中:
+
+```ruby
+upyun.get('/path/to/file', 'saved/foo.png')
+```
+
+下载成功返回获取的文件长度。
+
+
+#### 获取文件信息
+
+```ruby
+upyun.getinfo('/path/to/file')
+```
+
+成功返回 `Hash` 结构:
+
+```
+{file_type: "file", file_size: 397190, file_date: 1415954066}
+```
+
+其中
+
+  * `:file_type` 说明是文件(`"file"`)还是目录(`"folder"`)
+  * `:file_size` 是文件的大小
+  * `:file_date` 是文件最后的更改时间。
+
+失败返回一个 `Hash`: `{error: {code: code, message: message}}`。
+
+
+#### 删除文件或者目录
+
+```ruby
+upyun.delete('/path/to/file')
+```
+
+成功返回: `true`,
+
+失败返回一个 `Hash`: `{error: {code: code, message: message}}`。
+
+#### 创建目录
+
+```ruby
+upyun.mkdir('/path/to/dir')
+```
+
+成功返回: `true`,
+
+失败返回一个 `Hash`: `{error: {code: code, message: message}}`。
+
+#### 获取目录文件列表
+
+```ruby
+upyun.getlist('/path/to/dir')
+```
+
+成功返回一个数组，每个数组成员为一个文件/目录:
+
+```ruby
+[{:name=>"foo", :type=>:folder, :length=>0, :last_modified=>1416193624},
+ {:name=>"bar.txt", :type=>:file, :length=>25, :last_modified=>1415261057}]
+```
+
+失败返回一个 `Hash`: `{error: {code: code, message: message}}`。
+
+#### 获取空间使用情况
+
+```ruby
+upyun.usage
+```
+
+成功返回空间使用量（单位为 `Byte`）: `12400`,
+
+失败返回一个 `Hash`: `{error: {code: code, message: message}}`。
+
+### Form API 使用
+
+#### 初始化一个实例
+
+```ruby
+require 'upyun'
+
+upyun = Upyun::Form.new('form-password', 'bucket')
+```
+
+其中，参数 `form-password` 为空间表单 API 密钥，可通过又拍云后台获取，`bucket` 为空间名称（必选）。
+
+与 Rest API 相似， 表单 API 也有个实例变量 `endpoint` 代表又拍云基本域名，默认设置为 `Upyun::ED_AUTO` ，也可以在初始化一个实例之后通过：
+
+```ruby
+upyun.endpoint = Upyun::ED_CMCC
+```
+更改接入点。
+
+
+#### 上传文件
+
+为了简化使用，又拍云文档必选的参数中:
+>
+  `save-key` 默认设置为: `'/{year}/{mon}/{day}/{filename}{.suffix}'`
+  `expiration` 默认设置为10分钟: `Time.now.to_i + 600`
+
+
+使用简化版本，不使用额外的策略参数:
+
+```ruby
+upyun.upload('file')
+```
+上传结果返回一个 `Hash` 结构:
+
+```ruby
+{
+  :code=>200,
+  :message=>"ok",
+  :url=>"/2014/11/17/upyun.jpg",
+  :time=>1416208715,
+  :sign=>"f5165b35df431065ca54490a34028635"
+}
+```
+其中
+  1. `code`: 返回的状态码，`200` 为成功，其它为失败
+  2. `message`: 错误信息，具体查阅 [表单 API 状态代码表](http://docs.upyun.com/api/form_api/#api_2)
+  3. `url`: 上传文件保存路径
+  4. `time`: 请求的时间戳
+  5. `sign`: 签名参数，详情见 [sign与non-sign参数说明](http://docs.upyun.com/api/form_api/#note6)
+  6. 如果在请求中指定了 `ext-param`, 那么返回的结构中也会有 `ext-param` 字段，详情见 [ext-param](http://docs.upyun.com/api/form_api/#note5)
+
+可以在上传的时候指定一些策略参数:
+
+```ruby
+opts = {
+  'save_key' => '/foo/bar.jpg',
+  'content-type' => 'image/jpeg',
+  'image-width-range' => '0,1024',
+  'return-url' => 'http://www.example.com'
+}
+upyun.upload('file', opts)
+```
+特别地，如果指定了 `return-url`, 那么返回的是需要跳转的地址，
+详情查阅 [通知规则](http://docs.upyun.com/api/form_api/#notify_return)
 
-	up_client = UpYun::Bucket.new("by-test-upload", "ichihuo", "********")
-	res = up_client.writeFile("/test.png", File.new("test.png"))
-	res['x-upyun-width']
 
 ## Contributing
 
-1. Fork it
+1. Fork it ( https://github.com/[my-github-username]/upyun/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create a new Pull Request

data/Rakefile

@@ -1,2 +1,2 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
+

data/lib/upyun/form.rb

@@ -0,0 +1,87 @@
+# encoding: utf-8
+require 'restclient'
+require 'base64'
+require 'json'
+require 'active_support/hash_with_indifferent_access'
+
+module Upyun
+  class Form
+    include Utils
+
+    VALID_PARAMS = %w(
+      bucket
+      save-key
+      expiration
+      allow-file-type
+      content-length-range
+      content-md5
+      content-secret
+      content-type
+      image-width-range
+      image-height-range
+      notify-url
+      return-url
+      x-gmkerl-thumbnail
+      x-gmkerl-type
+      x-gmkerl-value
+      x-gmkerl-quality
+      x-gmkerl-unsharp
+      x-gmkerl-rotate
+      x-gmkerl-crop
+      x-gmkerl-exif-switch
+      ext-param
+    )
+
+    attr_accessor :bucket, :password
+
+    def initialize(password, bucket)
+      @password = password
+      @bucket = bucket
+      @endpoint = ED_AUTO
+    end
+
+    def upload(file, opts={})
+      base_opts = HashWithIndifferentAccess.new({
+        'bucket' => @bucket,
+        'save-key' => '/{year}/{mon}/{day}/{filename}{.suffix}',
+        'expiration' => Time.now.to_i + 600
+      })
+
+      payload = {
+        policy: policy(base_opts.merge(opts)),
+        signature: signature,
+        file: File.new(file, 'rb')
+      }
+
+      RestClient.post("http://#{@endpoint}/#{@bucket}", payload) do |res|
+        case res.code
+        when 302
+          res
+        else
+          body = JSON.parse(res.body, symbolize_names: true)
+
+          # TODO Upyun have a small bug for the `code`,
+          # we have to adjust it to integer
+          body[:code] = body[:code].to_i
+          body
+        end
+      end
+    end
+
+    private
+      def policy(opts)
+        @_policy = Base64.encode64(policy_json(opts))
+      end
+
+      def signature
+        md5("#{@_policy}&#{@password}")
+      end
+
+      def policy_json(opts)
+        policies = VALID_PARAMS.reduce({}) do |memo, e|
+          (v = opts[e]) ? memo.merge!({e => v}) : memo
+        end
+        policies.to_json
+      end
+  end
+end

data/lib/upyun/rest.rb

@@ -0,0 +1,132 @@
+# encoding: utf-8
+require 'restclient'
+require 'uri'
+
+module Upyun
+  class Rest
+    include Utils
+
+    def initialize(bucket, operator, password, endpoint=Upyun::ED_AUTO)
+      @bucket = bucket
+      @operator = operator
+      @password = md5(password)
+      @endpoint = endpoint
+    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
+
+      request(:put, path, options)
+    end
+
+    def get(path, savepath=nil)
+      res = request(:get, path)
+      return res if res.is_a?(Hash) || !savepath
+
+      dir = File.dirname(savepath)
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+      File.write(savepath, res)
+    end
+
+    def getinfo(path)
+      hds = request(:head, path)
+      hds = hds.key?(:error) ? hds : format_info(hds)
+    end
+
+    def delete(path)
+      request(:delete, path)
+    end
+
+    def mkdir(path)
+      request(:post, path, {headers: {folder: true, mkdir: true}})
+    end
+
+    def getlist(path="/")
+      res = request(:get, path)
+      return res if res.is_a?(Hash)
+      res.split("\n").map do |f|
+        attrs = f.split("\t")
+        {
+          name: attrs[0],
+          type: attrs[1] == "N" ? :file : :folder,
+          length: attrs[2].to_i,
+          last_modified: attrs[3].to_i
+        }
+      end
+    end
+
+    def usage(path="/")
+      res = request(:get, path, {params: "usage"})
+      return res if res.is_a?(Hash)
+
+      # RestClient has a bug, body.to_i returns the code instead of body,
+      # see more on https://github.com/rest-client/rest-client/pull/103
+      res.dup.to_i
+    end
+
+    private
+
+      def format_info(hds)
+        selected = hds.select { |k| k.to_s.match(/^x_upyun/i) }
+        selected.reduce({}) do |memo, (k, v)|
+          memo.merge!({k[8..-1].to_sym => /^\d+$/.match(v) ? v.to_i : v})
+        end
+      end
+
+      def fullpath(path)
+        "/#{@bucket}#{URI.encode(URI.decode(path[0] == '/' ? path : '/' + path))}"
+      end
+
+      def encode(fullpath, params)
+        URI.join("http://#{@endpoint}", fullpath, params.nil? ? '' : '?' + params).to_s
+      end
+
+      def request(method, path, options={})
+        fullpath = fullpath(path)
+        url = encode(fullpath, options[:params])
+        headers = options[:headers] || {}
+        date = gmdate
+        length = options[:length] || 0
+        headers.merge!({
+          'Date' => date,
+          'Authorization' => sign(method, date, fullpath, length)
+        })
+
+        if [:post, :patch, :put].include? method
+          RestClient.send(method, url, options[:body].nil? ? "" : options[:body], headers) do |res|
+            res.code == 200 ? true : {error: {code: res.code, message: res.body}}
+          end
+        else
+          RestClient.send(method, url, headers) do |res|
+            if res.code == 200
+              case method
+              when :get
+                res.body
+              when :head
+                res.headers
+              else
+                true
+              end
+            else
+              {error: {code: res.code, message: res.body}}
+            end
+          end
+        end
+      end
+
+      def gmdate
+        Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
+      end
+
+      def sign(method, date, path, length)
+        sign = "#{method.to_s.upcase}&#{path}&#{date}&#{length}&#{@password}"
+        "UpYun #{@operator}:#{md5(sign)}"
+      end
+  end
+end

data/lib/upyun/utils.rb

@@ -0,0 +1,19 @@
+require 'digest/md5'
+
+module Upyun
+  module Utils
+    def md5(str)
+      Digest::MD5.hexdigest(str)
+    end
+
+    def self.included(receiver)
+      receiver.send(:define_method, :endpoint) { @endpoint }
+      receiver.send(:define_method, :endpoint=) do |ep|
+        unless Upyun::ED_LIST.member?(ep)
+          raise ArgumentError, "Valid endpoints are: #{Upyun::ED_LIST}"
+        end
+        @endpoint = ep
+      end
+    end
+  end
+end

data/lib/upyun/version.rb

@@ -1,3 +1,3 @@
 module Upyun
-  VERSION = "0.7.1"
+  VERSION = "1.0.1"
 end

data/lib/upyun.rb

@@ -1,14 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + "/upyun/version")
-require File.expand_path(File.dirname(__FILE__) + "/upyun/bucket")
-
+require 'upyun/version'
+require 'upyun/utils'
+require 'upyun/rest'
+require 'upyun/form'
 
 module Upyun
-  def self.get_config_for_bucket(bucket)
-    UP_BUCKETS.find {|k, v| v.bucket_name.to_s == bucket.to_s}.try(:last)
-  end
-  
-  # 为给定的路径与文件名生成保存后的远程路径
-  def self.rand_save_path(filename)
-    "/#{Date.today.year}/#{'%2s' % Date.today.month.to_s.rjust(2, "0")}/#{RandomCode.mix_string(16).downcase}#{File.basename(filename)}"
-  end
-end
+  DOMAIN = 'api.upyun.com'
+  ED_AUTO = "v0.#{DOMAIN}"
+  ED_TELECOM = "v1.#{DOMAIN}"
+  ED_UNION = "v2.#{DOMAIN}"
+  ED_CMCC = "v3.#{DOMAIN}"
+  ED_LIST = (0..3).map { |e| "v#{e}.#{DOMAIN}" }
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'coveralls'
+Coveralls.wear!
+
+require 'upyun'

data/spec/upyun_spec.rb

@@ -0,0 +1,201 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "Upyun Restful API Basic testing" do
+  before :all do
+    @upyun = Upyun::Rest.new('sdkfile', 'tester', 'grjxv2mxELR3')
+    @file = File.expand_path('../upyun.jpg', __FILE__)
+    @str = 'This is a binary string, not a file'
+  end
+
+  describe ".endpoint=" do
+    it "known ENDPOINT, should return ok" do
+      @upyun.endpoint = Upyun::ED_CMCC
+      expect(@upyun.endpoint).to eq 'v3.api.upyun.com'
+    end
+
+    it "unknown ENDPOINT, should raise ArgumentError" do
+      expect {@upyun.endpoint = 'v5.api.upyun.com'}.
+        to raise_error(ArgumentError, /Valid endpoints/)
+    end
+
+    after { @upyun.endpoint = Upyun::ED_AUTO }
+  end
+
+  describe ".put" do
+    before { @path = '/ruby-sdk/foo/test.jpg' }
+
+    it "PUT a file" do
+      expect(@upyun.put(@path, @file)).to be true
+    end
+
+    it "PUT a binary string" do
+      expect(@upyun.put(@path, @str)).to be true
+    end
+
+    it "PUT with some extra process headers" do
+      headers = {
+        'Contetn-type' => 'image/jpeg',
+        'x-gmkerl-type' => 'fix_width',
+        'x-gmkerl-value' => 42,
+        'x-gmkerl-unsharp' => true
+      }
+      expect(@upyun.put(@path, @file, headers)).to be true
+    end
+
+    after { @upyun.delete(@path) }
+  end
+
+  describe ".get" do
+    before :all do
+      @path = '/ruby-sdk/foo/test.jpg'
+      @upyun.put(@path, @str, {'Content-Type' => 'text/plain'})
+    end
+
+    it "GET a file" do
+      expect(@upyun.get(@path)).to eq(@str)
+    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(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')
+      expect(res.is_a?(Hash) && res[:error][:code] == 404)
+    end
+
+    after(:all) { @upyun.delete(@path) }
+  end
+
+  describe ".getinfo" do
+    before :all do
+      @dir = '/ruby-sdk/foo'
+      @path = "#{@dir}/test.jpg"
+      @upyun.put(@path, @str, {'Content-Type' => 'text/plain'})
+    end
+
+    it "of file should success" do
+      res = @upyun.getinfo(@path)
+      expect(res[:file_type]).to eq('file')
+    end
+
+    it "of folder should success" do
+      res = @upyun.getinfo(@dir)
+      expect(res[:file_type]).to eq('folder')
+    end
+
+    after(:all) { @upyun.delete(@path) }
+  end
+
+  describe ".delete" do
+    before do
+      @path = '/ruby-sdk/foo/test.jpg'
+      @upyun.put(@path, @file)
+    end
+
+    it "DELETE a file" do
+      expect(@upyun.delete(@path)).to be true
+    end
+  end
+
+  describe ".mkdir" do
+    before(:all) { @path = '/ruby-skd/foo/dir' }
+
+    it "should success" do
+      expect(@upyun.mkdir(@path)).to be true
+    end
+
+    after(:all) { @upyun.delete(@path) }
+  end
+
+  describe ".getlist" do
+    it "should get a list of file record" do
+      expect(@upyun.getlist("/")).to be_instance_of(Array)
+    end
+  end
+
+  describe ".usage" do
+    it "should be an Fixnum" do
+      expect(@upyun.usage).to be_instance_of(Fixnum)
+    end
+  end
+end
+
+describe "Form Upload" do
+  before :all do
+    @form = Upyun::Form.new('ESxWIoMmF39nSDY7CSFUsC7s50U=', 'sdkfile')
+    @file = File.expand_path('../upyun.jpg', __FILE__)
+  end
+
+  describe ".endpoint=" do
+    it "known ENDPOINT, should return ok" do
+      @form.endpoint = Upyun::ED_CMCC
+      expect(@form.endpoint).to eq 'v3.api.upyun.com'
+    end
+
+    it "unknown ENDPOINT, should raise ArgumentError" do
+      expect {@form.endpoint = 'v5.api.upyun.com'}.
+        to raise_error(ArgumentError, /Valid endpoints/)
+    end
+
+    after { @form.endpoint = Upyun::ED_AUTO }
+  end
+
+  describe ".upload" do
+    it "with default attributes should success" do
+      res = @form.upload(@file)
+      expect(res.keys).to include(:code, :message, :url, :time)
+      expect(res[:code]).to eq(200)
+      expect(res[:message]).to match(/ok/)
+      now = Time.now
+      expect(res[:url]).to eq("/#{now.year}/#{now.mon}/#{now.day}/upyun.jpg")
+    end
+
+    it "set 'save-key' should success" do
+      res = @form.upload(@file, {'save-key' => 'name-ed keypath'})
+      expect(res[:code]).to eq(200)
+      expect(res[:url]).to eq('name-ed keypath')
+    end
+
+    it "set not correct 'expiration' should return 403 with expired" do
+      res = @form.upload(@file, {'expiration' => 102400})
+      expect(res[:code]).to eq(403)
+      expect(res[:message]).to match(/Authorize has expired/)
+    end
+
+    it "set 'return-url' should return 302 with 'location' header" do
+      res = @form.upload(@file, {'return-url' => 'http://www.example.com'})
+      expect(res.code).to eq(302)
+      expect(res.headers.key?(:location)).to be true
+    end
+
+    it "set 'return-url' and handle failed, should also return 302 with 'location' header" do
+      opts = {
+        'image-width-range' => '0,10',
+        'return-url' => 'http://www.example.com'
+      }
+      res = @form.upload(@file, opts)
+      expect(res.code).to eq(302)
+      expect(res.headers.key?(:location)).to be true
+    end
+
+    it "set 'notify-url' should return 200 success" do
+      res = @form.upload(@file, {'notify-url' => 'http://www.example.com'})
+      expect(res).to be_instance_of(Hash)
+      expect(res[:code]).to eq(200)
+    end
+
+    it "set 'notify-url' and handle failed, should return 403 failed" do
+      opts = {
+        'image-width-range' => '0,10',
+        'notify-url' => 'http://www.example.com'
+      }
+      res = @form.upload(@file, opts)
+      expect(res).to be_instance_of(Hash)
+      expect(res[:code]).to eq(403)
+    end
+  end
+end

data/upyun.gemspec

@@ -1,17 +1,28 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/upyun/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'upyun/version'
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["veggie"]
-  gem.email         = ["kkxlkkxllb@gmail.com"]
-  gem.description   = %q{又拍云存储ruby api}
-  gem.summary       = %q{又拍云存储ruby api}
-  gem.homepage      = "https://github.com/kkxlkkxllb/upyun"
+Gem::Specification.new do |spec|
+  spec.name          = "upyun"
+  spec.version       = Upyun::VERSION
+  spec.authors       = ["jsvisa"]
+  spec.email         = ["delweng@gmail.com"]
+  spec.summary       = "UPYUN API SDK"
+  spec.description   = "UPYUN Rest API and Form API SDK"
+  spec.homepage      = "https://github.com/upyun/ruby-sdk"
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "upyun"
-  gem.require_paths = ["lib"]
-  gem.version       = Upyun::VERSION
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "rest-client", ">= 1.6.7"
+  spec.add_dependency "activesupport", "~> 4.1.0"
+
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
 end
+

metadata

@@ -1,55 +1,134 @@
 --- !ruby/object:Gem::Specification
 name: upyun
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
-- veggie
+- jsvisa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000Z
-dependencies: []
-description: 又拍云存储ruby api
+date: 2014-11-17 00:00:00.000000000 Z
+dependencies:
+- !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
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+description: UPYUN Rest API and Form API SDK
 email:
-- kkxlkkxllb@gmail.com
+- delweng@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/upyun.rb
-- lib/upyun/bucket.rb
+- lib/upyun/form.rb
+- lib/upyun/rest.rb
+- lib/upyun/utils.rb
 - lib/upyun/version.rb
+- spec/spec_helper.rb
+- spec/upyun.jpg
+- spec/upyun_spec.rb
 - upyun.gemspec
-homepage: https://github.com/kkxlkkxllb/upyun
-licenses: []
+homepage: https://github.com/upyun/ruby-sdk
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
-summary: 又拍云存储ruby api
-test_files: []
-has_rdoc: 
+specification_version: 4
+summary: UPYUN API SDK
+test_files:
+- spec/spec_helper.rb
+- spec/upyun.jpg
+- spec/upyun_spec.rb

data/lib/upyun/bucket.rb

@@ -1,111 +0,0 @@
-require 'net/http'
-require 'uri'
-require "base64"
-require 'digest/md5'
-
-module Upyun
-  class Bucket
-    attr_accessor :bucketname, :username, :password
-    attr_accessor :api_domain, :api_form_secret
-
-    def initialize(bucketname, username, password, options = {})
-      options = { :api_domain => "v0.api.upyun.com", :api_form_secret => "" }.merge(options)
-      @bucketname = bucketname
-      @username = username
-			@bpwd = password
-      @password = Digest::MD5.hexdigest(password)
-      @api_domain = options[:api_domain]
-      @api_form_secret = options[:api_form_secret]
-    end
-
-    def write_file(filepath, fd, mkdir='true')
-      url = "http://#{api_domain}/#{bucketname}#{filepath}"
-      uri = URI.parse(URI.encode(url))
-
-      response = Net::HTTP.start(uri.host, uri.port) do |http|
-        date = get_gmt_date
-        length = File.size(fd)
-        method = 'PUT'
-        headers = {
-          'Date' => date,
-          'Content-Length' => length.to_s,
-          'Authorization' => sign(method, get_gmt_date, "/#{@bucketname}#{filepath}", length),
-          'mkdir' => mkdir
-        }
-
-        http.send_request(method, uri.request_uri, fd.read, headers)
-      end
-			response.body
-    end
-
-		def check_space
-			url = "http://#{api_domain}/#{bucketname}/?usage"
-			uri = URI.parse(URI.encode(url))
-			req = Net::HTTP::Get.new(url)
-	    req.basic_auth @username, @bpwd
-	    response = Net::HTTP.start(uri.host, uri.port) do |http|
-				http.request(req) 
-			end
-      response.body
-		end
-
-		def checkout(file)
-			url = "http://#{api_domain}/#{bucketname}/#{file}"
-			uri = URI.parse(URI.encode(url))
-			req = Net::HTTP::Get.new(url)
-	    req.basic_auth @username, @bpwd
-	    response = Net::HTTP.start(uri.host, uri.port) do |http|
-				http.request(req) 
-			end
-      response.body
-		end
-
-    # 生成api使用的policy 以及 signature  可以是图片或者是文件附件 图片最大为1M 文件附件最大为5M
-    def api_form_params(file_type = "pic", notify_url = "", return_url = "", expire_date = 1.days)
-      policy_doc = {
-        "bucket" => bucketname,
-        "expiration" => (DateTime.now + expire_date).to_i,
-        "save-key" => "/{year}/{mon}/{random}{.suffix}",
-        "notify-url" => notify_url,
-        "return-url" => return_url
-      }
-
-      policy_doc = policy_doc.merge({"allow-file-type" => "jpg,jpeg,gif,png", "content-length-range" => "0,1048576"}) if file_type == "pic"
-      policy_doc = policy_doc.merge({"allow-file-type" => "doc docx xls xlsx ppt txt zip rar", "content-length-range" => "0,5242880"}) if file_type == "file"
-
-      policy = Base64.encode64(policy_doc.to_json).gsub("\n", "").strip
-      signature = Digest::MD5.hexdigest(policy + "&" + api_form_secret)
-
-      {:policy => policy, :signature => signature}
-    end
-
-    def parse_notify_params(params)
-      params = params.with_indifferent_access
-      if params[:code].to_s == "200" && (params[:sign] == Digest::MD5.hexdigest("#{params[:code]}&#{params[:message]}&#{params[:url]}&#{params[:time]}&#{api_form_secret}"))
-        url = "http://#{bucketname}.b0.upaiyun.com#{params[:url]}"
-        mid = Digest::MD5.hexdigest(url)
-        image_attributes = { :mid => mid, :url => url }
-
-        if params["image-width"] && params["image-height"] && params["image-frames"] && params["image-type"]
-          image_attributes[:width] = params["image-width"].to_i
-          image_attributes[:height] = params["image-height"].to_i
-          image_attributes[:frames] = params["image-frames"].to_i
-          image_attributes[:file_type] = params["image-type"]
-        end
-        image_attributes
-      else
-        nil
-      end
-    end
-
-    private
-    def get_gmt_date
-      DateTime.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
-    end
-
-    def sign(method, date, url, length)
-      sign = "#{method}&#{url}&#{date}&#{length}&#{password}"
-      "UpYun #{@username}:#{Digest::MD5.hexdigest(sign)}"
-    end
-  end
-end