qiniu 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb8c598a8ae3aabebea6aca70a992aa8cbfb20a
-  data.tar.gz: a23e588d3da392c136bb4112f17163658de5dc8f
+  metadata.gz: d8305d0d51c6dd65343f634f175edb242bc81733
+  data.tar.gz: ae6055351cd00d341487bd545aef683ead3ae99f
 SHA512:
-  metadata.gz: 328f544c77cbe62e969704ce39f84a5f2a1f71e5d284cfadb3d5b6750ecef3002c48f5421cea24e7a6711e4a563d6eba908e13fc7abaf3f9d12c944304a9027b
-  data.tar.gz: 872dc200b4fa640c965f3b10416c210142f302cc0cbd0c81e0010aab3727c520d7cb2ad0190065a32cb2b1456cee5edd31cf5230d30767f62dfd88cc0bf5f3d4
+  metadata.gz: 729967aa45f514f1d9b205c9b8eeabc0d886634dfcfd7b38d3a89326c6e01bdb95966cd19de1e5e0fc7d0a94e5fe76715ff514ca5c2038b1d68c379c5b914f28
+  data.tar.gz: 490c565dcfed6aca96e917d8228e0634c263ca52b7ed34dfc31d5ffc661dc3d6f82b39db72b1b9e196543b87ddaaabe56bc77cbc45b75f1cb8166617d77e3f66

data/.travis.yml

@@ -1,13 +1,9 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.1
-  - jruby-18mode
   - jruby-19mode
-  - ree
 before_script:
   - export QINIU_ACCESS_KEY=LGRqJsjX7LAvtdtX6hhyxs861lS57HwnOQmJsOuX
   - export QINIU_SECRET_KEY=g_OxhuN5iJ1O7BoA6YdXyF6zSszk34UZFKDfdIIW

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+### v6.2.1
+
+- 去除已废弃的publish/unpublish接口。 [https://github.com/qiniu/ruby-sdk/pull/90](https://github.com/qiniu/ruby-sdk/pull/90) (#8143)
+
 ### v6.2.0
 
 - 重写与授权相关的函数并归入Qiniu::Auth空间，原授权凭证生成类维持不变。

data/Gemfile.lock

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

data/README.md

@@ -9,6 +9,7 @@
 [![Build Status](https://api.travis-ci.org/qiniu/ruby-sdk.png?branch=master)](https://travis-ci.org/qiniu/ruby-sdk)
 [![Gem Version](https://badge.fury.io/rb/qiniu.png)](http://badge.fury.io/rb/qiniu)
 [![Dependency Status](https://gemnasium.com/qiniu/ruby-sdk.png)](https://gemnasium.com/qiniu/ruby-sdk)
+[![Code Climate](https://codeclimate.com/github/qiniu/ruby-sdk.png)](https://codeclimate.com/github/qiniu/ruby-sdk)
 
 ## 安装
 

data/lib/qiniu.rb

@@ -64,7 +64,7 @@ module Qiniu
         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 = Storage.upload_with_token(opts[:uptoken],
+          code, data, raw_headers = Storage.upload_with_token(opts[:uptoken],
                                             opts[:file],
                                             opts[:bucket],
                                             opts[:key],
@@ -74,7 +74,7 @@ module Qiniu
                                             opts[:callback_params],
                                             opts[:rotate])
         else
-          code, data = Storage.upload_with_token(opts[:uptoken],
+          code, data, raw_headers = Storage.upload_with_token(opts[:uptoken],
                                             opts[:file],
                                             opts[:bucket],
                                             opts[:key],
@@ -156,16 +156,6 @@ module Qiniu
         code == StatusOK ? data : false
       end
 
-      def publish(domain, bucket)
-        code, data = Storage.publish(domain, bucket)
-        code == StatusOK
-      end
-
-      def unpublish(domain)
-        code, data = Storage.unpublish(domain)
-        code == StatusOK
-      end
-
       def drop(bucket)
         code, data = Storage.drop(bucket)
         code == StatusOK

data/lib/qiniu/adt.rb

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+# vim: sw=2 ts=2
+
+require 'uri'
+
+module Qiniu
+  module ADT
+    
+    class ApiSpecification
+      public
+      def to_str; return ""; end
+    end # class ApiSpecification
+
+    module Policy
+      public
+      def to_json
+        args = {}
+
+        self.params.each_pair do |key, fld|
+          val = self.__send__(key)
+          if !val.nil? then
+            args[fld] = val
+          end
+        end
+
+        return args.to_json
+      end # to_json
+
+      def to_query_string
+        args = []
+
+        self.params.each_pair do |key, fld|
+          val = self.__send__(key)
+          if !val.nil? then
+            new_fld = CGI.escape(fld.to_s)
+            new_val = CGI.escape(val.to_s).gsub('+', '%20')
+            args.push("#{new_fld}=#{new_val}")
+          end
+        end
+
+        return args.join("&")
+      end # to_query_string
+    end # module Policy
+
+  end # module ADT
+end # module Qiniu

data/lib/qiniu/auth.rb

@@ -132,22 +132,6 @@ module Qiniu
       end # class PutPolicy
 
       class << self
-
-        include Utils
-
-        def call_with_signature(url, data, retry_times = 0, options = {})
-          return Utils.http_request(
-            url,
-            data,
-            options.merge({:qbox_signature_token => generate_acctoken(url, data)})
-          )
-        end # call_with_signature
-
-        def request(url, data = nil, options = {})
-          code, data, raw_headers = Auth.call_with_signature(url, data, 0, options)
-          [code, data, raw_headers]
-        end # request
-
         EMPTY_ARGS = {}
 
         ### 生成下载授权URL

data/lib/qiniu/fop.rb

@@ -1,3 +1,4 @@
 # -*- encoding: utf-8 -*-
 
 require 'qiniu/image'
+require 'qiniu/pfop'

data/lib/qiniu/http.rb

@@ -0,0 +1,137 @@
+# -*- encoding: utf-8 -*-
+# vim: sw=2 ts=2
+
+module Qiniu
+  module HTTP
+
+    class << self
+      public
+      def is_response_ok?(http_code)
+          return 200 <= http_code && http_code <= 299
+      end # is_response_ok?
+
+      def generate_query_string(params)
+        if params.is_a?(Hash)
+          total_param = params.map { |key, value| %Q(#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s).gsub('+', '%20')}) }
+          return total_param.join("&")
+        end
+
+        return params
+      end # generate_query_string
+
+      def get (url, opts = {})
+        ### 配置请求Header
+        req_headers = {
+          :connection => 'close',
+          :accept     => '*/*',
+          :user_agent => Config.settings[:user_agent]
+        }
+
+        # 优先使用外部Header，覆盖任何特定Header
+        if opts[:headers].is_a?(Hash) then
+          req_headers.merge!(opts[:headers])
+        end
+
+        ### 发送请求
+        response = RestClient.get(url, req_headers)
+        return response.code.to_i, response.body, response.raw_headers
+      rescue => e
+        Log.logger.warn "#{e.message} => Qiniu::HTTP.get('#{url}')"
+        if e.respond_to?(:response) && e.response.respond_to?(:code) then
+          return e.response.code, e.response.body, e.response.raw_headers
+        end
+        return nil, nil, nil
+      end # get
+
+      API_RESULT_MIMETYPE = 'application/json'
+
+      def api_get (url, opts = {})
+        ### 配置请求Header
+        headers = {
+          :accept => API_RESULT_MIMETYPE
+        }
+
+        # 将特定Header混入外部Header中
+        if opts[:headers].is_a?(Hash) then
+          opts[:headers] = opts[:headers].dup.merge!(headers)
+        else
+          opts[:headers] = headers
+        end
+
+        ### 发送请求，然后转换返回值
+        resp_code, resp_body, resp_headers = get(url, opts)
+        if resp_code.nil? then
+          return 0, {}, {}
+        end
+
+        content_type = resp_headers["content-type"][0]
+        if !content_type.nil? && content_type == API_RESULT_MIMETYPE then
+          # 如果是JSON格式，则反序列化
+          resp_body = Utils.safe_json_parse(resp_body)
+        end
+
+        return resp_code, resp_body, resp_headers
+      end # api_get
+
+      def post (url, req_body = nil, opts = {})
+        ### 配置请求Header
+        req_headers = {
+          :connection => 'close',
+          :accept     => '*/*',
+          :user_agent => Config.settings[:user_agent]
+        }
+
+        # 优先使用外部Header，覆盖任何特定Header
+        if opts[:headers].is_a?(Hash) then
+          req_headers.merge!(opts[:headers])
+        end
+
+        ### 发送请求
+        response = RestClient.post(url, req_body, req_headers)
+        return response.code.to_i, response.body, response.raw_headers
+      rescue => e
+        Log.logger.warn "#{e.message} => Qiniu::HTTP.post('#{url}')"
+        if e.respond_to?(:response) && e.response.respond_to?(:code) then
+          return e.response.code, e.response.body, e.response.raw_headers
+        end
+        return nil, nil, nil
+      end # post
+
+      def api_post (url, req_body = nil, opts = {})
+        ### 配置请求Header
+        headers = {
+          :accept => API_RESULT_MIMETYPE
+        }
+
+        # 将特定Header混入外部Header中
+        if opts[:headers].is_a?(Hash) then
+          opts[:headers] = opts[:headers].dup.merge!(headers)
+        else
+          opts[:headers] = headers
+        end
+
+        ### 发送请求，然后转换返回值
+        resp_code, resp_body, resp_headers = post(url, req_body, opts)
+        if resp_code.nil? then
+          return 0, {}, {}
+        end
+
+        content_type = resp_headers["content-type"][0]
+        if !content_type.nil? && content_type == API_RESULT_MIMETYPE then
+          # 如果是JSON格式，则反序列化
+          resp_body = Utils.safe_json_parse(resp_body)
+        end
+
+        return resp_code, resp_body, resp_headers
+      end # api_post
+
+      def management_post (url, body = '')
+        ### 授权并执行管理操作
+        return HTTP.api_post(url, body, {
+          :headers => { 'Authorization' => 'QBox ' + Auth.generate_acctoken(url, body) }
+        })
+      end # management_post
+    end # class << self
+
+  end # module HTTP
+end # module Qiniu

data/lib/qiniu/image.rb

@@ -7,11 +7,11 @@ module Qiniu
         include Utils
 
         def info(url)
-          Utils.http_request url + '?imageInfo', nil, {:method => :get}
+          return HTTP.api_get(url + '?imageInfo')
         end # info
 
         def exif(url)
-          Utils.http_request url + '?exif', nil, {:method => :get}
+          return HTTP.api_get(url + '?exif')
         end # exif
 
         def mogrify_preview_url(source_image_url, options)

data/lib/qiniu/management.rb

@@ -1,31 +1,38 @@
 # -*- encoding: utf-8 -*-
+# vim: sw=2 ts=2
+
+require 'qiniu/http'
 
 module Qiniu
     module Storage
       class << self
         include Utils
 
+        public
         def buckets
-          Auth.request Config.settings[:rs_host] + '/buckets'
+          url = Config.settings[:rs_host] + '/buckets'
+          return HTTP.management_post(url)
         end # buckets
 
         PRIVATE_BUCKET = 0
         PUBLIC_BUCKET  = 1
 
         def mkbucket(bucket_name, is_public = PUBLIC_BUCKET)
-          Auth.request Config.settings[:rs_host] + '/mkbucket2/' + bucket_name + '/public/' + is_public.to_s
+          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)
+          return mkbucket(bucket_name, PRIVATE_BUCKET)
         end # make_a_private_bucket
 
         def make_a_public_bucket(bucket_name)
-            return mkbucket(bucket_name, PUBLIC_BUCKET)
+          return mkbucket(bucket_name, PUBLIC_BUCKET)
         end # make_a_public_bucket
 
         def stat(bucket, key)
-          Auth.request Config.settings[:rs_host] + '/stat/' + encode_entry_uri(bucket, key)
+          url = Config.settings[:rs_host] + '/stat/' + encode_entry_uri(bucket, key)
+          return HTTP.management_post(url)
         end # stat
 
         def get(bucket, key, save_as = nil, expires_in = nil, version = nil)
@@ -33,35 +40,29 @@ module Qiniu
           url += '/base/' + version unless version.nil?
           url += '/attName/' + Utils.urlsafe_base64_encode(save_as) unless save_as.nil?
           url += '/expires/' + expires_in.to_s if !expires_in.nil? && expires_in > 0
-          Auth.request url
+          return HTTP.management_post(url)
         end # get
 
         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
+          url = Config.settings[:rs_host] + uri
+          return HTTP.management_post(url)
         end # copy
 
         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
+          url = Config.settings[:rs_host] + uri
+          return HTTP.management_post(url)
         end # move
 
         def delete(bucket, key)
-          Auth.request Config.settings[:rs_host] + '/delete/' + encode_entry_uri(bucket, key)
+          url = Config.settings[:rs_host] + '/delete/' + encode_entry_uri(bucket, key)
+          return HTTP.management_post(url)
         end # delete
 
-        def publish(domain, bucket)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/publish/#{encoded_domain}/from/#{bucket}"
-        end # publish
-
-        def unpublish(domain)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/unpublish/#{encoded_domain}"
-        end # unpublish
-
         def drop(bucket)
-          Auth.request Config.settings[:rs_host] + "/drop/#{bucket}"
+          url = Config.settings[:rs_host] + "/drop/#{bucket}"
+          return HTTP.management_post(url)
         end # drop
 
         def batch(command, bucket, keys)
@@ -70,7 +71,8 @@ module Qiniu
             encoded_uri = encode_entry_uri(bucket, key)
             execs << "op=/#{command}/#{encoded_uri}"
           end
-          Auth.request Config.settings[:rs_host] + "/batch", execs.join("&"), {:mime => "application/x-www-form-urlencoded" }
+          url = Config.settings[:rs_host] + "/batch"
+          return HTTP.management_post(url, execs.join("&"))
         end # batch
 
         def batch_get(bucket, keys)
@@ -97,7 +99,7 @@ module Qiniu
           encoded_uri = encode_entry_uri(bucket, key)
           save_as_string = '/save-as/' + encoded_uri
           new_url = source_url + '?' + op_params_string + save_as_string
-          Auth.request new_url
+          return HTTP.management_post(new_url)
         end # save_as
 
         def image_mogrify_save_as(bucket, key, source_image_url, options)
@@ -118,7 +120,8 @@ 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("&"), {:mime => "application/x-www-form-urlencoded" }
+          url = Config.settings[:rs_host] + "/batch"
+          return HTTP.management_post(url, execs.join("&"))
         end # _batch_cp_or_mv
       end
     end # module Storage

data/lib/qiniu/misc.rb

@@ -3,33 +3,31 @@
 module Qiniu
     module Misc
       class << self
-        include Utils
-
         def set_protected(bucket, protected_mode)
-          host = Config.settings[:pub_host]
-          Auth.request %Q(#{host}/accessMode/#{bucket}/mode/#{protected_mode})
-        end
+          url = Config.settings[:pub_host] + %Q(/accessMode/#{bucket}/mode/#{protected_mode})
+          return HTTP.management_post(url)
+        end # set_protected
 
         def set_separator(bucket, separator)
-          host = Config.settings[:pub_host]
           encoded_separator = Utils.urlsafe_base64_encode(separator)
-          Auth.request %Q(#{host}/separator/#{bucket}/sep/#{encoded_separator})
-        end
+          url = Config.settings[:pub_host] + %Q(/separator/#{bucket}/sep/#{encoded_separator})
+          return HTTP.management_post(url)
+        end # set_separator
 
         def set_style(bucket, name, style)
-          host = Config.settings[:pub_host]
           encoded_name = Utils.urlsafe_base64_encode(name)
           encoded_style = Utils.urlsafe_base64_encode(style)
-          Auth.request %Q(#{host}/style/#{bucket}/name/#{encoded_name}/style/#{encoded_style})
-        end
+          url = Config.settings[:pub_host] + %Q(/style/#{bucket}/name/#{encoded_name}/style/#{encoded_style})
+          return HTTP.management_post(url)
+        end # set_style
 
         def unset_style(bucket, name)
-          host = Config.settings[:pub_host]
           encoded_name = Utils.urlsafe_base64_encode(name)
-          Auth.request %Q(#{host}/unstyle/#{bucket}/name/#{encoded_name})
-        end
+          url = Config.settings[:pub_host] + %Q(/unstyle/#{bucket}/name/#{encoded_name})
+          return HTTP.management_post(url)
+        end # unset_style
+      end # class << self
 
-      end
     end # module Misc
 end # module Qiniu
 

data/lib/qiniu/pfop.rb

@@ -0,0 +1,123 @@
+# -*- encoding: utf-8 -*-
+# vim: sw=2 ts=2
+
+require 'qiniu/adt'
+require 'qiniu/http'
+
+module Qiniu
+  module Fop
+    module Persistance
+
+      class PfopPolicy
+        include ADT::Policy
+
+        private
+        def initialize(bucket,
+                       key,
+                       fops,
+                       notify_url)
+          @bucket     = bucket
+          @key        = key
+          @notify_url = notify_url
+
+          self.fops!(fops)
+        end # initialize
+
+        public
+        PARAMS = {
+          # 字符串类型参数
+          :bucket     =>  "bucket",
+          :key        =>  "key",
+          :fops       =>  "fops",
+          :notify_url =>  "notifyURL",
+
+          # 数值类型参数
+          :force      =>  "force"
+        } # PARAMS
+
+        PARAMS.each_pair do |key, fld|
+          attr_accessor key
+        end
+
+        def params
+          return PARAMS
+        end # params
+
+        def fops! (fops)
+          if fops.is_a?(Hash) then
+            fops = fops.values
+          end
+
+          if fops.is_a?(Array) then
+            new_fops = []
+            fops.each do |v|
+              if v.is_a?(ApiSpecification) then
+                new_fops.push(v.to_s)
+              end
+            end
+
+            @fops = new_fops.join(";")
+          else
+            @fops = fops.to_s
+          end
+        end # fops!
+
+        def force!
+          @force = 1
+        end # force!
+
+        alias :to_s :to_json
+      end # class PfopPolicy
+
+      class << self
+
+        API_HOST = 'http://api.qiniu.com'
+
+        PFOP_URL = API_HOST + '/pfop/'
+
+        def pfop (args)
+          ### 生成fop指令串
+          if args.is_a?(PfopPolicy) then
+            # PfopPolicy的各个字段按固定顺序组织
+            body = args.to_query_string()
+          elsif args.is_a?(Hash) then
+            # 无法保证固定字段顺序
+            body = HTTP.generate_query_string(args)
+          else
+            # 由调用者保证固定字段顺序
+            body = args.to_s
+          end
+
+          ### 发送请求
+          return HTTP.management_post(PFOP_URL, body)
+        end # pfop
+
+        PREFOP_URL = API_HOST + '/status/get/prefop?id='
+
+        def prefop (persistent_id)
+          ### 抽取persistentId
+          if persistent_id.is_a?(Hash) then
+            pid = persistent_id['persistentId']
+          else
+            pid = persistent_id.to_s
+          end
+
+          ### 发送请求
+          url = PREFOP_URL + pid
+          return HTTP.api_get(url)
+        end # prefop
+
+        def generate_p1_url (url, fop)
+          # 如果fop是ApiSpecification，则各字段按固定顺序组织，保证一致性
+          # 否则由调用者保证固定字段顺序
+          fop = CGI.escape(fop.to_s).gsub('+', '%20')
+
+          ### 生成url
+          return url + '?p/1/' + fop
+        end # generate_pl_url
+
+      end # class << self
+
+    end # module Persistance
+  end # module Fop
+end # module Qiniu

data/lib/qiniu/resumable_upload.rb

@@ -97,19 +97,23 @@ module Qiniu
 
         def _call_binary_with_token(uptoken, url, data, content_type = nil, retry_times = 0)
           options = {
-              :method => :post,
-              :content_type => 'application/octet-stream',
-              :upload_signature_token => uptoken
+              :headers => {
+                  :content_type   => 'application/octet-stream',
+                  'Authorization' => 'UpToken ' + uptoken
+              }
           }
-          options[:content_type] = content_type if !content_type.nil? && !content_type.empty?
-          code, data = http_request url, data, options
-          unless Utils.is_response_ok?(code)
+          if !content_type.nil? && !content_type.empty? then
+              options[:headers][:content_type] = content_type 
+          end
+
+          code, data, raw_headers = HTTP.api_post(url, data, options)
+          unless HTTP.is_response_ok?(code)
               retry_times += 1
               if Config.settings[:auto_reconnect] && retry_times < Config.settings[:max_retry_times]
                   return _call_binary_with_token(uptoken, url, data, options[:content_type], retry_times)
               end
           end
-          [code, data]
+          return code, data, raw_headers
         end # _call_binary_with_token
 
         def _mkblock(uptoken, block_size, body)
@@ -146,9 +150,12 @@ module Qiniu
                     if result_length != body_length
                         raise FileSeekReadError.new(fpath, block_index, seek_pos, body_length, result_length)
                     end
-                    code, data = _mkblock(uptoken, block_size, body)
+
+                    code, data, raw_headers = _mkblock(uptoken, block_size, body)
+                    Utils.debug "Mkblk : #{code.inspect} #{data.inspect} #{raw_headers.inspect}"
+
                     body_crc32 = Zlib.crc32(body)
-                    if Utils.is_response_ok?(code) && data["crc32"] == body_crc32
+                    if HTTP.is_response_ok?(code) && data["crc32"] == body_crc32
                         progress[:ctx] = data["ctx"]
                         progress[:offset] = body_length
                         progress[:restsize] = block_size - body_length
@@ -160,6 +167,7 @@ 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, raw_headers
                     end
                 end
             elsif progress[:offset] + progress[:restsize] != block_size
@@ -177,9 +185,12 @@ module Qiniu
                     if result_length != body_length
                         raise FileSeekReadError.new(fpath, block_index, seek_pos, body_length, result_length)
                     end
-                    code, data = _putblock(progress[:host], uptoken, progress[:ctx], progress[:offset], body)
+
+                    code, data, raw_headers = _putblock(progress[:host], uptoken, progress[:ctx], progress[:offset], body)
+                    Utils.debug "Bput : #{code.inspect} #{data.inspect} #{raw_headers.inspect}"
+
                     body_crc32 = Zlib.crc32(body)
-                    if Utils.is_response_ok?(code) && data["crc32"] == body_crc32
+                    if HTTP.is_response_ok?(code) && data["crc32"] == body_crc32
                         progress[:ctx] = data["ctx"]
                         progress[:offset] += body_length
                         progress[:restsize] -= body_length
@@ -191,11 +202,12 @@ 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, raw_headers
                     end
                 end
             end
             # return
-            return [code, data]
+            return code, data, raw_headers
         end # _resumable_put_block
 
         def _block_count(fsize)
@@ -228,7 +240,7 @@ module Qiniu
                     #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)
-                    if Utils.is_response_ok?(code)
+                    if HTTP.is_response_ok?(code)
                         #checksums[block_index] = data["checksum"]
                         checksums[block_index] = data["ctx"]
                         if !block_notifier.nil? && block_notifier.respond_to?("notify")
@@ -254,7 +266,7 @@ module Qiniu
           path += '/mimeType/' + Utils.urlsafe_base64_encode(mime_type) if !mime_type.nil? && !mime_type.empty?
           path += '/meta/' + Utils.urlsafe_base64_encode(custom_meta) if !custom_meta.nil? && !custom_meta.empty?
           path += '/customer/' + customer if !customer.nil? && !customer.empty?
-          callback_query_string = Utils.generate_query_string(callback_params) if !callback_params.nil? && !callback_params.empty?
+          callback_query_string = HTTP.generate_query_string(callback_params) if !callback_params.nil? && !callback_params.empty?
           path += '/params/' + Utils.urlsafe_base64_encode(callback_query_string) if !callback_query_string.nil? && !callback_query_string.empty?
           path += '/rotate/' + rotate if !rotate.nil? && rotate.to_i >= 0
           url = uphost + path
@@ -287,19 +299,20 @@ module Qiniu
           checksums = []
           block_count.times{checksums << ''}
 
-          code, data = _resumable_put(uptoken, fh, checksums, progresses, block_notifier, chunk_notifier)
+          code, data, raw_headers = _resumable_put(uptoken, fh, checksums, progresses, block_notifier, chunk_notifier)
 
-          if Utils.is_response_ok?(code)
+          if HTTP.is_response_ok?(code)
             uphost = data["host"]
             entry_uri = bucket + ':' + key
-            code, data = _mkfile(uphost, uptoken, entry_uri, fsize, checksums, mime_type, custom_meta, customer, callback_params, rotate)
+            code, data, raw_headers = _mkfile(uphost, uptoken, entry_uri, fsize, checksums, mime_type, custom_meta, customer, callback_params, rotate)
+            Utils.debug "Mkfile : #{code.inspect} #{data.inspect} #{raw_headers.inspect}"
           end
 
-          if Utils.is_response_ok?(code)
+          if HTTP.is_response_ok?(code)
             Utils.debug "File #{fh.path} {size: #{fsize}} successfully uploaded."
           end
 
-          [code, data]
+          return code, data, raw_headers
         end # _resumable_upload
       end # self class
     end # module Storage

data/lib/qiniu/tokens/qbox_token.rb

@@ -23,7 +23,7 @@ module Qiniu
           signature += '?' + query_string if !query_string.nil? && !query_string.empty?
           signature += "\n"
           if @params.is_a?(Hash)
-              params_string = Utils.generate_query_string(@params)
+              params_string = HTTP.generate_query_string(@params)
               signature += params_string
           end
           signature

data/lib/qiniu/upload.rb

@@ -28,10 +28,20 @@ module Qiniu
         if callback_params.nil?
           callback_params = {:bucket => bucket, :key => key, :mime_type => mime_type}
         end
-        callback_query_string = Utils.generate_query_string(callback_params)
+        callback_query_string = HTTP.generate_query_string(callback_params)
+
         url = Config.settings[:up_host] + '/upload'
+        post_data = {
+          :params     => callback_query_string,
+          :action     => action_params,
+          :file       => File.new(local_file, 'rb'),
+          :multipart  => true
+        }
+        if !uptoken.nil? then
+          post_data[:auth] = uptoken unless uptoken.nil?
+        end
 
-        Utils.upload_multipart_data(url, local_file, action_params, callback_query_string, uptoken)
+        return HTTP.api_post(url, post_data)
       end # upload_with_token
 
       def upload_with_token_2(uptoken,
@@ -59,7 +69,7 @@ module Qiniu
         end
 
         ### 发送请求
-        Utils.http_request url, post_data
+        HTTP.api_post(url, post_data)
       end # upload_with_token_2
 
       ### 授权举例

data/lib/qiniu/utils.rb

@@ -31,20 +31,13 @@ module Qiniu
         {}
       end
 
-      def is_response_ok?(status_code)
-          status_code/100 == 2
-      end
-
-      def response_error(status_code, errmsg)
-          [status_code, {"error" => errmsg}]
-      end
-
       def debug(msg)
           if Config.settings[:enable_debug]
               Log.logger.debug(msg)
           end
       end
 
+      ### 已过时，仅作为兼容接口保留
       def send_request_with url, data = nil, options = {}
         options[:method] = Config.settings[:method] unless options[:method]
         options[:content_type] = Config.settings[:content_type] unless options[:content_type]
@@ -69,7 +62,7 @@ module Qiniu
           response = RestClient.post(url, data, header_options)
         end
         code = response.respond_to?(:code) ? response.code.to_i : 0
-        unless is_response_ok?(code)
+        unless HTTP.is_response_ok?(code)
           raise RequestFailed.new("Request Failed", response)
         else
           data = {}
@@ -80,6 +73,7 @@ module Qiniu
         [code, data, raw_headers]
       end # send_request_with
 
+      ### 已过时，仅作为兼容接口保留
       def http_request url, data = nil, options = {}
         retry_times = 0
         begin
@@ -107,23 +101,6 @@ module Qiniu
         end
       end
 
-      def upload_multipart_data(url, filepath, action_string, callback_query_string = '', uptoken = nil)
-          post_data = {
-            :params => callback_query_string,
-            :action => action_string,
-            :file => File.new(filepath, 'rb'),
-            :multipart => true
-          }
-          post_data[:auth] = uptoken unless uptoken.nil?
-          http_request url, post_data
-      end
-
-      def generate_query_string(params)
-        return params if params.is_a?(String)
-        total_param = params.map { |key, value| %Q(#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s).gsub('+', '%20')}) }
-        total_param.join("&")
-      end
-
       def crc32checksum(filepath)
         File.open(filepath, "rb") { |f| Zlib.crc32 f.read }
       end

data/lib/qiniu/version.rb

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

data/qiniu.gemspec

@@ -3,8 +3,8 @@
 require File.expand_path('../lib/qiniu/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["why404"]
-  gem.email         = ["why404@gmail.com"]
+  gem.authors       = ["why404","BluntBlade"]
+  gem.email         = ["sdk@qiniu.com"]
   gem.description   = %q{Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html}
   gem.summary       = %q{Qiniu Resource (Cloud) Storage SDK for Ruby}
   gem.homepage      = "https://github.com/qiniu/ruby-sdk"
@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.name          = "qiniu"
   gem.require_paths = ["lib"]
   gem.version       = Qiniu::Version.to_s
+  gem.license       = "MIT"
 
   # specify any dependencies here; for example:
   gem.add_development_dependency "rake", ">= 0.9"

data/spec/qiniu/pfop_spec.rb

@@ -0,0 +1,89 @@
+# -*- encoding: utf-8 -*-
+# vim: sw=2 ts=2
+
+require 'spec_helper'
+require 'qiniu/auth'
+require 'qiniu'
+require 'qiniu/fop'
+
+module Qiniu
+  module Fop
+    module Persistance
+      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
+
+          pic_fname = "image_logo_for_test.png"
+          @key = make_unique_key_in_bucket(pic_fname)
+
+          local_file = File.expand_path('../' + pic_fname, __FILE__)
+
+          ### 检查测试文件存在性
+          code, body, headers = Qiniu::Storage.stat(@bucket, @key)
+          if code == 404 || code == 612 then
+            # 文件不存在，尝试上传
+            pp = Qiniu::Auth.PutPolicy.new(@bucket, @key)
+            code, body, headers = Qiniu::Storage.upload_with_put_policy(
+              pp,
+              local_file
+            )
+            puts "Put a test file for Persistance cases"
+            puts code.inspect
+            puts body.inspect
+            puts header.inspect
+          end
+        end
+
+        after :all do
+          ### 不删除Bucket以备下次使用
+        end
+
+        context ".pfop" do
+          it "should works" do
+            pp = Persistance::PfopPolicy.new(
+              @bucket,
+              @key,
+              'imageView2/1/w/80/h/80',   # fops
+              'www.baidu.com'             # notify_url
+            )
+
+            code, data, headers = Qiniu::Fop::Persistance.pfop(pp)
+            code.should == 200
+            puts data.inspect
+          end
+        end
+
+        context ".prefop" do
+          it "should works" do
+            code, data, headers = Qiniu::Fop::Persistance.prefop('fakePersistentId')
+            code.should == 612
+            puts code.inspect
+            puts data.inspect
+            puts headers.inspect
+          end
+        end
+
+        context ".p1" do
+          it "should works" do
+            url = 'http://fake.qiniudn.com/fake.jpg'
+            fop = 'imageView2/1/w/80/h/80'
+            target_url = "#{url}?p/1/#{CGI.escape(fop).gsub('+', '%20')}"
+
+            p1_url = Qiniu::Fop::Persistance.generate_p1_url(url, fop)
+            p1_url.should == target_url
+            puts p1_url.inspect
+          end
+        end
+      end
+    end # module Persistance
+  end # module Fop
+end # module Qiniu

metadata

@@ -1,123 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: qiniu
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - why404
+- BluntBlade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-21 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.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
 - !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'
 email:
-- why404@gmail.com
+- sdk@qiniu.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -128,14 +129,17 @@ files:
 - lib/qiniu-rs.rb
 - lib/qiniu.rb
 - lib/qiniu/abstract.rb
+- lib/qiniu/adt.rb
 - lib/qiniu/auth.rb
 - lib/qiniu/config.rb
 - lib/qiniu/exceptions.rb
 - lib/qiniu/fop.rb
+- lib/qiniu/http.rb
 - lib/qiniu/image.rb
 - lib/qiniu/log.rb
 - lib/qiniu/management.rb
 - lib/qiniu/misc.rb
+- lib/qiniu/pfop.rb
 - lib/qiniu/resumable_upload.rb
 - lib/qiniu/storage.rb
 - lib/qiniu/tokens/access_token.rb
@@ -152,6 +156,7 @@ files:
 - spec/qiniu/image_spec.rb
 - spec/qiniu/management_spec.rb
 - spec/qiniu/misc_spec.rb
+- spec/qiniu/pfop_spec.rb
 - spec/qiniu/qiniu_spec.rb
 - spec/qiniu/tokens/qbox_token_spec.rb
 - spec/qiniu/upload_spec.rb
@@ -159,7 +164,8 @@ files:
 - spec/qiniu/version_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/qiniu/ruby-sdk
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -167,17 +173,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.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Qiniu Resource (Cloud) Storage SDK for Ruby
@@ -188,6 +194,7 @@ test_files:
 - spec/qiniu/image_spec.rb
 - spec/qiniu/management_spec.rb
 - spec/qiniu/misc_spec.rb
+- spec/qiniu/pfop_spec.rb
 - spec/qiniu/qiniu_spec.rb
 - spec/qiniu/tokens/qbox_token_spec.rb
 - spec/qiniu/upload_spec.rb