Merge pull request #15 from huobazi/master

修正 Qiniu::RS.generate_upload_toke 对参数处理和文档描述不一致

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.0.2)
+    qiniu-rs (3.0.3)
       json (~> 1.7.3)
       mime-types (~> 1.19)
       rest-client (~> 1.6.7)

lib/qiniu/rs/version.rb

@@ -2,6 +2,6 @@
 
 module Qiniu
   module RS
-    VERSION = "3.0.2"
+    VERSION = "3.0.3"
   end
 end

lib/qiniu/tokens/upload_token.rb

@@ -14,7 +14,7 @@ module Qiniu
 
         def initialize(opts = {})
           @scope = opts[:scope]
-          @expires_in = opts[:expires_in]
+          @expires_in = opts[:expires_in] || 3600
           @callback_url = opts[:callback_url]
           @callback_body_type = opts[:callback_body_type]
           @customer = opts[:customer]

qiniu-rs.gemspec

@@ -5,7 +5,7 @@ require File.expand_path('../lib/qiniu/rs/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["why404"]
   gem.email         = ["why404@gmail.com"]
-  gem.description   = %q{Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://docs.qiniutek.com/v2/sdk/ruby/}
+  gem.description   = %q{Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://docs.qiniutek.com/v3/sdk/ruby/}
   gem.summary       = %q{Qiniu Resource (Cloud) Storage SDK for Ruby}
   gem.homepage      = "https://github.com/qiniu/ruby-sdk"
 

spec/qiniu/rs_spec.rb

@@ -115,7 +115,7 @@ module Qiniu
 
     context ".upload_file" do
       it "should works" do
-        uptoken_opts = {:scope => @bucket, :expires_in => 3600}
+        uptoken_opts = {:scope => @bucket}
         upload_opts = {
           :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
           :file => __FILE__,

spec/spec_helper.rb

@@ -8,7 +8,7 @@ RSpec.configure do |config|
   config.before :all do
 #=begin
     Qiniu::RS.establish_connection! :access_key => "3fPHl_SLkPXdioqI_A8_NGngPWVJhlDk2ktRjogH",
-                                    :secret_key => "bXTPMDJrVYRJUiSDRFtFYwycVD_mjXxYWrCYlDHy",
+                                    :secret_key => "bXTPMDJrVYRJUiSDRFtFYwycVD_mjXxYWrCYlDHy"
 #=end
 =begin
     Qiniu::RS.establish_connection! :access_key => "bE21M6FW9V7zAFrBY5psgKOKJQLiBj12qMWTpc57",