Merge pull request #18 from why404/master

避免gems依赖包冲突，调整为x.y（不加.z）更为宽松的依赖策略

Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.0.2)
-      json (~> 1.7.3)
+    qiniu-rs (3.0.6)
+      json (~> 1.7)
       mime-types (~> 1.19)
-      rest-client (~> 1.6.7)
-      ruby-hmac (~> 0.4.0)
+      rest-client (~> 1.6)
+      ruby-hmac (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    json (1.7.4)
+    json (1.7.5)
     mime-types (1.19)
     rake (0.9.2.2)
     rest-client (1.6.7)
@@ -22,7 +22,7 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
     ruby-hmac (0.4.0)
@@ -31,7 +31,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fakeweb (~> 1.3.0)
+  fakeweb (~> 1.3)
   qiniu-rs!
   rake (~> 0.9)
   rspec (~> 2.11)

lib/qiniu/rs/auth.rb

@@ -70,7 +70,13 @@ module Qiniu
             else
               code, data = Auth.call_with_signature(url, data, 0, options)
             end
-          rescue [MissingAccessToken, MissingRefreshToken, MissingUsernameOrPassword] => e
+          rescue MissingAccessToken => e
+            Log.logger.error e
+            code, data = 401, {}
+          rescue MissingRefreshToken => e
+            Log.logger.error e
+            code, data = 401, {}
+          rescue MissingUsernameOrPassword => e
             Log.logger.error e
             code, data = 401, {}
           end

lib/qiniu/rs/version.rb

@@ -2,6 +2,6 @@
 
 module Qiniu
   module RS
-    VERSION = "3.0.2"
+    VERSION = "3.0.6"
   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"
 
@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
   # 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.0"
-  gem.add_runtime_dependency "json", "~> 1.7.3"
-  gem.add_runtime_dependency "rest-client", "~> 1.6.7"
+  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 "ruby-hmac", "~> 0.4.0"
-  gem.add_runtime_dependency "jruby-openssl", "~> 0.7.7" if RUBY_PLATFORM == "java"
+  gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
+  gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"
 end

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

@@ -6,19 +6,13 @@ require 'rspec'
 
 RSpec.configure do |config|
   config.before :all do
-#=begin
-    Qiniu::RS.establish_connection! :access_key => "3fPHl_SLkPXdioqI_A8_NGngPWVJhlDk2ktRjogH",
-                                    :secret_key => "bXTPMDJrVYRJUiSDRFtFYwycVD_mjXxYWrCYlDHy",
-#=end
-=begin
-    Qiniu::RS.establish_connection! :access_key => "bE21M6FW9V7zAFrBY5psgKOKJQLiBj12qMWTpc57",
-                                    :secret_key => "uMo7Nyq_eDK_CuQ8_FYCxoTHQZqjiaPh-cbiKO7L",
+    Qiniu::RS.establish_connection! :access_key => "dFX_wMGVrRzwdWaraW-Qe5ZCDT-kcSmIAGKQOkXh",
+                                    :secret_key => "VllxxDfkn_h2ZIqeKYTnHJiN4LVODfDBlJHy_KsW",
                                     :auth_url   => "http://m1.qbox.me:13001/oauth2/token",
                                     :rs_host    => "http://m1.qbox.me:13003",
                                     :io_host    => "http://m1.qbox.me:13004",
                                     :up_host    => "http://m1.qbox.me:13019",
                                     :pub_host   => "http://m1.qbox.me:13012",
                                     :eu_host    => "http://m1.qbox.me:13050"
-=end
   end
 end