update version for refresh gems

去掉publish/unpublish接口的封装函数。

.travis.yml

@@ -3,10 +3,11 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - ruby-head
   - jruby-head
   - ree
+before_script:
+  - export QINIU_ACCESS_KEY=LGRqJsjX7LAvtdtX6hhyxs861lS57HwnOQmJsOuX
+  - export QINIU_SECRET_KEY=g_OxhuN5iJ1O7BoA6YdXyF6zSszk34UZFKDfdIIW

CHANGELOG.md

@@ -1,5 +1,65 @@
 ## CHANGE LOG
 
+### v3.4.9
+
+- 去掉publish和unpublish接口的封装函数。 [https://github.com/qiniu/ruby-sdk/pull/89](https://github.com/qiniu/ruby-sdk/pull/89) (#8143)
+
+### v3.4.8
+
+- 修复断点续上传功能中一直重试上传出错片的Bug。[https://github.com/qiniu/ruby-sdk/pull/87](https://github.com/qiniu/ruby-sdk/pull/87) (#7205)
+
+### v3.4.7
+
+- 停止追加新功能，仅进行Bug修正维护。  
+
+### v3.4.6
+
+- `Qiniu::RS.generate_download_token()` 方法的 `:pattern` 调整为必选项。
+
+### v3.4.5
+
+- `Qiniu::RS.generate_upload_token()` 方法新增 `:callback_body` 和 `return_url` 选项。
+- 选项含义参考: <http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-callback-body>
+
+### v3.4.2
+
+- `Qiniu::RS.generate_upload_token()` 方法新增 `:return_body` 选项。
+
+该选项（`:return_body`）可设置文件上传成功后，执行七牛云存储规定的回调API，并以 JSON 响应格式返回其执行结果。参考 [uploadToken 之 returnBody 说明](http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-return-body)。
+
+### v3.4.1
+
+增加为上传文件进行预转的选项，参见 [uploadToken 之 asyncOps 说明](http://docs.qiniu.com/api/v6/put.html#uploadToken-asyncOps)
+
+- `Qiniu::RS.generate_upload_token()` 方法新增 `:async_options` 选项用于进行预转操作。
+
+### v3.4.0
+
+增加文件复制/移动方法，包括批量复制/移动文件
+
+- `Qiniu::RS.copy(source_bucket, source_key, target_bucket, target_key)`
+- `Qiniu::RS.move(source_bucket, source_key, target_bucket, target_key)`
+- `Qiniu::RS.batch_copy [source_bucket, source_key, target_bucket, target_key], ...`
+- `Qiniu::RS.batch_move [source_bucket, source_key, target_bucket, target_key], ...`
+
+### v3.3.1
+
+确保单元测试里边用到的测试 Bucket 全局唯一
+
+使得10多种不通的 Ruby 宿主环境能隔离互不影响地执行单元/集成测试
+
+Ruby 宿主环境如下
+
+1.8.7, 1.9.2, 1.9.3, jruby-18mode, jruby-19mode, rbx-18mode, rbx-19mode, ruby-head, jruby-head, ree
+
+详见 <https://travis-ci.org/qiniu/ruby-sdk>
+
+### v3.3.0
+
+私有资源下载新版实现，添加 Qiniu::RS.generate_download_token() 方法。参考 [downloadToken](http://developer.qiniu.com/docs/v6/api/reference/security/download-token.html)
+
+详见 [Ruby SDK 使用文档之私有资源下载](http://developer.qiniu.com/docs/v6/api/overview/dn/security.html)
+
 ### v3.2.2
 
 fixed E701 error

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.2.2)
+    qiniu-rs (3.4.9)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)
@@ -12,19 +12,19 @@ GEM
   specs:
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    json (1.7.5)
-    mime-types (1.19)
-    rake (10.0.2)
+    json (1.8.1)
+    mime-types (1.23)
+    rake (10.0.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.2)
     ruby-hmac (0.4.0)
 
 PLATFORMS
@@ -34,4 +34,4 @@ DEPENDENCIES
   fakeweb (~> 1.3)
   qiniu-rs!
   rake (>= 0.9)
-  rspec (~> 2.11)
+  rspec (>= 2.11)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 why404
+Copyright (c) 2012-2013 qiniutek.com
 
 MIT License
 

README.md

@@ -1,8 +1,13 @@
-# Qiniu Resource (Cloud) Storage SDK for Ruby - [![Build Status](https://secure.travis-ci.org/why404/qiniu-rs-for-ruby.png?branch=master)](http://travis-ci.org/why404/qiniu-rs-for-ruby) [![Dependency Status](https://gemnasium.com/why404/qiniu-rs-for-ruby.png)](https://gemnasium.com/why404/qiniu-rs-for-ruby)
+# Qiniu Resource (Cloud) Storage SDK for Ruby
+
+# 版本说明
+
+此版本不再进行技术升级，仅做Bug修正维护。  
+请移步 [https://github.com/qiniu/ruby-sdk](https://github.com/qiniu/ruby-sdk) 查看最新版本。  
 
 # 关于
 
-此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v3/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
+此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://developer.qiniu.com/docs/v6/index.html) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
 
 ## 安装
 
@@ -20,7 +25,7 @@
 
 ## 使用
 
-参考文档：[七牛云存储 Ruby SDK 使用指南](http://docs.qiniutek.com/v3/sdk/ruby/)
+参考文档：[七牛云存储 Ruby SDK 使用指南](http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html)
 
 ## 贡献代码
 
@@ -32,7 +37,7 @@
 
 ## 许可证
 
-Copyright (c) 2012 qiniutek.com
+Copyright (c) 2012-2013 qiniutek.com
 
 基于 MIT 协议发布:
 

lib/qiniu/rs.rb

@@ -17,6 +17,7 @@ module Qiniu
     autoload :AccessToken, 'qiniu/tokens/access_token'
     autoload :QboxToken, 'qiniu/tokens/qbox_token'
     autoload :UploadToken, 'qiniu/tokens/upload_token'
+    autoload :DownloadToken, 'qiniu/tokens/download_token'
     autoload :Abstract, 'qiniu/rs/abstract'
 
     class << self
@@ -62,6 +63,7 @@ module Qiniu
         code == StatusOK
       end
 
+=begin
       def set_watermark(customer_id, options = {})
         code, data = EU.set_watermark(customer_id, options)
         code == StatusOK
@@ -71,6 +73,7 @@ module Qiniu
         code, data = EU.get_watermark(customer_id)
         code == StatusOK ? data : false
       end
+=end
 
       def put_auth(expires_in = nil, callback_url = nil)
         code, data = IO.put_auth(expires_in, callback_url)
@@ -100,12 +103,14 @@ module Qiniu
       end
 
       def upload_file opts = {}
-        [:uptoken, :file, :bucket, :key].each do |opt|
-          raise MissingArgsError, [opt] unless opts.has_key?(opt)
-        end
+        uncontained_opts = [:uptoken, :file, :bucket, :key] - opts.keys
+        raise MissingArgsError, uncontained_opts unless uncontained_opts.empty?
+
         source_file = opts[:file]
         raise NoSuchFileError, source_file unless File.exist?(source_file)
+
         opts[:enable_resumable_upload] = true unless opts.has_key?(:enable_resumable_upload)
+
         if opts[:enable_resumable_upload] && File::size(source_file) > Config.settings[:block_size]
           code, data = UP.upload_with_token(opts[:uptoken],
                                             opts[:file],
@@ -146,6 +151,16 @@ module Qiniu
         code == StatusOK ? data["url"] : false
       end
 
+      def copy(source_bucket, source_key, target_bucket, target_key)
+        code, data = RS.copy(source_bucket, source_key, target_bucket, target_key)
+        code == StatusOK
+      end
+
+      def move(source_bucket, source_key, target_bucket, target_key)
+        code, data = RS.move(source_bucket, source_key, target_bucket, target_key)
+        code == StatusOK
+      end
+
       def delete(bucket, key)
         code, data = RS.delete(bucket, key)
         code == StatusOK
@@ -166,6 +181,16 @@ module Qiniu
         code == StatusOK ? data : false
       end
 
+      def batch_copy(*args)
+        code, data = RS.batch_copy(*args)
+        code == StatusOK
+      end
+
+      def batch_move(*args)
+        code, data = RS.batch_move(*args)
+        code == StatusOK
+      end
+
       def batch_download(bucket, keys)
         code, data = RS.batch_get(bucket, keys)
         return false unless code == StatusOK
@@ -179,16 +204,6 @@ module Qiniu
         code == StatusOK ? data : false
       end
 
-      def publish(domain, bucket)
-        code, data = RS.publish(domain, bucket)
-        code == StatusOK
-      end
-
-      def unpublish(domain)
-        code, data = RS.unpublish(domain)
-        code == StatusOK
-      end
-
       def drop(bucket)
         code, data = RS.drop(bucket)
         code == StatusOK
@@ -227,6 +242,17 @@ module Qiniu
         #token_obj.callback_body_type = opts[:callback_body_type]
         #token_obj.customer = opts[:customer]
         #token_obj.escape = opts[:escape]
+        #token_obj.async_options = opts[:async_options]
+        #token_obj.return_body = opts[:return_body]
+        token_obj.generate_token
+      end
+
+      def generate_download_token(opts = {})
+        token_obj = DownloadToken.new(opts)
+        token_obj.access_key = Config.settings[:access_key]
+        token_obj.secret_key = Config.settings[:secret_key]
+        #token_obj.expires_in = opts[:expires_in]
+        #token_obj.pattern = opts[:pattern]
         token_obj.generate_token
       end
 

lib/qiniu/rs/auth.rb

@@ -8,78 +8,13 @@ module Qiniu
       class << self
         include Utils
 
-        def exchange_by_password!(username, password)
-          @username = username
-          @password = password
-          post_data = {
-            :client_id  => Config.settings[:client_id],
-            :grant_type => "password",
-            :username   => username,
-            :password   => password
-          }
-          code, data = http_request Config.settings[:auth_url], post_data
-          reset_token(data["access_token"], data["refresh_token"]) if Utils.is_response_ok?(code)
-          [code, data]
-        end
-
-        def exchange_by_refresh_token!(refresh_token)
-          post_data = {
-            :client_id     => Config.settings[:client_id],
-            :grant_type    => "refresh_token",
-            :refresh_token => refresh_token
-          }
-          code, data = http_request Config.settings[:auth_url], post_data
-          reset_token(data["access_token"], data["refresh_token"]) if Utils.is_response_ok?(code)
-          [code, data]
-        end
-
-        def reset_token(access_token, refresh_token)
-          @access_token  = access_token
-          @refresh_token = refresh_token
-        end
-
-        def call_with_logged_in(url, data, retry_times = 0)
-          raise MissingAccessToken if @access_token.nil?
-          code, data = http_request url, data, {:access_token => @access_token}
-          if code == 401
-            raise MissingRefreshToken if @refresh_token.nil?
-            code, data = exchange_by_refresh_token!(@refresh_token)
-            if code == 401
-              raise MissingUsernameOrPassword if (@username.nil? || @password.nil?)
-              code, data = exchange_by_password!(@username, @password)
-            end
-            if Utils.is_response_ok?(code)
-              retry_times += 1
-              if Config.settings[:auto_reconnect] && retry_times < Config.settings[:max_retry_times]
-                return call_with_logged_in(url, data, retry_times)
-              end
-            end
-          end
-          [code, data]
-        end
-
         def call_with_signature(url, data, retry_times = 0, options = {})
-          code, data = http_request url, data, options.merge({:qbox_signature_token => generate_qbox_signature(url, data)})
+          code, data = http_request url, data, options.merge({:qbox_signature_token => generate_qbox_signature(url, data, options[:mime])})
           [code, data]
         end
 
         def request(url, data = nil, options = {})
-          begin
-            if Config.settings[:access_key].empty? || Config.settings[:secret_key].empty?
-              code, data = Auth.call_with_logged_in(url, data)
-            else
               code, data = Auth.call_with_signature(url, data, 0, options)
-            end
-          rescue MissingAccessToken => e
-            Log.logger.error e
-            code, data = 401, {}
-          rescue MissingRefreshToken => e
-            Log.logger.error e
-            code, data = 401, {}
-          rescue MissingUsernameOrPassword => e
-            Log.logger.error e
-            code, data = 401, {}
-          end
           [code, data]
         end
 

lib/qiniu/rs/config.rb

@@ -20,9 +20,9 @@ module Qiniu
           :method          => :post,
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
-          :rs_host         => "http://rs.qbox.me",
+          :rs_host         => "http://rs.qiniu.com",
           :io_host         => "http://iovip.qbox.me",
-          :up_host         => "http://up.qbox.me",
+          :up_host         => "http://up.qiniu.com",
           :pub_host        => "http://pu.qbox.me:10200",
           :eu_host         => "http://eu.qbox.me",
           :client_id       => "a75604760c4da4caaa456c0c5895c061c3065c5a",

lib/qiniu/rs/rs.rb

@@ -26,20 +26,20 @@ module Qiniu
           Auth.request url
         end
 
+        def copy(source_bucket, source_key, target_bucket, target_key)
+          uri = _generate_cp_or_mv_opstr('copy', source_bucket, source_key, target_bucket, target_key)
+          Auth.request Config.settings[:rs_host] + uri
+        end
+
+        def move(source_bucket, source_key, target_bucket, target_key)
+          uri = _generate_cp_or_mv_opstr('move', source_bucket, source_key, target_bucket, target_key)
+          Auth.request Config.settings[:rs_host] + uri
+        end
+
         def delete(bucket, key)
           Auth.request Config.settings[:rs_host] + '/delete/' + encode_entry_uri(bucket, key)
         end
 
-        def publish(domain, bucket)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/publish/#{encoded_domain}/from/#{bucket}"
-        end
-
-        def unpublish(domain)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/unpublish/#{encoded_domain}"
-        end
-
         def drop(bucket)
           Auth.request Config.settings[:rs_host] + "/drop/#{bucket}"
         end
@@ -50,7 +50,7 @@ module Qiniu
             encoded_uri = encode_entry_uri(bucket, key)
             execs << "op=/#{command}/#{encoded_uri}"
           end
-          Auth.request Config.settings[:rs_host] + "/batch?" + execs.join("&")
+          Auth.request Config.settings[:rs_host] + "/batch", execs.join("&"), {:mime => "application/x-www-form-urlencoded" }
         end
 
         def batch_get(bucket, keys)
@@ -61,6 +61,14 @@ module Qiniu
           batch("stat", bucket, keys)
         end
 
+        def batch_copy(*args)
+          _batch_cp_or_mv('copy', args)
+        end
+
+        def batch_move(*args)
+          _batch_cp_or_mv('move', args)
+        end
+
         def batch_delete(bucket, keys)
           batch("delete", bucket, keys)
         end
@@ -77,6 +85,22 @@ module Qiniu
           save_as(bucket, key, source_image_url, mogrify_params_string)
         end
 
+        private
+
+        def _generate_cp_or_mv_opstr(command, source_bucket, source_key, target_bucket, target_key)
+          source_encoded_entry_uri = encode_entry_uri(source_bucket, source_key)
+          target_encoded_entry_uri = encode_entry_uri(target_bucket, target_key)
+          %Q(/#{command}/#{source_encoded_entry_uri}/#{target_encoded_entry_uri})
+        end
+
+        def _batch_cp_or_mv(command, *op_args)
+          execs = []
+          op_args.each do |e|
+            execs << 'op=' + _generate_cp_or_mv_opstr(command, e[0], e[1], e[2], e[3]) if e.size == 4
+          end
+          Auth.request Config.settings[:rs_host] + "/batch", execs.join("&"), {:mime => "application/x-www-form-urlencoded" }
+        end
+
       end
     end
   end

lib/qiniu/rs/up.rb

@@ -58,7 +58,7 @@ module Qiniu
       class TmpData
           def initialize(dir, filename)
               @tmpdir = Config.settings[:tmpdir] + File::SEPARATOR + dir
-              FileUtils.mkdir_p(@tmpdir) unless Dir.exists?(@tmpdir)
+              FileUtils.mkdir_p(@tmpdir) unless File.directory?(@tmpdir)
               @tmpfile = @tmpdir + File::SEPARATOR + filename
           end
 
@@ -83,7 +83,7 @@ module Qiniu
           end
 
           def sweep!
-              FileUtils.rm_r(@tmpdir) if  Dir.exists?(@tmpdir)
+              FileUtils.rm_r(@tmpdir) if File.directory?(@tmpdir)
           end
       end
 
@@ -100,7 +100,6 @@ module Qiniu
                               customer = nil,
                               callback_params = nil,
                               rotate = nil)
-          raise NoSuchFileError, local_file unless File.exist?(local_file)
           begin
             ifile = File.open(local_file, 'rb')
             fh = FileData.new(ifile)
@@ -110,11 +109,7 @@ module Qiniu
               mime = MIME::Types.type_for local_file
               mime_type = mime.empty? ? 'application/octet-stream' : mime[0].content_type
             end
-            if fsize > Config.settings[:block_size]
-              code, data = _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type, custom_meta, customer, callback_params, rotate)
-            else
-              code, data = IO.upload_with_token(uptoken, local_file, bucket, key, mime_type, custom_meta, callback_params, true, rotate)
-            end
+            code, data = _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type, custom_meta, customer, callback_params, rotate)
             [code, data]
           ensure
             ifile.close unless ifile.nil?
@@ -175,7 +170,7 @@ module Qiniu
             _call_binary_with_token(uptoken, url, body)
         end
 
-        def _resumable_put_block(uptoken, fh, block_index, block_size, chunk_size, progress, retry_times = 1, notifier)
+        def _resumable_put_block(uptoken, fh, block_index, block_size, chunk_size, progress, retry_times, notifier)
             code, data = 0, {}
             fpath = fh.path
             # this block has never been uploaded.
@@ -205,6 +200,8 @@ module Qiniu
                         break
                     elsif i == retry_times && data["crc32"] != body_crc32
                         Log.logger.error %Q(Uploading block error. Expected crc32: #{body_crc32}, but got: #{data["crc32"]})
+                        # 上传重试达到上限，直接返回错误
+                        return [code, data]
                     end
                 end
             elsif progress[:offset] + progress[:restsize] != block_size
@@ -235,6 +232,8 @@ module Qiniu
                         break
                     elsif i == retry_times && data["crc32"] != body_crc32
                         Log.logger.error %Q(Uploading block error. Expected crc32: #{body_crc32}, but got: #{data["crc32"]})
+                        # 上传重试达到上限，直接返回错误
+                        return [code, data]
                     end
                 end
             end
@@ -323,6 +322,7 @@ module Qiniu
         end
 
       end
+
     end
   end
 end

lib/qiniu/rs/utils.rb

@@ -127,7 +127,7 @@ module Qiniu
         File.open(filepath, "rb") { |f| Zlib.crc32 f.read }
       end
 
-      def generate_qbox_signature(url, params)
+      def generate_qbox_signature(url, params, mime = nil)
         access_key = Config.settings[:access_key]
         secret_key = Config.settings[:secret_key]
         uri = URI.parse(url)
@@ -139,6 +139,9 @@ module Qiniu
             params_string = generate_query_string(params)
             signature += params_string
         end
+        if mime.is_a?(String) && mime == "application/x-www-form-urlencoded" && params.is_a?(String)
+            signature += params
+        end
         hmac = HMAC::SHA1.new(secret_key)
         hmac.update(signature)
         encoded_digest = urlsafe_base64_encode(hmac.digest)

lib/qiniu/rs/version.rb

@@ -4,8 +4,8 @@ module Qiniu
   module RS
     module Version
       MAJOR = 3
-      MINOR = 2
-      PATCH = 2
+      MINOR = 4
+      PATCH = 10
       # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
       #
       # Example

lib/qiniu/tokens/download_token.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+require 'json'
+require 'qiniu/tokens/access_token'
+require 'qiniu/rs/utils'
+
+module Qiniu
+  module RS
+      class DownloadToken < AccessToken
+
+        include Utils
+
+        attr_accessor :pattern, :expires_in
+
+        def initialize(opts = {})
+          @pattern = opts[:pattern]
+          @expires_in = opts[:expires_in] || 3600
+        end
+
+        def generate_signature
+          params = {"S" => @pattern, "E" => Time.now.to_i + @expires_in}
+          Utils.urlsafe_base64_encode(params.to_json)
+        end
+
+        def generate_token
+          signature = generate_signature
+          encoded_digest = generate_encoded_digest(signature)
+          %Q(#{@access_key}:#{encoded_digest}:#{signature})
+        end
+
+      end
+  end
+end

lib/qiniu/tokens/qbox_token.rb

@@ -8,6 +8,8 @@ module Qiniu
   module RS
       class QboxToken < AccessToken
 
+        include Utils
+
         attr_accessor :url, :params
 
         def initialize(opts = {})
@@ -20,10 +22,10 @@ module Qiniu
           signature = uri.path
           query_string = uri.query
           signature += '?' + query_string if !query_string.nil? && !query_string.empty?
-          signature += "\n";
+          signature += "\n"
           if @params.is_a?(Hash)
-            total_param = @params.map { |key, value| %Q(#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s).gsub('+', '%20')}) }
-            signature += total_param.join("&")
+              params_string = Utils.generate_query_string(@params)
+              signature += params_string
           end
           signature
         end

lib/qiniu/tokens/upload_token.rb

@@ -10,24 +10,32 @@ module Qiniu
 
         include Utils
 
-        attr_accessor :scope, :expires_in, :callback_url, :callback_body_type, :customer, :escape
+        attr_accessor :scope, :expires_in, :callback_url, :callback_body, :callback_body_type, :customer, :escape, :async_options, :return_body, :return_url
 
         def initialize(opts = {})
           @scope = opts[:scope]
           @expires_in = opts[:expires_in] || 3600
           @callback_url = opts[:callback_url]
+          @callback_body = opts[:callback_body]
           @callback_body_type = opts[:callback_body_type]
           @customer = opts[:customer]
           @escape = opts[:escape]
+          @async_options = opts[:async_options]
+          @return_body = opts[:return_body]
+          @return_url = opts[:return_url]
         end
 
         def generate_signature
           params = {:scope => @scope, :deadline => Time.now.to_i + @expires_in}
           params[:callbackUrl] = @callback_url if !@callback_url.nil? && !@callback_url.empty?
+          params[:callbackBody] = @callback_body if !@callback_body.nil? && !@callback_body.empty?
           params[:callbackBodyType] = @callback_body_type if !@callback_body_type.nil? && !@callback_body_type.empty?
           params[:customer] = @customer if !@customer.nil? && !@customer.empty?
           params[:escape] = 1 if @escape == 1 || @escape == true
-          urlsafe_base64_encode(params.to_json)
+          params[:asyncOps] = @async_options if !@async_options.nil? && !@async_options.empty?
+          params[:returnBody] = @return_body if !@return_body.nil? && !@return_body.empty?
+          params[:returnUrl] = @return_url if !@return_url.nil? && !@return_url.empty?
+          Utils.urlsafe_base64_encode(params.to_json)
         end
 
         def generate_token

qiniu-rs.gemspec

@@ -4,10 +4,10 @@ require File.expand_path('../lib/qiniu/rs/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["why404"]
-  gem.email         = ["why404@gmail.com"]
-  gem.description   = %q{Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://docs.qiniutek.com/v3/sdk/ruby/}
-  gem.summary       = %q{Qiniu Resource (Cloud) Storage SDK for Ruby}
-  gem.homepage      = "https://github.com/qiniu/ruby-sdk"
+  gem.email         = ["sdk@qiniu.com"]
+  gem.description   = %q{Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby. Please use new SDK https://rubygems.org/gems/qiniu}
+  gem.summary       = %q{Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby}
+  gem.homepage      = "https://github.com/qiniu/ruby-sdk/tree/qiniu-rs"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   # specify any dependencies here; for example:
   gem.add_development_dependency "rake", ">= 0.9"
-  gem.add_development_dependency "rspec", "~> 2.11"
+  gem.add_development_dependency "rspec", ">= 2.11"
   gem.add_development_dependency "fakeweb", "~> 1.3"
   gem.add_runtime_dependency "json", "~> 1.7"
   gem.add_runtime_dependency "rest-client", "~> 1.6"

spec/qiniu/rs/auth_spec.rb

@@ -1,58 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-require 'spec_helper'
-require 'qiniu/rs/auth'
-
-module Qiniu
-  module RS
-    describe Auth do
-
-      before :all do
-        @username = "qboxtest"
-        @password = "qboxtest123"
-
-        code, data = Qiniu::RS::Auth.exchange_by_password!(@username, @password)
-        code.should == 200
-        data.should be_an_instance_of(Hash)
-        data["access_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-
-        @access_token = data["access_token"]
-        @refresh_token = data["refresh_token"]
-        puts data.inspect
-      end
-
-      context ".exchange_by_password" do
-        it "should sign in failed when pass a non-existent username" do
-          code, data = Qiniu::RS::Auth.exchange_by_password!("a_non_existent_user@example.com", "password")
-          code.should == 401
-          data["error_code"].should == 11
-          data["error"].should == "failed_authentication"
-          puts data.inspect
-        end
-
-        it "should sign in failed when pass a wrong password" do
-          code, data = Qiniu::RS::Auth.exchange_by_password!(@username, "a-wrong-password")
-          code.should == 401
-          data["error_code"].should == 11
-          data["error"].should == "failed_authentication"
-          puts data.inspect
-        end
-      end
-
-      context ".exchange_by_refresh_token" do
-        it "should works" do
-          @refresh_token.should_not be_empty
-          code, data = Qiniu::RS::Auth.exchange_by_refresh_token!(@refresh_token)
-          code.should == 200
-          data["access_token"].should_not be_empty
-          data["refresh_token"].should_not be_empty
-          data["expires_in"].should_not be_zero
-          puts data.inspect
-        end
-      end
-
-    end
-  end
-end

spec/qiniu/rs/eu_spec.rb

@@ -10,8 +10,8 @@ module Qiniu
     describe EU do
 
       before :all do
-        @customer_id = "awhy.xu@gmail.com"
-        @bucket = "wm_test_bucket"
+        @customer_id = "why404@gmail.com"
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
         @key = "image_logo_for_test.png"
 
         result = Qiniu::RS.mkbucket(@bucket)
@@ -35,12 +35,12 @@ module Qiniu
       end
 
       after :all do
-        @bucket = "wm_test_bucket"
         result = Qiniu::RS.drop(@bucket)
         puts result.inspect
         result.should_not be_false
       end
 
+=begin
       context ".set_watermark" do
         it "should works" do
           options = {
@@ -59,6 +59,7 @@ module Qiniu
           puts data.inspect
         end
       end
+=end
 
     end
   end

spec/qiniu/rs/image_spec.rb

@@ -11,7 +11,7 @@ module Qiniu
 
       before :all do
 
-        @bucket = "test_images_12345"
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
         @key = "image_logo_for_test.png"
 
         result = Qiniu::RS.mkbucket(@bucket)
@@ -20,11 +20,22 @@ module Qiniu
 
         local_file = File.expand_path('../' + @key, __FILE__)
 
-        upopts = {:scope => @bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com"}
+        upopts = {
+            :scope => @bucket,
+            :expires_in => 3600,
+            :customer => "why404@gmail.com",
+            :async_options => "imageView/1/w/120/h/120",
+            :return_body => '{"size":$(fsize), "hash":$(etag), "width":$(imageInfo.width), "height":$(imageInfo.height)}'
+        }
         uptoken = Qiniu::RS.generate_upload_token(upopts)
         data = Qiniu::RS.upload_file :uptoken => uptoken, :file => local_file, :bucket => @bucket, :key => @key
         puts data.inspect
 
+        data["size"].should_not be_zero
+        data["hash"].should_not be_empty
+        data["width"].should_not be_zero
+        data["height"].should_not be_zero
+
         result = Qiniu::RS.get(@bucket, @key)
         result["url"].should_not be_empty
         puts result.inspect
@@ -42,7 +53,6 @@ module Qiniu
       end
 
       after :all do
-        @bucket = "test_images_12345"
         result = Qiniu::RS.drop(@bucket)
         puts result.inspect
         result.should_not be_false

spec/qiniu/rs/io_spec.rb

@@ -1,4 +1,4 @@
-# Utils.-*- encoding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 
 require 'spec_helper'
 require 'qiniu/rs/auth'
@@ -10,8 +10,8 @@ module Qiniu
     describe IO do
 
       before :all do
-        @bucket = "io_test_bucket"
-        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
 
         result = Qiniu::RS.mkbucket(@bucket)
         puts result.inspect
@@ -19,7 +19,6 @@ module Qiniu
       end
 
       after :all do
-        @bucket = "io_test_bucket"
         result = Qiniu::RS.drop(@bucket)
         puts result.inspect
         result.should_not be_false
@@ -48,7 +47,7 @@ module Qiniu
 
       context ".upload_with_token" do
         it "should works" do
-          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com"}
+          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu::RS.generate_upload_token(upopts)
           code, data = Qiniu::RS::IO.upload_with_token(uptoken, __FILE__, @bucket, @key, nil, nil, nil, true)
           code.should == 200

spec/qiniu/rs/pub_spec.rb

@@ -10,14 +10,13 @@ module Qiniu
     describe Pub do
 
       before :all do
-        @bucket = "pub_test_bucket"
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
         result = Qiniu::RS.mkbucket(@bucket)
         puts result.inspect
         result.should_not be_false
       end
 
       after :all do
-        @bucket = "pub_test_bucket"
         result = Qiniu::RS.drop(@bucket)
         puts result.inspect
         result.should_not be_false

spec/qiniu/rs/rs_spec.rb

@@ -11,9 +11,10 @@ module Qiniu
     describe RS do
 
       before :all do
-        @bucket = "rs_test_bucket"
-        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
-        @domain = 'rs-test-bucket.dn.qbox.me'
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
+        @key2 = @key + rand(100).to_s
+        #@domain = @bucket + '.dn.qbox.me'
 
         code, data = Qiniu::RS::RS.mkbucket(@bucket)
         puts [code, data].inspect
@@ -21,7 +22,6 @@ module Qiniu
       end
 
       after :all do
-        @bucket = "rs_test_bucket"
         code, data = Qiniu::RS::RS.drop(@bucket)
         puts [code, data].inspect
         code.should == 200
@@ -90,19 +90,64 @@ module Qiniu
         end
       end
 
-      context ".publish" do
+      context ".batch_copy" do
         it "should works" do
-          code, data = Qiniu::RS::RS.publish(@domain, @bucket)
+          code, data = Qiniu::RS::RS.batch_copy @bucket, @key, @bucket, @key2
           code.should == 200
           puts data.inspect
+
+          #code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          #code2.should == 200
+          #puts data2.inspect
+          #
+          code, data = Qiniu::RS::RS.delete(@bucket, @key2)
+          code.should == 200
+          puts data.inspect
+
         end
       end
 
-      context ".unpublish" do
+      context ".batch_move" do
         it "should works" do
-          code, data = Qiniu::RS::RS.unpublish(@domain)
+          code, data = Qiniu::RS::RS.batch_move @bucket, @key, @bucket, @key2
           code.should == 200
           puts data.inspect
+
+          #code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          #code2.should == 200
+          #puts data2.inspect
+
+          code3, data3 = Qiniu::RS::RS.batch_move @bucket, @key2, @bucket, @key
+          code3.should == 200
+          puts data3.inspect
+        end
+      end
+
+      context ".move" do
+        it "should works" do
+          code, data = Qiniu::RS::RS.move(@bucket, @key, @bucket, @key2)
+          code.should == 200
+          puts data.inspect
+
+          code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          code2.should == 200
+          puts data2.inspect
+
+          code3, data3 = Qiniu::RS::RS.move(@bucket, @key2, @bucket, @key)
+          code3.should == 200
+          puts data3.inspect
+        end
+      end
+
+      context ".copy" do
+        it "should works" do
+          code, data = Qiniu::RS::RS.copy(@bucket, @key, @bucket, @key2)
+          code.should == 200
+          puts data.inspect
+
+          #code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          #code2.should == 200
+          #puts data2.inspect
         end
       end
 

spec/qiniu/rs/up_spec.rb

@@ -1,4 +1,4 @@
-# Utils.-*- encoding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 
 require 'digest/sha1'
 require 'spec_helper'
@@ -11,8 +11,8 @@ module Qiniu
 
       before :all do
         @localfile = "bigfile.txt"
-        File.open(@localfile, "w"){|f| 5242888.times{f.write(Random.rand(9).to_s)}}
-        @bucket = "up_test_bucket"
+        File.open(@localfile, "w"){|f| 5242888.times{f.write(rand(9).to_s)}}
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
         @key = Digest::SHA1.hexdigest(@localfile+Time.now.to_s)
 
         code, data = Qiniu::RS::RS.mkbucket(@bucket)
@@ -30,7 +30,7 @@ module Qiniu
 
       context ".upload_with_token" do
         it "should works" do
-          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com"}
+          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu::RS.generate_upload_token(upopts)
           code, data = Qiniu::RS::UP.upload_with_token(uptoken, @localfile, @bucket, @key)
           puts data.inspect

spec/qiniu/rs_spec.rb

@@ -3,19 +3,21 @@
 require 'digest/sha1'
 require 'spec_helper'
 require 'qiniu/rs'
+require 'qiniu/rs/exceptions'
 
 module Qiniu
   describe RS do
 
     before :all do
-      @bucket = 'qiniu_rs_test'
+      @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
       @key = Digest::SHA1.hexdigest Time.now.to_s
-      @domain = 'qiniu-rs-test.dn.qbox.me'
+      @key2 = @key + rand(100).to_s
+      #@domain = @bucket + '.dn.qbox.me'
 
       result = Qiniu::RS.mkbucket(@bucket)
       result.should_not be_false
 
-      @test_image_bucket = 'test_images_12345'
+      @test_image_bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
       result2 = Qiniu::RS.mkbucket(@test_image_bucket)
       puts result2.inspect
       result2.should be_true
@@ -23,16 +25,16 @@ module Qiniu
       @test_image_key = 'image_logo_for_test.png'
       local_file = File.expand_path('./rs/' + @test_image_key, File.dirname(__FILE__))
       puts local_file.inspect
-      upopts = {:scope => @test_image_bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com"}
+      upopts = {:scope => @test_image_bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
       uptoken = Qiniu::RS.generate_upload_token(upopts)
       data = Qiniu::RS.upload_file :uptoken => uptoken, :file => local_file, :bucket => @test_image_bucket, :key => @test_image_key
       puts data.inspect
     end
 
     after :all do
-      result = Qiniu::RS.drop(@bucket)
-      puts result.inspect
-      result.should_not be_false
+      result1 = Qiniu::RS.drop(@bucket)
+      puts result1.inspect
+      result1.should_not be_false
 
       result2 = Qiniu::RS.drop(@test_image_bucket)
       puts result2.inspect
@@ -79,6 +81,7 @@ module Qiniu
       end
     end
 
+=begin
     context ".set_watermark" do
       it "should works" do
         options = {
@@ -97,6 +100,7 @@ module Qiniu
         puts result.inspect
       end
     end
+=end
 
     context ".put_auth" do
       it "should works" do
@@ -148,16 +152,39 @@ module Qiniu
         result.should_not be_false
         puts result.inspect
       end
+
+      it "should raise MissingArgsError" do
+        uptoken_opts = {:scope => @bucket, :escape => 0}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => __FILE__,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        lambda { Qiniu::RS.upload_file(upload_opts) }.should raise_error(RS::MissingArgsError)
+      end
+
+      it "should raise NoSuchFileError" do
+        uptoken_opts = {:scope => @bucket, :escape => 0}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => 'no_this_file',
+          :bucket => @bucket,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        lambda { Qiniu::RS.upload_file(upload_opts) }.should raise_error(RS::NoSuchFileError)
+      end
     end
 
     context ".resumable_upload_file" do
       it "should works" do
         # generate bigfile for testing
         localfile = "test_bigfile"
-        File.open(localfile, "w"){|f| 5242888.times{f.write(Random.rand(9).to_s)}}
+        File.open(localfile, "w"){|f| 5242888.times{f.write(rand(9).to_s)}}
         key = Digest::SHA1.hexdigest(localfile+Time.now.to_s)
         # generate the upload token
-        uptoken_opts = {:scope => @bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com", :escape => 0}
+        uptoken_opts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com", :escape => 0}
         uptoken = Qiniu::RS.generate_upload_token(uptoken_opts)
         # uploading
         upload_opts = {
@@ -248,17 +275,52 @@ module Qiniu
       end
     end
 
-    context ".publish" do
+    context ".batch_copy" do
       it "should works" do
-        result = Qiniu::RS.publish(@domain, @bucket)
+        result = Qiniu::RS.batch_copy @bucket, @key, @bucket, @key2
+        result.should_not be_false
+
+        #result2 = Qiniu::RS.stat(@bucket, @key2)
+        #result2.should_not be_false
+
+        result = Qiniu::RS.delete @bucket, @key2
         result.should_not be_false
       end
     end
 
-    context ".unpublish" do
+    context ".batch_move" do
       it "should works" do
-        result = Qiniu::RS.unpublish(@domain)
+        result = Qiniu::RS.batch_move @bucket, @key, @bucket, @key2
         result.should_not be_false
+
+        #result2 = Qiniu::RS.stat(@bucket, @key2)
+        #result2.should_not be_false
+
+        result3 = Qiniu::RS.batch_move @bucket, @key2, @bucket, @key
+        result3.should_not be_false
+      end
+    end
+
+    context ".move" do
+      it "should works" do
+        result = Qiniu::RS.move(@bucket, @key, @bucket, @key2)
+        result.should_not be_false
+
+        result2 = Qiniu::RS.stat(@bucket, @key2)
+        result2.should_not be_false
+
+        result3 = Qiniu::RS.move(@bucket, @key2, @bucket, @key)
+        result3.should_not be_false
+      end
+    end
+
+    context ".copy" do
+      it "should works" do
+        result = Qiniu::RS.copy(@bucket, @key, @bucket, @key2)
+        result.should_not be_false
+
+        #result2 = Qiniu::RS.stat(@bucket, @key2)
+        #result2.should_not be_false
       end
     end
 
@@ -307,10 +369,6 @@ module Qiniu
         data.should_not be_empty
         puts data.inspect
 
-        dest_bucket = "test_thumbnails_bucket"
-        result = Qiniu::RS.mkbucket(dest_bucket)
-        result.should_not be_false
-
         dest_key = "cropped-" + @test_image_key
         src_img_url = data["url"]
         mogrify_options = {
@@ -322,7 +380,7 @@ module Qiniu
           :format => "jpg",
           :auto_orient => true
         }
-        result2 = Qiniu::RS.image_mogrify_save_as(dest_bucket, dest_key, src_img_url, mogrify_options)
+        result2 = Qiniu::RS.image_mogrify_save_as(@test_image_bucket, dest_key, src_img_url, mogrify_options)
         result2.should_not be_false
         result2.should_not be_empty
         puts result2.inspect
@@ -331,9 +389,19 @@ module Qiniu
 
     context ".generate_upload_token" do
       it "should works" do
-        data = Qiniu::RS.generate_upload_token({:scope => 'test_bucket', :expires_in => 3600, :escape => 0})
+        data = Qiniu::RS.generate_upload_token({:scope => @bucket, :expires_in => 3600, :escape => 0})
         data.should_not be_empty
         puts data.inspect
+        data.split(":").length.should == 3
+      end
+    end
+
+    context ".generate_download_token" do
+      it "should works" do
+        data = Qiniu::RS.generate_download_token({:expires_in => 1, :pattern => 'http://*.dn.qbox.me/*'})
+        data.should_not be_empty
+        puts data.inspect
+        data.split(":").length.should == 3
       end
     end
 

spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'rspec'
 
 RSpec.configure do |config|
   config.before :all do
-    Qiniu::RS.establish_connection! :access_key => "iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV",
-                                    :secret_key => "6QTOr2Jg1gcZEWDQXKOGZh5PziC2MCV5KsntT70j"
+    Qiniu::RS.establish_connection! :access_key => ENV["QINIU_ACCESS_KEY"], :secret_key => ENV["QINIU_SECRET_KEY"]
   end
 end