Merge pull request #103 from longbai/update_dependency

update test

.travis.yml

@@ -5,5 +5,5 @@ rvm:
   - 2.1.1
   - jruby-19mode
 before_script:
-  - export QINIU_ACCESS_KEY=LGRqJsjX7LAvtdtX6hhyxs861lS57HwnOQmJsOuX
-  - export QINIU_SECRET_KEY=g_OxhuN5iJ1O7BoA6YdXyF6zSszk34UZFKDfdIIW
+  - export QINIU_ACCESS_KEY=QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm
+  - export QINIU_SECRET_KEY=Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## CHANGE LOG
 
+### v6.3.1
+
+- 为过期方法添加说明。 [https://github.com/qiniu/ruby-sdk/pull/98](https://github.com/qiniu/ruby-sdk/pull/98)
+- 修改上传域名。 [https://github.com/qiniu/ruby-sdk/pull/99](https://github.com/qiniu/ruby-sdk/pull/99)
+- 增加pfop参数。 [https://github.com/qiniu/ruby-sdk/pull/100](https://github.com/qiniu/ruby-sdk/pull/100)
+
+### v6.3.0
+
+- 添加 authorize_download_url_2 方法，对包含中文或其它 utf-8 字符的 Key 做下载授权。 [https://github.com/qiniu/ruby-sdk/pull/95](https://github.com/qiniu/ruby-sdk/pull/95)
+
 ### v6.2.4
 
 - 调整User Agent。 [https://github.com/qiniu/ruby-sdk/pull/94](https://github.com/qiniu/ruby-sdk/pull/94)

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu (6.2.4)
+    qiniu (6.3.1)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)

README.md

@@ -2,7 +2,7 @@
 
 ## 关于
 
-此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, 2.0.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://developer.qiniu.com/docs/v6/index.html) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
+此 Ruby SDK 适用于 Ruby 1.9.x, 2.0.x, 2.1.x, jruby版本，基于 [七牛云存储官方API](http://developer.qiniu.com/docs/v6/index.html) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
 
 ## 状态
 
@@ -15,7 +15,7 @@
 
 在您 Ruby 应用程序的 `Gemfile` 文件中，添加如下一行代码：
 
-    gem 'qiniu', '~> 6.1.0'
+    gem 'qiniu', '~> 6.3.1'
 
 然后，在应用程序所在的目录下，可以运行 `bundle` 安装依赖包：
 

lib/qiniu/auth.rb

@@ -3,6 +3,7 @@
 
 require 'hmac-sha1'
 require 'uri'
+require 'cgi'
 
 require 'qiniu/exceptions'
 
@@ -175,6 +176,21 @@ module Qiniu
           return "#{download_url}&token=#{dntoken}"
         end # authorize_download_url
 
+        ### 对包含中文或其它 utf-8 字符的 Key 做下载授权
+        def authorize_download_url_2(domain, key, args = EMPTY_ARGS)
+          url_encoded_key = CGI::escape(key)
+
+          schema = args[:schema] || "http"
+          port   = args[:port]
+
+          if port.nil? then
+            download_url = "#{schema}://#{domain}/#{url_encoded_key}"
+          else
+            download_url = "#{schema}://#{domain}:#{port}/#{url_encoded_key}"
+          end
+          return authorize_download_url(download_url, args)
+        end # authorize_download_url_2
+
         def generate_acctoken(url, body = '')
           ### 提取AK/SK信息
           access_key = Config.settings[:access_key]

lib/qiniu/config.rb

@@ -20,7 +20,7 @@ module Qiniu
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
           :rs_host         => "http://rs.qiniu.com",
-          :up_host         => "http://up.qiniu.com",
+          :up_host         => "http://upload.qiniu.com",
           :pub_host        => "http://pu.qbox.me:10200",
           :eu_host         => "http://eu.qbox.me",
           :access_key      => "",

lib/qiniu/management.rb

@@ -14,22 +14,6 @@ module Qiniu
           return HTTP.management_post(url)
         end # buckets
 
-        PRIVATE_BUCKET = 0
-        PUBLIC_BUCKET  = 1
-
-        def mkbucket(bucket_name, is_public = PUBLIC_BUCKET)
-          url = Config.settings[:rs_host] + '/mkbucket2/' + bucket_name + '/public/' + is_public.to_s
-          return HTTP.management_post(url)
-        end # mkbucket
-
-        def make_a_private_bucket(bucket_name)
-          return mkbucket(bucket_name, PRIVATE_BUCKET)
-        end # make_a_private_bucket
-
-        def make_a_public_bucket(bucket_name)
-          return mkbucket(bucket_name, PUBLIC_BUCKET)
-        end # make_a_public_bucket
-
         def stat(bucket, key)
           url = Config.settings[:rs_host] + '/stat/' + encode_entry_uri(bucket, key)
           return HTTP.management_post(url)
@@ -60,11 +44,6 @@ module Qiniu
           return HTTP.management_post(url)
         end # delete
 
-        def drop(bucket)
-          url = Config.settings[:rs_host] + "/drop/#{bucket}"
-          return HTTP.management_post(url)
-        end # drop
-
         def batch(command, bucket, keys)
           execs = []
           keys.each do |key|
@@ -117,9 +96,9 @@ module Qiniu
 
         def _batch_cp_or_mv(command, *op_args)
           execs = []
-          op_args.each do |e| 
+          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 
+          end
           url = Config.settings[:rs_host] + "/batch"
           return HTTP.management_post(url, execs.join("&"))
         end # _batch_cp_or_mv

lib/qiniu/tokens/access_token.rb

@@ -4,6 +4,8 @@ require 'hmac-sha1'
 require 'qiniu/config'
 require 'qiniu/utils'
 
+### AccessToken 类已经过时，请改用 Qiniu::Auth.generate_acctoken 方法 ###
+
 module Qiniu
       class AccessToken
 

lib/qiniu/tokens/download_token.rb

@@ -4,6 +4,9 @@ require 'json'
 require 'qiniu/tokens/access_token'
 require 'qiniu/utils'
 
+### DownloadToken 类已经过时，请改用 Qiniu::Auth.authorize_download_url 方法 ###
+### 或 Qiniu::Auth.authorize_download_url_2 方法                             ###
+
 module Qiniu
       class DownloadToken < AccessToken
 

lib/qiniu/tokens/upload_token.rb

@@ -4,6 +4,8 @@ require 'json'
 require 'qiniu/tokens/access_token'
 require 'qiniu/utils'
 
+### UploadToken 类已经过时，请改用 Qiniu::Auth.generate_uptoken 方法 ###
+
 module Qiniu
       class UploadToken < AccessToken
 
@@ -19,7 +21,9 @@ module Qiniu
           @callback_body_type = opts[:callback_body_type]
           @customer = opts[:customer]
           @escape = opts[:escape]
-          @async_options = opts[:async_options]
+          @persistent_ops = opts[:persistent_ops]
+          @persistent_notify_url = opts[:persistent_notify_url]
+          @persistent_pipeline = opts[:persistent_pipeline]
           @return_body = opts[:return_body]
           @return_url = opts[:return_url]
         end
@@ -31,9 +35,13 @@ module Qiniu
           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
-          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?
+
+          params[:persistentOps] = @persistent_ops if !@persistent_ops.nil? && !@persistent_ops.empty?
+          params[:persistentNotifyUrl] = @persistent_notify_url if !@persistent_notify_url.nil? && !@persistent_notify_url.empty?
+          params[:persistentPipeline] = @persistent_pipeline if !@persistent_pipeline.nil? && !@persistent_pipeline.empty?
+
           Utils.urlsafe_base64_encode(params.to_json)
         end
 

lib/qiniu/version.rb

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

spec/qiniu/auth_spec.rb

@@ -7,20 +7,13 @@ require 'qiniu/storage'
 require 'digest/sha1'
 
 module Qiniu
-  module Auth 
+  module Auth
     describe Auth do
 
       before :all do
-        @bucket = 'RubySDK-Test-Private'
-        @bucket = make_unique_bucket(@bucket)
-
-        ### 尝试创建Bucket
-        result = Qiniu::Storage.make_a_private_bucket(@bucket)
-        puts result.inspect
+        @bucket = 'rubysdk'
       end
-
       after :all do
-        ### 不删除Bucket以备下次使用
       end
 
       ### 测试私有资源下载

spec/qiniu/image_spec.rb

@@ -10,15 +10,7 @@ module Qiniu
     describe Fop do
 
       before :all do
-
-        ### 复用RubySDK-Test-Storage空间
-        @bucket = 'RubySDK-Test-Storage'
-        @bucket = make_unique_bucket(@bucket)
-
-        ### 尝试创建空间
-        result = Qiniu.mkbucket(@bucket)
-        puts result.inspect
-
+        @bucket = 'rubysdk'
         pic_fname = "image_logo_for_test.png"
         @key = make_unique_key_in_bucket(pic_fname)
 
@@ -57,7 +49,6 @@ module Qiniu
       end
 
       after :all do
-        ### 不删除Bucket以备下次使用
       end
 
       context ".info" do

spec/qiniu/management_spec.rb

@@ -12,12 +12,7 @@ module Qiniu
     describe Storage do
 
       before :all do
-        @bucket = 'RubySDK-Test-Management'
-        @bucket = make_unique_bucket(@bucket)
-
-        ### 尝试创建Bucket
-        result = Qiniu.mkbucket(@bucket)
-        puts result.inspect
+        @bucket = 'rubysdk'
 
         @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
         @key = make_unique_key_in_bucket(@key)
@@ -26,7 +21,6 @@ module Qiniu
       end
 
       after :all do
-        ### 不删除Bucket以备下次使用
       end
 
       ### 准备数据

spec/qiniu/misc_spec.rb

@@ -10,16 +10,10 @@ module Qiniu
     describe Misc do
 
       before :all do
-        ### 复用RubySDK-Test-Management空间
-        @bucket = 'RubySDK-Test-Management'
-        @bucket = make_unique_bucket(@bucket)
-
-        result = Qiniu.mkbucket(@bucket)
-        puts result.inspect
+        @bucket = 'rubysdk'
       end
 
       after :all do
-        ### 不删除Bucket以备下次使用
       end
 
       context ".set_protected" do

spec/qiniu/pfop_spec.rb

@@ -12,15 +12,7 @@ module Qiniu
       describe Persistance do
 
         before :all do
-          ### 复用RubySDK-Test-Storage空间
-          @bucket = 'RubySDK-Test-Storage'
-          @bucket = make_unique_bucket(@bucket)
-
-          ### 尝试创建空间
-          code, data, headers = Qiniu::Storage.make_a_public_bucket(@bucket)
-          puts code.inspect
-          puts data.inspect
-          puts headers.inspect
+          @bucket = 'rubysdk'
 
           pic_fname = "image_logo_for_test.png"
           @key = make_unique_key_in_bucket(pic_fname)
@@ -44,7 +36,6 @@ module Qiniu
         end
 
         after :all do
-          ### 不删除Bucket以备下次使用
         end
 
         context ".pfop" do

spec/qiniu/qiniu_spec.rb

@@ -9,15 +9,10 @@ module Qiniu
   describe Qiniu do
 
     before :all do
-      @bucket = 'RubySDK-Test'
-      @bucket = make_unique_bucket(@bucket)
+      @bucket = 'rubysdk'
 
       @test_image_bucket = @bucket
 
-      ### 尝试创建Bucket
-      result = Qiniu.mkbucket(@bucket)
-      puts result.inspect
-
       @key = Digest::SHA1.hexdigest Time.now.to_s
       @key = make_unique_key_in_bucket(@key)
 
@@ -34,7 +29,6 @@ module Qiniu
     end
 
     after :all do
-      ### 不删除Bucket以备下次使用
     end
 
     context ".buckets" do

spec/qiniu/upload_spec.rb

@@ -11,12 +11,7 @@ module Qiniu
     describe Storage do
 
       before :all do
-        @bucket = 'RubySDK-Test-Storage'
-        @bucket = make_unique_bucket(@bucket)
-
-        ### 尝试创建Bucket
-        result = Qiniu.mkbucket(@bucket)
-        puts result.inspect
+        @bucket = 'rubysdk'
 
         @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
         @key = make_unique_key_in_bucket(@key)
@@ -53,8 +48,6 @@ module Qiniu
         File.unlink(@localfile_4m) if File.exists?(@localfile_4m)
         File.unlink(@localfile_8m) if File.exists?(@localfile_8m)
         File.unlink(@localfile_1m) if File.exists?(@localfile_1m)
-
-        ### 不删除Bucket以备下次使用
       end
 
       ### 测试单文件直传

spec/qiniu/utils_spec.rb

@@ -26,8 +26,8 @@ module Qiniu
       context ".send_request_with" do
         it "should works" do
           FakeWeb.allow_net_connect = false
-          FakeWeb.register_uri(:get, "http://docs.qiniutek.com/", :body => {:abc => 123}.to_json)
-          res = Utils.send_request_with 'http://docs.qiniutek.com/', nil, :method => :get
+          FakeWeb.register_uri(:get, "http://develoepr.qiniu.com/", :body => {:abc => 123}.to_json)
+          res = Utils.send_request_with 'http://develoepr.qiniu.com/', nil, :method => :get
           res.should == [200, {"abc" => 123}, {}]
         end
 
@@ -35,9 +35,9 @@ module Qiniu
           context "upstream return http #{code}" do
             it "should raise RestClient::RequestFailed" do
               FakeWeb.allow_net_connect = false
-              FakeWeb.register_uri(:get, "http://docs.qiniutek.com/", :status => code)
+              FakeWeb.register_uri(:get, "http://develoepr.qiniu.com/", :status => code)
               lambda {
-                res = Utils.send_request_with 'http://docs.qiniutek.com/', nil, :method => :get
+                res = Utils.send_request_with 'http://develoepr.qiniu.com/', nil, :method => :get
               }.should raise_error RestClient::RequestFailed
             end
           end