qiniu-rs 2.0.5 → 2.1.1

data/Gemfile.lock

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

data/README.md

@@ -1,8 +1,8 @@
-# Qiniu Resource (Cloud) Storage SDK for Ruby - [![Build Status](https://secure.travis-ci.org/why404/qiniu-rs.png?branch=master)](http://travis-ci.org/why404/qiniu-rs) [![Dependency Status](https://gemnasium.com/why404/qiniu-rs.png)](https://gemnasium.com/why404/qiniu-rs)
+# Qiniu Resource (Cloud) Storage SDK for Ruby - [![Build Status](https://secure.travis-ci.org/why404/qiniu-rs-for-ruby.png?branch=master)](http://travis-ci.org/why404/qiniu-rs-for-ruby) [![Dependency Status](https://gemnasium.com/why404/qiniu-rs-for-ruby.png)](https://gemnasium.com/why404/qiniu-rs-for-ruby)
 
 # 关于
 
-此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v1/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
+此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v2/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
 
 ## 安装
 

data/lib/qiniu/rs.rb

@@ -115,6 +115,10 @@ module Qiniu
         Image.preivew_url(url, spec)
       end
 
+      def generate_upload_token(scope, expires_in, callback_url = nil, return_url = nil)
+        Utils.generate_upload_token(scope, expires_in, callback_url, return_url)
+      end
+
     end
 
   end

data/lib/qiniu/rs/auth.rb

@@ -59,7 +59,7 @@ module Qiniu
         end
 
         def call_with_signature(url, data, retry_times = 0)
-          code, data = http_request url, data, {:signature_auth => true}
+          code, data = http_request url, data, {:qbox_signature_token => generate_qbox_signature(url, data)}
           [code, data]
         end
 

data/lib/qiniu/rs/config.rb

@@ -21,9 +21,7 @@ module Qiniu
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
           :rs_host         => "http://rs.qbox.me:10100",
-          #:rs_host         => "http://localhost:10100",
           :io_host         => "http://iovip.qbox.me",
-          #:io_host         => "http://localhost:10200",
           :client_id       => "a75604760c4da4caaa456c0c5895c061c3065c5a",
           :client_secret   => "75df554a39f58accb7eb293b550fa59618674b7d",
           :access_key      => "",

data/lib/qiniu/rs/utils.rb

@@ -38,12 +38,15 @@ module Qiniu
           :accept => :json,
           :user_agent => Config.settings[:user_agent]
         }
-        if options[:signature_auth] && options[:signature_auth] == true
-          signature_token = generate_qbox_signature(Config.settings[:access_key], Config.settings[:secret_key], url, data)
-          header_options.merge!('Authorization' => "QBox #{signature_token}")
+        auth_token = nil
+        if !options[:qbox_signature_token].nil? && !options[:qbox_signature_token].empty?
+          auth_token = 'QBox ' + options[:qbox_signature_token]
+        #elsif !options[:upload_signature_token].nil? && !options[:upload_signature_token].empty?
+        #  auth_token = 'UpToken ' + options[:upload_signature_token]
         elsif options[:access_token]
-          header_options.merge!('Authorization' => "Bearer #{options[:access_token]}")
+          auth_token = 'Bearer ' + options[:access_token]
         end
+        header_options.merge!('Authorization' => auth_token) unless auth_token.nil?
         case options[:method]
         when :get
           response = RestClient.get url, header_options
@@ -130,7 +133,9 @@ module Qiniu
         File.open(filepath, "rb") { |f| Zlib.crc32 f.read }
       end
 
-      def generate_qbox_signature(access_key, secret_key, url, params)
+      def generate_qbox_signature(url, params)
+        access_key = Config.settings[:access_key]
+        secret_key = Config.settings[:secret_key]
         uri = URI.parse(url)
         signature = uri.path
         query_string = uri.query
@@ -146,6 +151,19 @@ module Qiniu
         %Q(#{access_key}:#{encoded_digest})
       end
 
+      def generate_upload_token(scope, expires_in, callback_url = nil, return_url = nil)
+        access_key = Config.settings[:access_key]
+        secret_key = Config.settings[:secret_key]
+        params = {:scope => scope, :deadline => Time.now.to_i + expires_in}
+        params[:callbackUrl] = callback_url if !callback_url.nil? && !calback_url.empty?
+        params[:returnUrl] = return_url if !return_url.nil? && !return_url.empty?
+        signature = urlsafe_base64_encode(params.to_json)
+        hmac = HMAC::SHA1.new(secret_key)
+        hmac.update(signature)
+        encoded_digest = urlsafe_base64_encode(hmac.digest)
+        %Q(#{access_key}:#{encoded_digest}:#{signature})
+      end
+
     end
   end
 end

data/lib/qiniu/rs/version.rb

@@ -2,6 +2,6 @@
 
 module Qiniu
   module RS
-    VERSION = "2.0.5"
+    VERSION = "2.1.1"
   end
 end

data/spec/qiniu/rs_spec.rb

@@ -149,5 +149,13 @@ module Qiniu
       end
     end
 
+    context ".generate_upload_token" do
+      it "should works" do
+        data = Qiniu::RS.generate_upload_token('test_bucket', 3600)
+        data.should_not be_empty
+        puts data.inspect
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu-rs
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3585720177753596868
+      hash: 1345358308427521600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3585720177753596868
+      hash: 1345358308427521600
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24