qiniu 6.4.2 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63cda6dcf5ebd659bdc35ee8e1a1b5adda2ded38
-  data.tar.gz: 5cd9bb60b47ff6e938197b97cd204f2e29dc101f
+  metadata.gz: 445c1054edf50c45ea525aae13c712ecb4fbd00d
+  data.tar.gz: ffb5c071f5c74d7f49f00927767377ee8e868d93
 SHA512:
-  metadata.gz: 67ca3c4009d3c1c8687171172f7b82a62c5446e329de50258091c51633d61ea652bc52aa4d69817fdb52490c5122f91527bda48a628fb193fe58e68533c05538
-  data.tar.gz: bad9f549eaffe56fc660cff16cc6355f8ff44d9f69fe43074b7909c72cb631900f744f8b08e96fd16bde6935e29ecd17533d31bf8853455ab6552a386db3ccd8
+  metadata.gz: ab95ba7f0557d14af30f7fee674c36b88323cbf715ae756bf92d5c6774a2176d4c790434a6e59c55d36ac359d32950a8f9f62cc60e9996c3077de060b2b7f42b
+  data.tar.gz: c2893489903aaaf9ac55bcf4efd15866bcfa9703a838bb8b382f8feac7bf66b2a566285aad56a9158c9ee00acec2c51679cac286e0f10a08cccbe042674841f5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 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)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu (6.4.1)
+    qiniu (6.5.0)
       json (~> 1.8)
       mime-types (~> 1.19)
       rest-client (~> 1.7.3)

data/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])

data/lib/qiniu/auth.rb

@@ -25,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
@@ -169,7 +181,7 @@ module Qiniu
           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)
 
           ### 生成下载授权凭证
@@ -219,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)
 
           ### 生成管理授权凭证
@@ -238,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)
 
           ### 生成上传授权凭证

data/lib/qiniu/version.rb

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

data/spec/qiniu/auth_spec.rb

@@ -68,7 +68,41 @@ module Qiniu
           puts data.inspect
         end
       end
+    end
+  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 Storage
+  end # module Exception_Auth
 end # module Qiniu

data/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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu
 version: !ruby/object:Gem::Version
-  version: 6.4.2
+  version: 6.5.0
 platform: ruby
 authors:
 - why404
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake