Merge pull request #16 from why404/master

publish v3.0.4 for hotfix

Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.0.1)
-      json (~> 1.7.3)
+    qiniu-rs (3.0.5)
+      json (~> 1.7.5)
       mime-types (~> 1.19)
       rest-client (~> 1.6.7)
       ruby-hmac (~> 0.4.0)
@@ -12,7 +12,7 @@ GEM
   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)

README.md

@@ -2,7 +2,7 @@
 
 # 关于
 
-此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v2/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
+此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v3/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
 
 ## 安装
 
@@ -20,7 +20,7 @@
 
 ## 使用
 
-参考文档：[七牛云存储 Ruby SDK 使用指南](http://docs.qiniutek.com/v2/sdk/ruby/)
+参考文档：[七牛云存储 Ruby SDK 使用指南](http://docs.qiniutek.com/v3/sdk/ruby/)
 
 ## 贡献代码
 

docs/README.md

@@ -870,7 +870,9 @@ name
 操作成功返回 `true`，否则返回 `false` 。
 
 除了使用 SDK 提供的方法，同样也可以借助七牛云存储提供的命令行辅助工具 [qboxrsctl](https://github.com/qiniu/devtools/tags) 达到同样的目的：
-␍    // 取消预览图规格别名为 <Name> 的 Style␍    qboxrsctl unstyle <Bucket> <Name>
+
+    // 取消预览图规格别名为 <Name> 的 Style
+    qboxrsctl unstyle <Bucket> <Name>
 
 
 <a name="watermarking-set-template"></a>

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.1"
+    VERSION = "3.0.5"
   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"
 
@@ -20,7 +20,7 @@ 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.0"
-  gem.add_runtime_dependency "json", "~> 1.7.3"
+  gem.add_runtime_dependency "json", "~> 1.7.5"
   gem.add_runtime_dependency "rest-client", "~> 1.6.7"
   gem.add_runtime_dependency "mime-types", "~> 1.19"
   gem.add_runtime_dependency "ruby-hmac", "~> 0.4.0"

spec/qiniu/rs_spec.rb

@@ -18,15 +18,6 @@ module Qiniu
       result.should_not be_false
     end
 
-=begin
-    context ".login!" do
-      it "should works" do
-        result = Qiniu::RS.login!("test@qbox.net", "test")
-        result.should be_true
-      end
-    end
-=end
-
     context ".buckets" do
       it "should works" do
         result = Qiniu::RS.buckets
@@ -124,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,20 +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",
-                                    :pub_host   => "http://183.136.128.84:10202"
-#=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