Merge pull request #126 from BluntBlade/master

合并一些常规修正逻辑

.rspec

@@ -1 +1 @@
---colour -f nested
+--colour -f documentation

.travis.yml

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

CHANGELOG.md

@@ -1,5 +1,50 @@
 ## CHANGE LOG
 
+### v6.5.0
+
+- 为 Qiniu::Auth 添加一个异常处理逻辑，在 Access Key 和 Secret Key 未正常设置（nil 值）的情况下给出正确提示。[https://github.com/qiniu/ruby-sdk/pull/126](https://github.com/qiniu/ruby-sdk/pull/126)
+
+### v6.4.2
+
+- gem 兼容性调整 。 [https://github.com/qiniu/ruby-sdk/pull/122](https://github.com/qiniu/ruby-sdk/pull/122)
+
+- 上传策略参数调整 。 [https://github.com/qiniu/ruby-sdk/pull/120](https://github.com/qiniu/ruby-sdk/pull/120)
+
+### v6.4.1
+
+- 将 mime-types 的依赖版本升级到 2.4.3 。 [https://github.com/qiniu/ruby-sdk/pull/113](https://github.com/qiniu/ruby-sdk/pull/113)
+
+### v6.4.0
+
+- 为 put_with_put_policy() 添加 opts 参数，允许使用 :content_type 键指定上传文件的 mime type。 [https://github.com/qiniu/ruby-sdk/pull/111](https://github.com/qiniu/ruby-sdk/pull/111)
+
+### v6.3.2
+
+- 调整上传host。 [https://github.com/qiniu/ruby-sdk/pull/103](https://github.com/qiniu/ruby-sdk/pull/103)
+
+### v6.3.1
+
+- 为过期方法添加说明。 [https://github.com/qiniu/ruby-sdk/pull/98](https://github.com/qiniu/ruby-sdk/pull/98)
+- 修改上传域名。 [https://github.com/qiniu/ruby-sdk/pull/99](https://github.com/qiniu/ruby-sdk/pull/99)
+- 增加pfop参数。 [https://github.com/qiniu/ruby-sdk/pull/100](https://github.com/qiniu/ruby-sdk/pull/100)
+
+### v6.3.0
+
+- 添加 authorize_download_url_2 方法，对包含中文或其它 utf-8 字符的 Key 做下载授权。 [https://github.com/qiniu/ruby-sdk/pull/95](https://github.com/qiniu/ruby-sdk/pull/95)
+
+### v6.2.4
+
+- 调整User Agent。 [https://github.com/qiniu/ruby-sdk/pull/94](https://github.com/qiniu/ruby-sdk/pull/94)
+
+### v6.2.3
+
+- 为上传策略添加`persistentPipeline`参数，用于指明使用哪个命名转码队列。  [https://github.com/qiniu/ruby-sdk/pull/93](https://github.com/qiniu/ruby-sdk/pull/93)
+
+### v6.2.2
+
+- 为/pfop接口添加`pipeline`参数，用于指明使用哪个命名转码队列。  [https://github.com/qiniu/ruby-sdk/pull/92](https://github.com/qiniu/ruby-sdk/pull/92)
+- 为authorize_download_url()添加`:fop`参数，用于生成含数据处理指令的授权下载URL。
+
 ### v6.2.1
 
 - 去除已废弃的publish/unpublish接口。 [https://github.com/qiniu/ruby-sdk/pull/90](https://github.com/qiniu/ruby-sdk/pull/90) (#8143)

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in qiniu-s3.gemspec
-gemspec
+# Specify your gem's dependencies in qiniu.gemspec
+gemspec :name => 'qiniu'
 
 # platforms :jruby do
 #   gem "jruby-openssl"

Gemfile.lock

@@ -1,30 +1,37 @@
 PATH
   remote: .
   specs:
-    qiniu (6.2.1)
-      json (~> 1.7)
+    qiniu (6.5.0)
+      json (~> 1.8)
       mime-types (~> 1.19)
-      rest-client (~> 1.6)
+      rest-client (~> 1.7.3)
       ruby-hmac (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     fakeweb (1.3.0)
-    json (1.8.1)
-    mime-types (1.23)
-    rake (10.0.3)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    json (1.8.2)
+    mime-types (1.25.1)
+    netrc (0.10.3)
+    rake (10.4.2)
+    rest-client (1.7.3)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     ruby-hmac (0.4.0)
 
 PLATFORMS

README.md

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

lib/qiniu.rb

@@ -64,12 +64,11 @@ 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, raw_headers = Storage.upload_with_token(opts[:uptoken],
+          code, data, raw_headers = Storage.resumable_upload_with_token(opts[:uptoken],
                                             opts[:file],
                                             opts[:bucket],
                                             opts[:key],
                                             opts[:mime_type],
-                                            opts[:note],
                                             opts[:customer],
                                             opts[:callback_params],
                                             opts[:rotate])

lib/qiniu/auth.rb

@@ -3,6 +3,7 @@
 
 require 'hmac-sha1'
 require 'uri'
+require 'cgi'
 
 require 'qiniu/exceptions'
 
@@ -24,6 +25,18 @@ module Qiniu
           # 默认授权期1小时
           return Time.now.to_i + DEFAULT_AUTH_SECONDS
         end # calculate_deadline
+
+        def calculate_hmac_sha1_digest(sk, str)
+          begin
+            sign = HMAC::SHA1.new(sk).update(str).digest
+          rescue RuntimeError => e
+            raise RuntimeError, "Please set Qiniu's access_key and secret_key before authorize any tokens."
+          rescue
+            raise
+          else
+            return sign
+          end
+        end
       end # class << self
 
       class PutPolicy
@@ -48,14 +61,18 @@ module Qiniu
           :return_url             => "returnUrl"           ,
           :return_body            => "returnBody"          ,
           :callback_url           => "callbackUrl"         ,
+          :callback_host          => "callbackHost"        ,
           :callback_body          => "callbackBody"        ,
+          :callback_body_type     => "callbackBodyType"    ,
           :persistent_ops         => "persistentOps"       ,
           :persistent_notify_url  => "persistentNotifyUrl" ,
+          :persistent_pipeline    => "persistentPipeline"  ,
 
           # 数值类型参数
           :deadline               => "deadline"            ,
           :insert_only            => "insertOnly"          ,
           :fsize_limit            => "fsizeLimit"          ,
+          :callback_fetch_key     => "callbackFetchKey"    ,
           :detect_mime            => "detectMime"          ,
           :mime_limit             => "mimeLimit"
         } # PARAMS
@@ -138,20 +155,33 @@ module Qiniu
           access_key = Config.settings[:access_key]
           secret_key = Config.settings[:secret_key]
 
+          download_url = url
+
+          ### URL变换：追加FOP指令
+          if args[:fop].is_a?(String) && args[:fop] != '' then
+            if download_url.index('?').is_a?(Fixnum) then
+              # 已有参数
+              download_url = "#{download_url}&#{args[:fop]}"
+            else
+              # 尚无参数
+              download_url = "#{download_url}?#{args[:fop]}"
+            end
+          end
+
           ### 授权期计算
           e = Auth.calculate_deadline(args[:expires_in], args[:deadline])
 
           ### URL变换：追加授权期参数
-          if url.index('?').is_a?(Fixnum) then
+          if download_url.index('?').is_a?(Fixnum) then
             # 已有参数
-            download_url = "#{url}&e=#{e}"
+            download_url = "#{download_url}&e=#{e}"
           else
             # 尚无参数
-            download_url = "#{url}?e=#{e}"
+            download_url = "#{download_url}?e=#{e}"
           end
 
           ### 生成数字签名
-          sign = HMAC::SHA1.new(secret_key).update(download_url).digest
+          sign = calculate_hmac_sha1_digest(secret_key, download_url)
           encoded_sign = Utils.urlsafe_base64_encode(sign)
 
           ### 生成下载授权凭证
@@ -161,6 +191,21 @@ module Qiniu
           return "#{download_url}&token=#{dntoken}"
         end # authorize_download_url
 
+        ### 对包含中文或其它 utf-8 字符的 Key 做下载授权
+        def authorize_download_url_2(domain, key, args = EMPTY_ARGS)
+          url_encoded_key = CGI::escape(key)
+
+          schema = args[:schema] || "http"
+          port   = args[:port]
+
+          if port.nil? then
+            download_url = "#{schema}://#{domain}/#{url_encoded_key}"
+          else
+            download_url = "#{schema}://#{domain}:#{port}/#{url_encoded_key}"
+          end
+          return authorize_download_url(download_url, args)
+        end # authorize_download_url_2
+
         def generate_acctoken(url, body = '')
           ### 提取AK/SK信息
           access_key = Config.settings[:access_key]
@@ -186,7 +231,7 @@ module Qiniu
           end
 
           ### 生成数字签名
-          sign = HMAC::SHA1.new(secret_key).update(signing_str).digest
+          sign = calculate_hmac_sha1_digest(secret_key, signing_str)
           encoded_sign = Utils.urlsafe_base64_encode(sign)
 
           ### 生成管理授权凭证
@@ -205,7 +250,7 @@ module Qiniu
           encoded_put_policy = Utils.urlsafe_base64_encode(put_policy.to_json)
 
           ### 生成数字签名
-          sign = HMAC::SHA1.new(secret_key).update(encoded_put_policy).digest
+          sign = calculate_hmac_sha1_digest(secret_key, encoded_put_policy)
           encoded_sign = Utils.urlsafe_base64_encode(sign)
 
           ### 生成上传授权凭证

lib/qiniu/config.rb

@@ -15,16 +15,15 @@ module Qiniu
       class << self
 
         DEFAULT_OPTIONS = {
-          :user_agent      => 'Qiniu-RS-Ruby-SDK-' + Version.to_s + '()',
+          :user_agent      => 'QiniuRuby/' + Version.to_s + ' ('+RUBY_PLATFORM+')' + ' Ruby/'+ RUBY_VERSION,
           :method          => :post,
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
           :rs_host         => "http://rs.qiniu.com",
+          :rsf_host        => "http://rsf.qbox.me",
           :up_host         => "http://up.qiniu.com",
           :pub_host        => "http://pu.qbox.me:10200",
           :eu_host         => "http://eu.qbox.me",
-          :client_id       => "a75604760c4da4caaa456c0c5895c061c3065c5a",
-          :client_secret   => "75df554a39f58accb7eb293b550fa59618674b7d",
           :access_key      => "",
           :secret_key      => "",
           :auto_reconnect  => true,
@@ -32,16 +31,17 @@ module Qiniu
           :block_size      => 1024*1024*4,
           :chunk_size      => 1024*256,
           :enable_debug    => true,
-          :tmpdir          => Dir.tmpdir + File::SEPARATOR + 'Qiniu-RS-Ruby-SDK'
+          :tmpdir          => Dir.tmpdir + File::SEPARATOR + 'QiniuRuby'
         }
 
-        REQUIRED_OPTION_KEYS = [:access_key, :secret_key]
+        REQUIRED_OPTION_KEYS = [:access_key, :secret_key, :up_host]
 
         attr_reader :settings, :default_params
 
         def load config_file
           if File.exist?(config_file)
             config_options = YAML.load_file(config_file)
+            config_options.symbolize_keys!
             initialize_connect(config_options)
           else
             raise MissingConfError, config_file
@@ -49,7 +49,7 @@ module Qiniu
         end
 
         def initialize_connect options = {}
-          @settings = DEFAULT_OPTIONS.merge(options)
+          @settings = DEFAULT_OPTIONS.merge!(options)
           REQUIRED_OPTION_KEYS.each do |opt|
             raise MissingArgsError, [opt] unless @settings.has_key?(opt)
           end

lib/qiniu/management.rb

@@ -1,10 +1,48 @@
 # -*- encoding: utf-8 -*-
 # vim: sw=2 ts=2
 
+require 'qiniu/adt'
 require 'qiniu/http'
 
 module Qiniu
     module Storage
+      class ListPolicy
+        include ADT::Policy
+
+        private
+        def initialize(bucket,
+                       limit = 1000,
+                       prefix = '',
+                       delimiter = '')
+          @bucket     = bucket
+          @limit      = limit
+          @prefix     = prefix
+          @delimiter  = delimiter
+        end # initialize
+
+        public
+        PARAMS = {
+          # 字符串类型参数
+          :bucket     =>  "bucket",
+          :prefix     =>  "prefix",
+          :delimiter  =>  "delimiter",
+          :marker     =>  "marker",
+
+          # 数值类型参数
+          :limit      =>  "limit"
+        } # PARAMS
+
+        PARAMS.each_pair do |key, fld|
+          attr_accessor key
+        end
+
+        def params
+          return PARAMS
+        end # params
+
+        alias :to_s :to_query_string
+      end # class ListPolicy
+
       class << self
         include Utils
 
@@ -14,22 +52,6 @@ module Qiniu
           return HTTP.management_post(url)
         end # buckets
 
-        PRIVATE_BUCKET = 0
-        PUBLIC_BUCKET  = 1
-
-        def mkbucket(bucket_name, is_public = PUBLIC_BUCKET)
-          url = Config.settings[:rs_host] + '/mkbucket2/' + bucket_name + '/public/' + is_public.to_s
-          return HTTP.management_post(url)
-        end # mkbucket
-
-        def make_a_private_bucket(bucket_name)
-          return mkbucket(bucket_name, PRIVATE_BUCKET)
-        end # make_a_private_bucket
-
-        def make_a_public_bucket(bucket_name)
-          return mkbucket(bucket_name, PUBLIC_BUCKET)
-        end # make_a_public_bucket
-
         def stat(bucket, key)
           url = Config.settings[:rs_host] + '/stat/' + encode_entry_uri(bucket, key)
           return HTTP.management_post(url)
@@ -60,11 +82,6 @@ module Qiniu
           return HTTP.management_post(url)
         end # delete
 
-        def drop(bucket)
-          url = Config.settings[:rs_host] + "/drop/#{bucket}"
-          return HTTP.management_post(url)
-        end # drop
-
         def batch(command, bucket, keys)
           execs = []
           keys.each do |key|
@@ -107,6 +124,26 @@ module Qiniu
           save_as(bucket, key, source_image_url, mogrify_params_string)
         end # image_mogrify_save_as
 
+        def list(list_policy)
+          url = Config.settings[:rsf_host] + '/list?' + list_policy.to_query_string()
+
+          resp_code, resp_body, resp_headers = HTTP.management_post(url)
+          if resp_code == 0 || resp_code > 299 then
+            has_more = false
+            return resp_code, resp_body, resp_headers, has_more, list_policy
+          end
+
+          has_more = (resp_body['marker'].is_a?(String) && resp_body['marker'] != '')
+          if has_more then
+            new_list_policy = list_policy.clone()
+            new_list_policy.marker = resp_body['marker']
+          else
+            new_list_policy = list_policy
+          end
+
+          return resp_code, resp_body, resp_headers, has_more, new_list_policy
+        end # list
+
         private
 
         def _generate_cp_or_mv_opstr(command, source_bucket, source_key, target_bucket, target_key)
@@ -117,12 +154,13 @@ module Qiniu
 
         def _batch_cp_or_mv(command, *op_args)
           execs = []
-          op_args.each do |e| 
+          op_args.each do |e|
             execs << 'op=' + _generate_cp_or_mv_opstr(command, e[0], e[1], e[2], e[3]) if e.size == 4
-          end 
+          end
           url = Config.settings[:rs_host] + "/batch"
           return HTTP.management_post(url, execs.join("&"))
         end # _batch_cp_or_mv
-      end
+
+      end # class << self
     end # module Storage
 end # module Qiniu

lib/qiniu/misc.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+require 'qiniu/http'
+
 module Qiniu
     module Misc
       class << self

lib/qiniu/pfop.rb

@@ -30,6 +30,7 @@ module Qiniu
           :key        =>  "key",
           :fops       =>  "fops",
           :notify_url =>  "notifyURL",
+          :pipeline   =>  "pipeline",
 
           # 数值类型参数
           :force      =>  "force"

lib/qiniu/tokens/access_token.rb

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

lib/qiniu/tokens/download_token.rb

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

lib/qiniu/tokens/upload_token.rb

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

lib/qiniu/upload.rb

@@ -47,15 +47,23 @@ module Qiniu
       def upload_with_token_2(uptoken,
                               local_file,
                               key = nil,
-                              x_vars = nil)
+                              x_vars = nil,
+                              opts = {})
         ### 构造URL
         url = Config.settings[:up_host]
         url[/\/*$/] = ''
         url += '/'
 
         ### 构造HTTP Body
+        file = File.new(local_file, 'rb')
+        if not opts[:content_type].nil?
+          file.define_singleton_method("content_type") do
+            opts[:content_type]
+          end
+        end
+
         post_data = {
-          :file      => File.new(local_file, 'rb'),
+          :file      => file,
           :multipart => true,
         }
         if not uptoken.nil?
@@ -84,13 +92,14 @@ module Qiniu
       def upload_with_put_policy(put_policy,
                                  local_file,
                                  key = nil,
-                                 x_vars = nil)
+                                 x_vars = nil,
+                                 opts = {})
         uptoken = Auth.generate_uptoken(put_policy)
         if key.nil? then
           key = put_policy.key
         end
 
-        return upload_with_token_2(uptoken, local_file, key, x_vars)
+        return upload_with_token_2(uptoken, local_file, key, x_vars, opts)
       end # upload_with_put_policy
 
       private

lib/qiniu/version.rb

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

qiniu.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake", ">= 0.9"
   gem.add_development_dependency "rspec", ">= 2.11"
   gem.add_development_dependency "fakeweb", "~> 1.3"
-  gem.add_runtime_dependency "json", "~> 1.7"
-  gem.add_runtime_dependency "rest-client", "~> 1.6"
-  gem.add_runtime_dependency "mime-types", "~> 1.19"
+  gem.add_runtime_dependency "json", "~> 1.8"
+  gem.add_runtime_dependency "rest-client", "~> 1.7.3"
+  gem.add_runtime_dependency "mime-types", "~> 2.4.3"
   gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
   gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"
 end

rails3/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rails3/qiniu.gemspec
+gemspec :name => 'qiniu'

rails3/qiniu.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path('../../lib/qiniu/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  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"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  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"
+  gem.add_development_dependency "rspec", ">= 2.11"
+  gem.add_development_dependency "fakeweb", "~> 1.3"
+  gem.add_runtime_dependency "json", "~> 1.8"
+  gem.add_runtime_dependency "rest-client", "~> 1.7.3"
+  gem.add_runtime_dependency "mime-types", "~> 1.19"
+  gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
+  gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"
+end

spec/qiniu/auth_spec.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# vim: sw=2 ts=2
 
 require 'spec_helper'
 require 'qiniu/auth'
@@ -6,20 +7,13 @@ require 'qiniu/storage'
 require 'digest/sha1'
 
 module Qiniu
-  module Auth 
+  module Auth
     describe Auth do
 
       before :all do
-        @bucket = 'RubySDK-Test-Private'
-        @bucket = make_unique_bucket(@bucket)
-
-        ### 尝试创建Bucket
-        result = Qiniu::Storage.make_a_private_bucket(@bucket)
-        puts result.inspect
+        @bucket = 'rubysdk'
       end
-
       after :all do
-        ### 不删除Bucket以备下次使用
       end
 
       ### 测试私有资源下载
@@ -56,7 +50,12 @@ module Qiniu
           result.body.should_not be_empty
 
           ### 授权下载地址（带参数）
-          download_url = Qiniu::Auth.authorize_download_url(url + '?download/a.m3u8')
+          download_url = Qiniu::Auth.authorize_download_url(
+            url,
+            {
+              :fop => 'download/a.m3u8'
+            }
+          )
           puts "download_url=#{download_url}"
 
           result = RestClient.get(download_url)
@@ -69,7 +68,41 @@ module Qiniu
           puts data.inspect
         end
       end
-
     end
-  end # module Storage
+  end # module Auth
+
+  module Exception_Auth
+    describe Exception_Auth, :not_set_ak_sk => true do
+      ### 测试未设置 ak/sk 的异常抛出情况
+      context ".not_set_ak_sk" do
+        it "should works" do
+          puts Qiniu::Config.instance_variable_get("@settings").inspect
+
+          begin
+            uptoken = Qiniu::Auth.generate_uptoken({})
+          rescue => e
+            e.message.should == "Please set Qiniu's access_key and secret_key before authorize any tokens."
+          else
+            fail "Not raise any exception."
+          end
+
+          begin
+            download_url = Qiniu::Auth.authorize_download_url("http://test.qiniudn.com/a_private_file")
+          rescue => e
+            e.message.should == "Please set Qiniu's access_key and secret_key before authorize any tokens."
+          else
+            fail "Not raise any exception."
+          end
+
+          begin
+            acctoken = Qiniu::Auth.generate_acctoken("http://rsf.qbox.me/list")
+          rescue => e
+            e.message.should == "Please set Qiniu's access_key and secret_key before authorize any tokens."
+          else
+            fail "Not raise any exception."
+          end
+        end
+      end
+    end
+  end # module Exception_Auth
 end # module Qiniu

spec/qiniu/image_spec.rb

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

spec/qiniu/management_spec.rb

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

spec/qiniu/misc_spec.rb

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

spec/qiniu/pfop_spec.rb

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

spec/qiniu/qiniu_spec.rb

@@ -9,15 +9,10 @@ module Qiniu
   describe Qiniu do
 
     before :all do
-      @bucket = 'RubySDK-Test'
-      @bucket = make_unique_bucket(@bucket)
+      @bucket = 'rubysdk'
 
       @test_image_bucket = @bucket
 
-      ### 尝试创建Bucket
-      result = Qiniu.mkbucket(@bucket)
-      puts result.inspect
-
       @key = Digest::SHA1.hexdigest Time.now.to_s
       @key = make_unique_key_in_bucket(@key)
 
@@ -34,13 +29,12 @@ module Qiniu
     end
 
     after :all do
-      ### 不删除Bucket以备下次使用
     end
 
     context ".buckets" do
       it "should works" do
         result = Qiniu.buckets
-        result.should_not be_false
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -48,7 +42,7 @@ module Qiniu
     context ".set_protected" do
       it "should works" do
         result = Qiniu.set_protected(@bucket, 1)
-        result.should_not be_false
+        expect(result).to eq(true)
         puts result.inspect
       end
     end
@@ -56,7 +50,7 @@ module Qiniu
     context ".set_separator" do
       it "should works" do
         result = Qiniu.set_separator(@bucket, "-")
-        result.should_not be_false
+        expect(result).to eq(true)
         puts result.inspect
       end
     end
@@ -64,7 +58,7 @@ module Qiniu
     context ".set_style" do
       it "should works" do
         result = Qiniu.set_style(@bucket, "small.jpg", "imageMogr/auto-orient/thumbnail/!120x120r/gravity/center/crop/!120x120/quality/80")
-        result.should_not be_false
+        expect(result).to eq(true)
         puts result.inspect
       end
     end
@@ -72,7 +66,7 @@ module Qiniu
     context ".unset_style" do
       it "should works" do
         result = Qiniu.unset_style(@bucket, "small.jpg")
-        result.should_not be_false
+        expect(result).to eq(true)
         puts result.inspect
       end
     end
@@ -88,7 +82,7 @@ module Qiniu
           :enable_crc32_check => true
         }
         result = Qiniu.upload_file(upload_opts)
-        result.should_not be_false
+        expect(result).to_not be_empty
         puts result.inspect
       end
 
@@ -138,24 +132,22 @@ module Qiniu
         File.unlink(localfile) if File.exists?(localfile)
         #expect
         puts result1.inspect
-        result1.should_not be_false
-        result1.should_not be_empty
+        expect(result1).to_not be_empty
         #stat
         result2 = Qiniu.stat(@bucket, key)
         puts result2.inspect
-        result2.should_not be_false
+        expect(result2).to_not be_empty
         #delete
         result3 = Qiniu.delete(@bucket, key)
         puts result3.inspect
-        result3.should_not be_false
+        expect(result3).to eq(true)
       end
     end
 
     context ".stat" do
       it "should works" do
         result = Qiniu.stat(@bucket, @key)
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -163,8 +155,7 @@ module Qiniu
     context ".get" do
       it "should works" do
         result = Qiniu.get(@bucket, @key, "qiniu_spec.rb", 10)
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -172,8 +163,7 @@ module Qiniu
     context ".download" do
       it "should works" do
         result = Qiniu.download(@bucket, @key, "rs_spec.rb", 10)
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -181,8 +171,7 @@ module Qiniu
     context ".batch" do
       it "should works" do
         result = Qiniu.batch("stat", @bucket, [@key])
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -190,8 +179,7 @@ module Qiniu
     context ".batch_stat" do
       it "should works" do
         result = Qiniu.batch_stat(@bucket, [@key])
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -199,8 +187,7 @@ module Qiniu
     context ".batch_get" do
       it "should works" do
         result = Qiniu.batch_get(@bucket, [@key])
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -208,8 +195,7 @@ module Qiniu
     context ".batch_download" do
       it "should works" do
         result = Qiniu.batch_download(@bucket, [@key])
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -242,42 +228,40 @@ module Qiniu
     context ".move" do
       it "should works" do
         result = Qiniu.move(@bucket, @key, @bucket, @key2)
-        result.should_not be_false
+        expect(result).to eq(true)
 
         result2 = Qiniu.stat(@bucket, @key2)
-        result2.should_not be_false
+        expect(result2).to_not be_empty
 
         result3 = Qiniu.move(@bucket, @key2, @bucket, @key)
-        result3.should_not be_false
+        expect(result3).to eq(true)
       end
     end
 
     context ".copy" do
       it "should works" do
         result = Qiniu.copy(@bucket, @key, @bucket, @key2)
-        result.should_not be_false
+        expect(result).to eq(true)
 
         result3 = Qiniu.delete(@bucket, @key2)
-        result3.should_not be_false
+        expect(result3).to eq(true)
       end
     end
 
     context ".delete" do
       it "should works" do
         result = Qiniu.delete(@bucket, @key)
-        result.should_not be_false
+        expect(result).to eq(true)
       end
     end
 
     context ".image_info" do
       it "should works" do
         data = Qiniu.get(@test_image_bucket, @test_image_key)
-        data.should_not be_false
-        data.should_not be_empty
+        expect(data).to_not be_empty
         puts data.inspect
         result = Qiniu.image_info(data["url"])
-        result.should_not be_false
-        result.should_not be_empty
+        expect(result).to_not be_empty
         puts result.inspect
       end
     end
@@ -285,8 +269,7 @@ module Qiniu
     context ".image_mogrify_save_as" do
       it "should works" do
         data = Qiniu.get(@test_image_bucket, @test_image_key)
-        data.should_not be_false
-        data.should_not be_empty
+        expect(data).to_not be_empty
         puts data.inspect
 
         dest_key = "cropped-" + @test_image_key
@@ -301,8 +284,7 @@ module Qiniu
           :auto_orient => true
         }
         result2 = Qiniu.image_mogrify_save_as(@test_image_bucket, dest_key, src_img_url, mogrify_options)
-        result2.should_not be_false
-        result2.should_not be_empty
+        expect(result2).to_not be_empty
         puts result2.inspect
       end
     end

spec/qiniu/tokens/qbox_token_spec.rb

@@ -7,7 +7,7 @@ module Qiniu
   module RS
     describe QboxToken do
       before :all do
-        @qbox_token = QboxToken.new(:url => 'www.qiniutek.com?key1=value1',
+        @qbox_token = QboxToken.new(:url => 'www.qiniu.com?key1=value1',
                                     :params => { :key2 => 'value2' })
         @qbox_token.access_key = 'access_key'
         @qbox_token.secret_key = 'secret_key'
@@ -21,7 +21,7 @@ module Qiniu
 
       context "#generate_signature" do
         it "should generate signature" do
-          @qbox_token.generate_signature.should == "www.qiniutek.com?key1=value1\nkey2=value2"
+          @qbox_token.generate_signature.should == "www.qiniu.com?key1=value1\nkey2=value2"
         end
       end
     end

spec/qiniu/upload_spec.rb

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

spec/qiniu/utils_spec.rb

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

spec/spec_helper.rb

@@ -8,6 +8,9 @@ RSpec.configure do |config|
   config.before :all do
     Qiniu.establish_connection! :access_key => ENV["QINIU_ACCESS_KEY"], :secret_key => ENV["QINIU_SECRET_KEY"]
   end
+  config.before :each, :not_set_ak_sk => true do
+    Qiniu.establish_connection! :access_key => nil, :secret_key => nil
+  end
 end
 
 def make_unique_bucket (bucket)