update version for refresh gems

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

.travis.yml

@@ -3,10 +3,9 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
   - jruby-head
   - ree
 before_script:

CHANGELOG.md

@@ -1,5 +1,17 @@
 ## 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` 调整为必选项。
@@ -7,13 +19,13 @@
 ### v3.4.5
 
 - `Qiniu::RS.generate_upload_token()` 方法新增 `:callback_body` 和 `return_url` 选项。
-- 选项含义参考: <http://docs.qiniu.com/api/v6/put.html#uploadToken-args>
+- 选项含义参考: <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://docs.qiniu.com/api/v6/put.html#uploadToken-returnBody)。
+该选项（`: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
 
@@ -44,9 +56,9 @@ Ruby 宿主环境如下
 
 ### v3.3.0
 
-私有资源下载新版实现，添加 Qiniu::RS.generate_download_token() 方法。参考 [downloadToken](http://docs.qiniutek.com/v3/api/io/#get)
+私有资源下载新版实现，添加 Qiniu::RS.generate_download_token() 方法。参考 [downloadToken](http://developer.qiniu.com/docs/v6/api/reference/security/download-token.html)
 
-详见 [Ruby SDK 使用文档之私有资源下载](http://docs.qiniutek.com/v3/sdk/ruby/#download-private-files)
+详见 [Ruby SDK 使用文档之私有资源下载](http://developer.qiniu.com/docs/v6/api/overview/dn/security.html)
 
 ### v3.2.2
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.4.6)
+    qiniu-rs (3.4.9)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)
@@ -12,7 +12,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    json (1.7.7)
+    json (1.8.1)
     mime-types (1.23)
     rake (10.0.3)
     rest-client (1.6.7)

README.md

@@ -1,8 +1,13 @@
 # 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)
 
 ## 贡献代码
 

lib/qiniu/rs.rb

@@ -182,12 +182,12 @@ module Qiniu
       end
 
       def batch_copy(*args)
-        code, data = RS.batch_copy(args)
+        code, data = RS.batch_copy(*args)
         code == StatusOK
       end
 
       def batch_move(*args)
-        code, data = RS.batch_move(args)
+        code, data = RS.batch_move(*args)
         code == StatusOK
       end
 
@@ -204,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

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

@@ -40,16 +40,6 @@ module Qiniu
           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
@@ -60,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)
@@ -108,7 +98,7 @@ module Qiniu
           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("&")
+          Auth.request Config.settings[:rs_host] + "/batch", execs.join("&"), {:mime => "application/x-www-form-urlencoded" }
         end
 
       end

lib/qiniu/rs/up.rb

@@ -200,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
@@ -230,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

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

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

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.qiniu.com/ruby-sdk/}
-  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) }

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/rs_spec.rb

@@ -92,19 +92,24 @@ module Qiniu
 
       context ".batch_copy" do
         it "should works" do
-          code, data = Qiniu::RS::RS.batch_copy [@bucket, @key, @bucket, @key2]
+          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 ".batch_move" do
         it "should works" do
-          code, data = Qiniu::RS::RS.batch_move [@bucket, @key, @bucket, @key2]
+          code, data = Qiniu::RS::RS.batch_move @bucket, @key, @bucket, @key2
           code.should == 200
           puts data.inspect
 
@@ -112,30 +117,12 @@ module Qiniu
           #code2.should == 200
           #puts data2.inspect
 
-          code3, data3 = Qiniu::RS::RS.batch_move [@bucket, @key2, @bucket, @key]
+          code3, data3 = Qiniu::RS::RS.batch_move @bucket, @key2, @bucket, @key
           code3.should == 200
           puts data3.inspect
         end
       end
 
-=begin
-      context ".publish" do
-        it "should works" do
-          code, data = Qiniu::RS::RS.publish(@domain, @bucket)
-          code.should == 200
-          puts data.inspect
-        end
-      end
-
-      context ".unpublish" do
-        it "should works" do
-          code, data = Qiniu::RS::RS.unpublish(@domain)
-          code.should == 200
-          puts data.inspect
-        end
-      end
-=end
-
       context ".move" do
         it "should works" do
           code, data = Qiniu::RS::RS.move(@bucket, @key, @bucket, @key2)

spec/qiniu/rs_spec.rb

@@ -32,9 +32,6 @@ module Qiniu
     end
 
     after :all do
-      #result = Qiniu::RS.unpublish(@domain)
-      #result.should_not be_false
-
       result1 = Qiniu::RS.drop(@bucket)
       puts result1.inspect
       result1.should_not be_false
@@ -278,43 +275,28 @@ module Qiniu
       end
     end
 
-=begin
-    context ".publish" do
-      it "should works" do
-        result = Qiniu::RS.publish(@domain, @bucket)
-        result.should_not be_false
-      end
-    end
-=end
-
-=begin
-    context ".unpublish" do
-      it "should works" do
-        result = Qiniu::RS.unpublish(@domain)
-        result.should_not be_false
-      end
-    end
-=end
-
     context ".batch_copy" do
       it "should works" do
-        result = Qiniu::RS.batch_copy [@bucket, @key, @bucket, @key2]
+        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 ".batch_move" do
       it "should works" do
-        result = Qiniu::RS::RS.batch_move [@bucket, @key, @bucket, @key2]
+        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 = Qiniu::RS.batch_move @bucket, @key2, @bucket, @key
         result3.should_not be_false
       end
     end