qiniu-rs 3.0.3 → 3.0.4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.0.3)
-      json (~> 1.7.3)
+    qiniu-rs (3.0.4)
+      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)

data/lib/qiniu/rs/version.rb

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

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

data/qiniu-rs.gemspec

@@ -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"

data/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__,

data/spec/spec_helper.rb

@@ -6,11 +6,6 @@ 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",
                                     :auth_url   => "http://m1.qbox.me:13001/oauth2/token",
@@ -19,6 +14,5 @@ RSpec.configure do |config|
                                     :up_host    => "http://m1.qbox.me:13019",
                                     :pub_host   => "http://m1.qbox.me:13012",
                                     :eu_host    => "http://m1.qbox.me:13050"
-=end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu-rs
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -762983906388000240
+      hash: 3686017908626256653
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -762983906388000240
+      hash: 3686017908626256653
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24