qiniu 6.7.0 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5c78c8aaf5c3fb151d6513187c163c4e1a6c75
-  data.tar.gz: d1c98abc2d8a13cc26ffb35e6620473ef9889069
+  metadata.gz: de7295d2117d781da3393be2970a1fe47fc805e7
+  data.tar.gz: effdc4eeb3869a3cac362d6f23196f3b6a22f20a
 SHA512:
-  metadata.gz: d1502137ea8b982085cc93c5552d0ca8b69c6103040a5fa82b78b641aec43acc01b05463d8cf63dba5ee18900e9ce3210d08f3185971ccf6cd0f823011145072
-  data.tar.gz: bbf7e1a9618044b23b99a0e4747261c6e64416e5d5aa325f2951f88d19c3ed9026b6c8ab57aeb9cb828f6f5ee5cf57eaa85917d0ed5e2106e2d414af17cbeebc
+  metadata.gz: d6ffe81579309aa77188ead19e97d422176496b1ecb8b32c4d4455d5dbe0b175a7a55ce73112f8fbb0e2338ee6caa3b25a68ae2e3e038f9a1c23fc945cb6e125
+  data.tar.gz: 302e9930d19d6ecf33d69a8a77adc457b16cbcb08e0f6a641efe80405f61a3c6fac674c3e76b7702f1574fd475b96976f6d1f39da40a01ab36f2b87359bfa438

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+### v6.8.0
+
+- 支持多存储区域，部分 API 需要额外的 bucket 参数。[https://github.com/qiniu/ruby-sdk/pull/161](https://github.com/qiniu/ruby-sdk/pull/161)
+
 ### v6.7.0
 
 - 放弃支持过时的 Ruby 1.9、Ruby 2.0 和 JRuby 1.7。[https://github.com/qiniu/ruby-sdk/pull/149](https://github.com/qiniu/ruby-sdk/pull/149)

data/README.md

@@ -24,7 +24,7 @@
 
 在您 Ruby 应用程序的 `Gemfile` 文件中，添加如下一行代码：
 
-    gem 'qiniu', '>= 6.7.0'
+    gem 'qiniu', '>= 6.8.0'
 
 然后，在应用程序所在的目录下，可以运行 `bundle` 安装依赖包：
 

data/examples/fetch.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'qiniu'
+
+Qiniu.establish_connection! :access_key => 'xxx',
+                            :secret_key => 'xxx'
+
+#需要fetch操作保存到的空间名
+bucket = 'xxx'
+#fetch过来的url，需要外网可以访问到
+target_url = 'url'
+#保存到空间的fetch操作的文件名
+key = 'xxx'
+
+#调用fetch方法
+code, result, response_headers = Qiniu::Storage.fetch(
+    bucket,      
+    target_url,  
+    key          
+)
+
+#打印返回的状态码以及信息
+puts code
+puts result
+puts response_headers

data/examples/list.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require 'qiniu'
+
+Qiniu.establish_connection! :access_key => 'xxxx',
+                            :secret_key => 'xxxx'
+
+#你要测试的list的空间名
+bucket = 'xxxx'
+
+#调用list接口,参数可以参考 http://developer.qiniu.com/code/v6/api/kodo-api/rs/list.html#list-specification 
+code, result, response_headers, s, d = Qiniu::Storage.list(Qiniu::Storage::ListPolicy.new(
+    bucket,   # bucket
+    100,      # limit
+    'photo/', # prefix
+    ''        # delimiter
+))
+#打印出返回的状态码和信息
+puts code
+puts result
+puts response_headers

data/lib/qiniu.rb

@@ -16,6 +16,7 @@ module Qiniu
   autoload :Storage, 'qiniu/storage'
   autoload :Fop, 'qiniu/fop'
   autoload :Misc, 'qiniu/misc'
+  autoload :HostManager, 'qiniu/host_manager'
 
     class << self
 

data/lib/qiniu/auth.rb

@@ -74,7 +74,9 @@ module Qiniu
           :fsize_limit            => "fsizeLimit"          ,
           :callback_fetch_key     => "callbackFetchKey"    ,
           :detect_mime            => "detectMime"          ,
-          :mime_limit             => "mimeLimit"
+          :mime_limit             => "mimeLimit"           ,
+          :uphosts                => "uphosts"             ,
+          :global                 => "global"
         } # PARAMS
 
         public
@@ -91,6 +93,15 @@ module Qiniu
             # 覆盖语义，文件已存在则直接覆盖
             @scope = "#{bucket}:#{key}"
           end
+
+          if Config.settings[:multi_region]
+            begin
+              @uphosts = Config.host_manager.up_hosts(bucket)
+              @global = Config.host_manager.global(bucket)
+            rescue
+              # Do nothing
+            end
+          end
         end # scope!
 
         def expires_in!(seconds)

data/lib/qiniu/config.rb

@@ -20,12 +20,12 @@ module Qiniu
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
           :rs_host         => "http://rs.qiniu.com",
-          :fetch_host      => "http://iovip.qbox.me",
+          :fetch_host      => nil,
           :rsf_host        => "http://rsf.qbox.me",
-          :up_host         => "http://up.qiniu.com",
+          :up_host         => nil,
           :pub_host        => "http://pu.qbox.me:10200",
           :eu_host         => "http://eu.qbox.me",
-          :iovip_host         => "http://iovip.qbox.me",
+          :uc_host         => "http://uc.qbox.me",
           :access_key      => "",
           :secret_key      => "",
           :auto_reconnect  => true,
@@ -33,12 +33,13 @@ module Qiniu
           :block_size      => 1024*1024*4,
           :chunk_size      => 1024*256,
           :enable_debug    => true,
-          :tmpdir          => Dir.tmpdir + File::SEPARATOR + 'QiniuRuby'
+          :tmpdir          => Dir.tmpdir + File::SEPARATOR + 'QiniuRuby',
+          :multi_region    => true
         }
 
-        REQUIRED_OPTION_KEYS = [:access_key, :secret_key, :up_host]
+        REQUIRED_OPTION_KEYS = [:access_key, :secret_key]
 
-        attr_reader :settings, :default_params
+        attr_reader :settings, :default_params, :host_manager
 
         def load config_file
           if File.exist?(config_file)
@@ -55,8 +56,17 @@ module Qiniu
           REQUIRED_OPTION_KEYS.each do |opt|
             raise MissingArgsError, [opt] unless @settings.has_key?(opt)
           end
+          @host_manager = HostManager.new(@settings)
+          nil
         end
 
+        def up_host(bucket, opts = {})
+          @settings[:up_host] || @host_manager.up_host(bucket, opts)
+        end
+
+        def fetch_host(bucket, opts = {})
+          @settings[:fetch_host] || @host_manager.fetch_host(bucket, opts)
+        end
       end
     end # module Config
 end # module Qiniu

data/lib/qiniu/host_manager.rb

@@ -0,0 +1,104 @@
+require 'thread'
+require 'cgi'
+
+module Qiniu
+  class BucketIsMissing < RuntimeError; end
+
+  class HostManager
+    def initialize(config)
+      @config = config
+      @mutex = Mutex.new
+      @hosts = {}
+    end
+
+    def up_host(bucket, opts = {})
+      if !multi_region_support?
+        "#{extract_protocol(opts)}://up.qiniu.com"
+      elsif bucket
+        hosts(bucket)[extract_protocol(opts)]['up'][0] rescue "#{extract_protocol(opts)}://up.qiniu.com"
+      else
+        raise BucketIsMissing, 'HostManager#up_host: bucket is required when multi_region is enabled'
+      end
+    end
+
+    def fetch_host(bucket, opts = {})
+      if !multi_region_support?
+        "#{extract_protocol(opts)}://iovip.qbox.me"
+      elsif bucket
+        hosts(bucket)[extract_protocol(opts)]['io'][0] rescue "#{extract_protocol(opts)}://iovip.qbox.me"
+      else
+        raise BucketIsMissing, 'HostManager#fetch_host: bucket is required when multi_region is enabled'
+      end
+    end
+
+    def up_hosts(bucket, opts = {})
+      if multi_region_support?
+        hosts(bucket)[extract_protocol(opts)]['up']
+      else
+        raise 'HostManager#up_hosts: multi_region must be enabled'
+      end
+    end
+
+    def global(bucket, opts = {})
+      if multi_region_support?
+        !!hosts(bucket)['global']
+      else
+        raise 'HostManager#global: multi_region must be enabled'
+      end
+    end
+
+    private
+
+    def extract_protocol(opts)
+      opts[:protocol] || 'http'
+    end
+
+    def multi_region_support?
+      @config[:multi_region]
+    end
+
+    def hosts(bucket)
+      host = read_host(bucket)
+      if host
+        if host_expired?(host)
+          delete_host(bucket)
+        else
+          return host
+        end
+      end
+      url = @config[:uc_host] + '/v1/query?' + HTTP.generate_query_string(ak: @config[:access_key], bucket: bucket)
+      status, body = HTTP.api_get(url)
+      if HTTP.is_response_ok?(status)
+        Utils.debug("Query #{bucket} hosts Success: #{body}")
+        host = body.merge(:time => Time.now)
+        write_host(bucket, host)
+        host
+      else
+        Utils.debug("Query #{bucket} hosts Error: #{body}")
+        raise "Host query is failed"
+      end
+    end
+
+    def host_expired?(host)
+      host[:time] + host['ttl'] < Time.now
+    end
+
+    def read_host(bucket)
+      @mutex.synchronize do
+        @hosts[bucket]
+      end
+    end
+
+    def write_host(bucket, host)
+      @mutex.synchronize do
+        @hosts[bucket] = host
+      end
+    end
+
+    def delete_host(bucket)
+      @mutex.synchronize do
+        @hosts.delete(bucket)
+      end
+    end
+  end
+end

data/lib/qiniu/management.rb

@@ -83,7 +83,7 @@ module Qiniu
         end # delete
 
         def fetch(bucket, target_url, key)
-          url = Config.settings[:fetch_host] + '/fetch/' + Utils.urlsafe_base64_encode(target_url) + '/to/' + encode_entry_uri(bucket, key)
+          url = Config.fetch_host(bucket) + '/fetch/' + Utils.urlsafe_base64_encode(target_url) + '/to/' + encode_entry_uri(bucket, key)
           return HTTP.management_post(url)
         end # fetch
 
@@ -149,11 +149,6 @@ module Qiniu
           return resp_code, resp_body, resp_headers, has_more, new_list_policy
         end # list
 
-        def fetch(url, bucket, key)
-          api_url = Config.settings[:iovip_host] + '/fetch/' + Utils.urlsafe_base64_encode(url) + '/to/' + Utils.urlsafe_base64_encode("#{bucket}:#{key}")
-          return HTTP.management_post(api_url)
-        end # fetch
-
         private
 
         def _generate_cp_or_mv_opstr(command, source_bucket, source_key, target_bucket, target_key)

data/lib/qiniu/resumable_upload.rb

@@ -103,7 +103,7 @@ module Qiniu
               }
           }
           if !content_type.nil? && !content_type.empty? then
-              options[:headers][:content_type] = content_type 
+              options[:headers][:content_type] = content_type
           end
 
           code, data, raw_headers = HTTP.api_post(url, data, options)
@@ -116,8 +116,8 @@ module Qiniu
           return code, data, raw_headers
         end # _call_binary_with_token
 
-        def _mkblock(uptoken, block_size, body)
-            url = Config.settings[:up_host] + "/mkblk/#{block_size}"
+        def _mkblock(bucket, uptoken, block_size, body)
+            url = Config.up_host(bucket) + "/mkblk/#{block_size}"
             _call_binary_with_token(uptoken, url, body)
         end # _mkblock
 
@@ -126,7 +126,8 @@ module Qiniu
             _call_binary_with_token(uptoken, url, body)
         end # _putblock
 
-        def _resumable_put_block(uptoken,
+        def _resumable_put_block(bucket,
+                                 uptoken,
                                  fh,
                                  block_index,
                                  block_size,
@@ -151,7 +152,7 @@ module Qiniu
                         raise FileSeekReadError.new(fpath, block_index, seek_pos, body_length, result_length)
                     end
 
-                    code, data, raw_headers = _mkblock(uptoken, block_size, body)
+                    code, data, raw_headers = _mkblock(bucket, uptoken, block_size, body)
                     Utils.debug "Mkblk : #{code.inspect} #{data.inspect} #{raw_headers.inspect}"
 
                     body_crc32 = Zlib.crc32(body)
@@ -214,7 +215,8 @@ module Qiniu
             ((fsize + Config.settings[:block_size] - 1) / Config.settings[:block_size]).to_i
         end # _block_count
 
-        def _resumable_put(uptoken,
+        def _resumable_put(bucket,
+                           uptoken,
                            fh,
                            checksums,
                            progresses,
@@ -239,7 +241,7 @@ module Qiniu
                     end
                     #code, data = _resumable_put_block(uptoken, fh, block_index, block_size, Config.settings[:chunk_size], progresses[block_index], Config.settings[:max_retry_times], chunk_notifier)
                     # Put the whole block as a chunk
-                    code, data = _resumable_put_block(uptoken, fh, block_index, block_size, block_size, progresses[block_index], Config.settings[:max_retry_times], chunk_notifier)
+                    code, data = _resumable_put_block(bucket, uptoken, fh, block_index, block_size, block_size, progresses[block_index], Config.settings[:max_retry_times], chunk_notifier)
                     if HTTP.is_response_ok?(code)
                         #checksums[block_index] = data["checksum"]
                         checksums[block_index] = data["ctx"]
@@ -299,7 +301,7 @@ module Qiniu
           checksums = []
           block_count.times{checksums << ''}
 
-          code, data, raw_headers = _resumable_put(uptoken, fh, checksums, progresses, block_notifier, chunk_notifier)
+          code, data, raw_headers = _resumable_put(bucket, uptoken, fh, checksums, progresses, block_notifier, chunk_notifier)
 
           if HTTP.is_response_ok?(code)
             uphost = data["host"]

data/lib/qiniu/upload.rb

@@ -32,7 +32,7 @@ module Qiniu
         end
         callback_query_string = HTTP.generate_query_string(callback_params)
 
-        url = Config.settings[:up_host] + '/upload'
+        url = Config.up_host(bucket) + '/upload'
         post_data = {
           :params     => callback_query_string,
           :action     => action_params,
@@ -52,7 +52,7 @@ module Qiniu
                               x_vars = nil,
                               opts = {})
         ### 构造URL
-        url = Config.settings[:up_host]
+        url = Config.up_host(opts[:bucket])
         url[/\/*$/] = ''
         url += '/'
 
@@ -80,6 +80,8 @@ module Qiniu
 
         ### 发送请求
         HTTP.api_post(url, post_data)
+      rescue BucketIsMissing
+        raise 'upload_with_token_2 requires :bucket option when multi_region is enabled'
       end # upload_with_token_2
 
       def upload_buffer_with_token(uptoken,
@@ -88,7 +90,7 @@ module Qiniu
                               x_vars = nil,
                               opts = {})
         ### 构造 URL
-        url = Config.settings[:up_host]
+        url = Config.up_host(opts[:bucket])
         url[/\/*$/] = ''
         url += '/'
 
@@ -125,6 +127,8 @@ module Qiniu
 
         ### 发送请求
         HTTP.api_post(url, post_data)
+      rescue BucketIsMissing
+        raise 'upload_buffer_with_token requires :bucket option when multi_region is enabled'
       end # upload_with_token_2
 
       ### 授权举例
@@ -147,6 +151,8 @@ module Qiniu
         end
 
         return upload_with_token_2(uptoken, local_file, key, x_vars, opts)
+      rescue BucketIsMissing
+        raise 'upload_with_put_policy requires :bucket option when multi_region is enabled'
       end # upload_with_put_policy
 
       def upload_buffer_with_put_policy(put_policy,
@@ -160,6 +166,8 @@ module Qiniu
         end
 
         return upload_buffer_with_token(uptoken, buf, key, x_vars, opts)
+      rescue BucketIsMissing
+        raise 'upload_buffer_with_put_policy requires :bucket option when multi_region is enabled'
       end # upload_buffer_with_put_policy
 
       private

data/lib/qiniu/version.rb

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

data/spec/qiniu/auth_spec.rb

@@ -29,7 +29,10 @@ module Qiniu
           pp = Auth::PutPolicy.new(@bucket, key)
           code, data, raw_headers = Qiniu::Storage.upload_with_put_policy(
             pp,
-            __FILE__
+            __FILE__,
+            nil,
+            nil,
+            bucket: @bucket
           )
           code.should == 200
           puts data.inspect
@@ -68,6 +71,24 @@ module Qiniu
           code.should == 200
           puts data.inspect
         end
+
+        it "should generate uphosts and global for multi_region" do
+          origin_multi_region = Config.settings[:multi_region]
+          begin
+            Config.settings[:multi_region] = true
+            ### 生成Key
+            key = 'a_private_file'
+            key = make_unique_key_in_bucket(key)
+            puts "key=#{key}"
+
+            ### 生成 PutPolicy
+            pp = Auth::PutPolicy.new(@bucket, key)
+            expect(pp.instance_variable_get(:@uphosts)).to eq ["http://up.qiniu.com", "http://upload.qiniu.com", "-H up.qiniu.com http://183.136.139.16"]
+            expect(pp.instance_variable_get(:@global)).to be false
+          ensure
+            Config.settings[:multi_region] = origin_multi_region
+          end
+        end
       end
     end
 

data/spec/qiniu/management_spec.rb

@@ -9,31 +9,22 @@ require 'qiniu'
 
 module Qiniu
   module Storage
-    describe Storage do
-
+    shared_examples "Management Specs" do
       before :all do
-        @bucket = 'rubysdk'
-
         @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
         @key = make_unique_key_in_bucket(@key)
 
         @key2 = @key + rand(100).to_s
-      end
 
-      after :all do
-      end
-
-      ### 准备数据
-      context ".prepare_file" do
-        it "should works" do
-          pp = Auth::PutPolicy.new(@bucket, @key)
-          code, data, raw_headers = Qiniu::Storage.upload_with_put_policy(
-            pp,
-            __FILE__
-          )
-          code.should == 200
-          puts data.inspect
-        end
+        pp = Auth::PutPolicy.new(@bucket, @key)
+        code, data, raw_headers = Qiniu::Storage.upload_with_put_policy(
+          pp,
+          __FILE__,
+          nil,
+          nil,
+          bucket: @bucket
+        )
+        code.should == 200
       end
 
       ### 列举Bucket
@@ -48,103 +39,136 @@ module Qiniu
       context ".stat" do
         it "should works" do
           code, data = Storage.stat(@bucket, @key)
-          code.should == 200
           puts data.inspect
+          code.should == 200
         end
       end
 
       context ".get" do
         it "should works" do
           code, data = Storage.get(@bucket, @key)
-          code.should == 200
           puts data.inspect
+          code.should == 200
         end
       end
 
       context ".batch" do
         it "should works" do
           code, data = Storage.batch("stat", @bucket, [@key])
-          code.should == 200
           puts data.inspect
+          code.should == 200
         end
       end
 
       context ".batch_stat" do
         it "should works" do
           code, data = Storage.batch_stat(@bucket, [@key])
-          code.should == 200
           puts data.inspect
+          code.should == 200
         end
       end
 
       context ".batch_get" do
         it "should works" do
           code, data = Storage.batch_get(@bucket, [@key])
-          code.should == 200
           puts data.inspect
+          code.should == 200
         end
       end
 
       context ".batch_copy" do
         it "should works" do
           code, data = Storage.batch_copy @bucket, @key, @bucket, @key2
-          code.should == 200
           puts data.inspect
+          code.should == 200
 
           code, data = Storage.delete @bucket, @key2
-          code.should == 200
           puts data.inspect
+          code.should == 200
         end
       end
 
       context ".batch_move" do
         it "should works" do
           code, data = Storage.batch_move [@bucket, @key, @bucket, @key2]
-          code.should == 200
           puts data.inspect
+          code.should == 200
 
           code3, data3 = Storage.batch_move [@bucket, @key2, @bucket, @key]
-          code3.should == 200
           puts data3.inspect
+          code3.should == 200
         end
       end
 
       context ".move" do
         it "should works" do
           code, data = Storage.move(@bucket, @key, @bucket, @key2)
-          code.should == 200
           puts data.inspect
+          code.should == 200
 
           code2, data2 = Storage.stat(@bucket, @key2)
-          code2.should == 200
           puts data2.inspect
+          code2.should == 200
 
           code3, data3 = Storage.move(@bucket, @key2, @bucket, @key)
-          code3.should == 200
           puts data3.inspect
+          code3.should == 200
         end
       end
 
       context ".copy" do
         it "should works" do
           code, data = Storage.copy(@bucket, @key, @bucket, @key2)
-          code.should == 200
           puts data.inspect
+          code.should == 200
 
           code, data = Storage.delete(@bucket, @key2)
-          code.should == 200
           puts data.inspect
+          code.should == 200
         end
       end
 
       context ".delete" do
         it "should works" do
           code, data = Storage.delete(@bucket, @key)
+          puts data.inspect
+          code.should == 200
+        end
+      end
+
+      context ".fetch" do
+        it "should works" do
+          code, data = Qiniu::Storage.fetch(@bucket, "https://www.baidu.com/robots.txt", @key)
           code.should == 200
           puts data.inspect
         end
       end
+    end
 
+    describe 'When multi_region is disabled' do
+      before :all do
+        Config.settings[:multi_region] = false
+        @bucket = 'rubysdk'
+      end
+      include_examples 'Management Specs'
+    end
+
+    describe 'When multi_region is enabled' do
+      describe 'for z0 bucket' do
+        before :all do
+          Config.settings[:multi_region] = true
+          @bucket = 'rubysdk'
+        end
+        include_examples 'Management Specs'
+      end
+
+      describe 'for z1 bucket' do
+        before :all do
+          Config.settings[:multi_region] = true
+          @bucket = 'rubysdk-bc'
+        end
+        include_examples 'Management Specs'
+      end
     end
   end # module Storage
 end # module Qiniu

data/spec/qiniu/upload_spec.rb

@@ -8,11 +8,8 @@ require 'digest/sha1'
 
 module Qiniu
   module Storage
-    describe Storage do
-
+    shared_examples "Upload Specs" do
       before :all do
-        @bucket = 'rubysdk'
-
         @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
         @key = make_unique_key_in_bucket(@key)
         puts "key=#{@key}"
@@ -52,6 +49,12 @@ module Qiniu
 
       ### 测试单文件直传
       context ".upload_with_token" do
+        after do
+          code, data = Qiniu::Storage.delete(@bucket, @key)
+          puts data.inspect
+          code.should == 200
+        end
+
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
@@ -68,26 +71,20 @@ module Qiniu
           code.should == 200
           puts data.inspect
           puts raw_headers.inspect
-        end
-      end
 
-      context ".stat" do
-        it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key)
           puts data.inspect
           code.should == 200
         end
       end
 
-      context ".delete" do
-        it "should works" do
+      context ".upload_with_token_2" do
+        after do
           code, data = Qiniu::Storage.delete(@bucket, @key)
           puts data.inspect
           code.should == 200
         end
-      end
 
-      context ".upload_with_token_2" do
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :endUser => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
@@ -95,32 +92,28 @@ module Qiniu
           code, data, raw_headers = Qiniu::Storage.upload_with_token_2(
             uptoken,
             __FILE__,
-            @key
+            @key,
+            nil,
+            bucket: @bucket
           )
 
           code.should == 200
           puts data.inspect
           puts raw_headers.inspect
-        end
-      end # .upload_with_token_2
 
-      context ".stat" do
-        it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key)
           puts data.inspect
           code.should == 200
         end
-      end
+      end # .upload_with_token_2
 
-      context ".delete" do
-        it "should works" do
+      context ".upload_with_put_policy" do
+        after do
           code, data = Qiniu::Storage.delete(@bucket, @key)
           puts data.inspect
           code.should == 200
         end
-      end
 
-      context ".upload_with_put_policy" do
         it "should works" do
           pp = Qiniu::Auth::PutPolicy.new(@bucket, @key)
           pp.end_user = "why404@gmail.com"
@@ -129,7 +122,9 @@ module Qiniu
           code, data, raw_headers = Qiniu::Storage.upload_with_put_policy(
             pp,
             __FILE__,
-            @key + '-not-equal'
+            @key + '-not-equal',
+            nil,
+            bucket: @bucket
           )
           code.should_not == 200
           puts data.inspect
@@ -138,16 +133,28 @@ module Qiniu
           code, data, raw_headers = Qiniu::Storage.upload_with_put_policy(
             pp,
             __FILE__,
-            @key
+            @key,
+            nil,
+            bucket: @bucket
           )
 
           code.should == 200
           puts data.inspect
           puts raw_headers.inspect
+
+          code, data = Qiniu::Storage.stat(@bucket, @key)
+          puts data.inspect
+          code.should == 200
         end
       end # .upload_with_put_policy
 
       context ".upload_buffer_with_put_policy" do
+        after do
+          code, data = Qiniu::Storage.delete(@bucket, @key)
+          puts data.inspect
+          code.should == 200
+        end
+
         it "should works" do
           pp = Qiniu::Auth::PutPolicy.new(@bucket, @key)
           pp.end_user = "amethyst.black@gmail.com"
@@ -157,32 +164,28 @@ module Qiniu
           code, data, raw_headers = Qiniu::Storage.upload_buffer_with_put_policy(
             pp,
             test_line,
-            @key
+            @key,
+            nil,
+            bucket: @bucket
           )
           code.should == 200
           puts data.inspect
           puts raw_headers.inspect
-        end
-      end # .upload_buffer_with_put_policy
 
-      context ".stat" do
-        it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key)
           puts data.inspect
           code.should == 200
         end
-      end
+      end # .upload_buffer_with_put_policy
 
-      context ".delete" do
-        it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key)
+      ### 测试断点续上传
+      context ".resumable_upload_with_token" do
+        after do
+          code, data = Qiniu::Storage.delete(@bucket, @key_5m)
           puts data.inspect
           code.should == 200
         end
-      end
 
-      ### 测试断点续上传
-      context ".resumable_upload_with_token" do
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
@@ -196,26 +199,20 @@ module Qiniu
           puts data.inspect
           puts raw_headers.inspect
           puts "key_5m=#{@key_5m}"
-        end
-      end
 
-      context ".stat" do
-        it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key_5m)
           puts data.inspect
           code.should == 200
         end
       end
 
-      context ".delete" do
-        it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key_5m)
+      context ".resumable_upload_with_token2" do
+        after do
+          code, data = Qiniu::Storage.delete(@bucket, @key_4m)
           puts data.inspect
           code.should == 200
         end
-      end
 
-      context ".resumable_upload_with_token2" do
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
@@ -229,26 +226,20 @@ module Qiniu
           puts data.inspect
           puts raw_headers.inspect
           puts "key_4m=#{@key_4m}"
-        end
-      end
 
-      context ".stat" do
-        it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key_4m)
           puts data.inspect
           code.should == 200
         end
       end
 
-      context ".delete" do
-        it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key_4m)
+      context ".resumable_upload_with_token3" do
+        after do
+          code, data = Qiniu::Storage.delete(@bucket, @key_8m)
           puts data.inspect
           code.should == 200
         end
-      end
 
-      context ".resumable_upload_with_token3" do
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
@@ -262,26 +253,20 @@ module Qiniu
           puts data.inspect
           puts raw_headers.inspect
           puts "key_8m=#{@key_8m}"
-        end
-      end
 
-      context ".stat" do
-        it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key_8m)
           puts data.inspect
           code.should == 200
         end
       end
 
-      context ".delete" do
-        it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key_8m)
+      context ".resumable_upload_with_token4" do
+        after do
+          code, data = Qiniu::Storage.delete(@bucket, @key_1m)
           puts data.inspect
           code.should == 200
         end
-      end
 
-      context ".resumable_upload_with_token4" do
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
@@ -295,25 +280,51 @@ module Qiniu
           puts data.inspect
           puts raw_headers.inspect
           puts "key_1m=#{@key_1m}"
-        end
-      end
 
-      context ".stat" do
-        it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key_1m)
           puts data.inspect
           code.should == 200
         end
       end
+    end
 
-      context ".delete" do
-        it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key_1m)
-          puts data.inspect
-          code.should == 200
+    describe 'When multi_region is disabled' do
+      before :all do
+        Config.settings[:multi_region] = false
+        @bucket = 'rubysdk'
+      end
+      include_examples 'Upload Specs'
+    end
+
+    describe 'When multi_region is enabled' do
+      describe 'for z0 bucket' do
+        before :all do
+          Config.settings[:multi_region] = true
+          @bucket = 'rubysdk'
         end
+        include_examples 'Upload Specs'
       end
 
+      describe 'for z1 bucket' do
+        before :all do
+          Config.settings[:multi_region] = true
+          @bucket = 'rubysdk-bc'
+        end
+        include_examples 'Upload Specs'
+
+        it 'should raise BucketIsMissing error' do
+          upopts = {:scope => @bucket, :expires_in => 3600, :endUser => "why404@gmail.com"}
+          uptoken = Qiniu.generate_upload_token(upopts)
+
+          expect do
+            Qiniu::Storage.upload_with_token_2(
+              uptoken,
+              __FILE__,
+              @key,
+            )
+          end.to raise_error('upload_with_token_2 requires :bucket option when multi_region is enabled')
+        end
+      end
     end
   end # module Storage
 end # module Qiniu

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.8.0
 platform: ruby
 authors:
 - why404
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 description: 'Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html'
@@ -116,9 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -128,7 +128,9 @@ files:
 - examples/copy.rb
 - examples/delete.rb
 - examples/download.rb
+- examples/fetch.rb
 - examples/fops.rb
+- examples/list.rb
 - examples/move.rb
 - examples/stat.rb
 - examples/upload.rb
@@ -142,6 +144,7 @@ files:
 - lib/qiniu/config.rb
 - lib/qiniu/exceptions.rb
 - lib/qiniu/fop.rb
+- lib/qiniu/host_manager.rb
 - lib/qiniu/http.rb
 - lib/qiniu/image.rb
 - lib/qiniu/log.rb
@@ -183,17 +186,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Qiniu Resource (Cloud) Storage SDK for Ruby