qiniu-rs 3.2.2 → 3.3.0

data/lib/qiniu/rs.rb

@@ -17,6 +17,7 @@ module Qiniu
     autoload :AccessToken, 'qiniu/tokens/access_token'
     autoload :QboxToken, 'qiniu/tokens/qbox_token'
     autoload :UploadToken, 'qiniu/tokens/upload_token'
+    autoload :DownloadToken, 'qiniu/tokens/download_token'
     autoload :Abstract, 'qiniu/rs/abstract'
 
     class << self
@@ -100,12 +101,14 @@ module Qiniu
       end
 
       def upload_file opts = {}
-        [:uptoken, :file, :bucket, :key].each do |opt|
-          raise MissingArgsError, [opt] unless opts.has_key?(opt)
-        end
+        uncontained_opts = [:uptoken, :file, :bucket, :key] - opts.keys
+        raise MissingArgsError, uncontained_opts unless uncontained_opts.empty?
+
         source_file = opts[:file]
         raise NoSuchFileError, source_file unless File.exist?(source_file)
+
         opts[:enable_resumable_upload] = true unless opts.has_key?(:enable_resumable_upload)
+
         if opts[:enable_resumable_upload] && File::size(source_file) > Config.settings[:block_size]
           code, data = UP.upload_with_token(opts[:uptoken],
                                             opts[:file],
@@ -230,6 +233,15 @@ module Qiniu
         token_obj.generate_token
       end
 
+      def generate_download_token(opts = {})
+        token_obj = DownloadToken.new(opts)
+        token_obj.access_key = Config.settings[:access_key]
+        token_obj.secret_key = Config.settings[:secret_key]
+        #token_obj.expires_in = opts[:expires_in]
+        #token_obj.pattern = opts[:pattern]
+        token_obj.generate_token
+      end
+
     end
 
   end

data/lib/qiniu/rs/up.rb

@@ -58,7 +58,7 @@ module Qiniu
       class TmpData
           def initialize(dir, filename)
               @tmpdir = Config.settings[:tmpdir] + File::SEPARATOR + dir
-              FileUtils.mkdir_p(@tmpdir) unless Dir.exists?(@tmpdir)
+              FileUtils.mkdir_p(@tmpdir) unless File.directory?(@tmpdir)
               @tmpfile = @tmpdir + File::SEPARATOR + filename
           end
 
@@ -83,7 +83,7 @@ module Qiniu
           end
 
           def sweep!
-              FileUtils.rm_r(@tmpdir) if  Dir.exists?(@tmpdir)
+              FileUtils.rm_r(@tmpdir) if File.directory?(@tmpdir)
           end
       end
 
@@ -100,7 +100,6 @@ module Qiniu
                               customer = nil,
                               callback_params = nil,
                               rotate = nil)
-          raise NoSuchFileError, local_file unless File.exist?(local_file)
           begin
             ifile = File.open(local_file, 'rb')
             fh = FileData.new(ifile)
@@ -110,11 +109,7 @@ module Qiniu
               mime = MIME::Types.type_for local_file
               mime_type = mime.empty? ? 'application/octet-stream' : mime[0].content_type
             end
-            if fsize > Config.settings[:block_size]
-              code, data = _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type, custom_meta, customer, callback_params, rotate)
-            else
-              code, data = IO.upload_with_token(uptoken, local_file, bucket, key, mime_type, custom_meta, callback_params, true, rotate)
-            end
+            code, data = _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type, custom_meta, customer, callback_params, rotate)
             [code, data]
           ensure
             ifile.close unless ifile.nil?
@@ -175,7 +170,7 @@ module Qiniu
             _call_binary_with_token(uptoken, url, body)
         end
 
-        def _resumable_put_block(uptoken, fh, block_index, block_size, chunk_size, progress, retry_times = 1, notifier)
+        def _resumable_put_block(uptoken, fh, block_index, block_size, chunk_size, progress, retry_times, notifier)
             code, data = 0, {}
             fpath = fh.path
             # this block has never been uploaded.
@@ -323,6 +318,7 @@ module Qiniu
         end
 
       end
+
     end
   end
 end

data/lib/qiniu/rs/version.rb

@@ -4,8 +4,8 @@ module Qiniu
   module RS
     module Version
       MAJOR = 3
-      MINOR = 2
-      PATCH = 2
+      MINOR = 3
+      PATCH = 0
       # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
       #
       # Example

data/lib/qiniu/tokens/download_token.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+require 'json'
+require 'qiniu/tokens/access_token'
+require 'qiniu/rs/utils'
+
+module Qiniu
+  module RS
+      class DownloadToken < AccessToken
+
+        include Utils
+
+        attr_accessor :pattern, :expires_in
+
+        def initialize(opts = {})
+          @pattern = opts[:pattern] || "*"
+          @expires_in = opts[:expires_in] || 3600
+        end
+
+        def generate_signature
+          params = {"S" => @pattern, "E" => Time.now.to_i + @expires_in}
+          Utils.urlsafe_base64_encode(params.to_json)
+        end
+
+        def generate_token
+          signature = generate_signature
+          encoded_digest = generate_encoded_digest(signature)
+          %Q(#{@access_key}:#{encoded_digest}:#{signature})
+        end
+
+      end
+  end
+end

data/lib/qiniu/tokens/qbox_token.rb

@@ -8,6 +8,8 @@ module Qiniu
   module RS
       class QboxToken < AccessToken
 
+        include Utils
+
         attr_accessor :url, :params
 
         def initialize(opts = {})
@@ -20,16 +22,16 @@ module Qiniu
           signature = uri.path
           query_string = uri.query
           signature += '?' + query_string if !query_string.nil? && !query_string.empty?
-          signature += "\n";
+          signature += "\n"
           if @params.is_a?(Hash)
-            total_param = @params.map { |key, value| %Q(#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s).gsub('+', '%20')}) }
-            signature += total_param.join("&")
+              params_string = Utils.generate_query_string(@params)
+              signature += params_string
           end
           signature
         end
 
         def generate_token
-          encoded_digest = generate_encoded_digest(signature)
+          encoded_digest = generate_encoded_digest(generate_signature)
           %Q(#{@access_key}:#{encoded_digest})
         end
 

data/lib/qiniu/tokens/upload_token.rb

@@ -27,7 +27,7 @@ module Qiniu
           params[:callbackBodyType] = @callback_body_type if !@callback_body_type.nil? && !@callback_body_type.empty?
           params[:customer] = @customer if !@customer.nil? && !@customer.empty?
           params[:escape] = 1 if @escape == 1 || @escape == true
-          urlsafe_base64_encode(params.to_json)
+          Utils.urlsafe_base64_encode(params.to_json)
         end
 
         def generate_token

data/qiniu-rs.gemspec

@@ -18,7 +18,7 @@ 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 "rspec", ">= 2.11"
   gem.add_development_dependency "fakeweb", "~> 1.3"
   gem.add_runtime_dependency "json", "~> 1.7"
   gem.add_runtime_dependency "rest-client", "~> 1.6"

data/spec/qiniu/rs/eu_spec.rb

@@ -41,6 +41,7 @@ module Qiniu
         result.should_not be_false
       end
 
+=begin
       context ".set_watermark" do
         it "should works" do
           options = {
@@ -59,6 +60,7 @@ module Qiniu
           puts data.inspect
         end
       end
+=end
 
     end
   end

data/spec/qiniu/rs/io_spec.rb

@@ -1,4 +1,4 @@
-# Utils.-*- encoding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 
 require 'spec_helper'
 require 'qiniu/rs/auth'
@@ -11,7 +11,7 @@ module Qiniu
 
       before :all do
         @bucket = "io_test_bucket"
-        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
+        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
 
         result = Qiniu::RS.mkbucket(@bucket)
         puts result.inspect

data/spec/qiniu/rs/rs_spec.rb

@@ -12,7 +12,7 @@ module Qiniu
 
       before :all do
         @bucket = "rs_test_bucket"
-        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
+        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
         @domain = 'rs-test-bucket.dn.qbox.me'
 
         code, data = Qiniu::RS::RS.mkbucket(@bucket)

data/spec/qiniu/rs/up_spec.rb

@@ -1,4 +1,4 @@
-# Utils.-*- encoding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 
 require 'digest/sha1'
 require 'spec_helper'
@@ -11,7 +11,7 @@ module Qiniu
 
       before :all do
         @localfile = "bigfile.txt"
-        File.open(@localfile, "w"){|f| 5242888.times{f.write(Random.rand(9).to_s)}}
+        File.open(@localfile, "w"){|f| 5242888.times{f.write(rand(9).to_s)}}
         @bucket = "up_test_bucket"
         @key = Digest::SHA1.hexdigest(@localfile+Time.now.to_s)
 

data/spec/qiniu/rs_spec.rb

@@ -3,6 +3,7 @@
 require 'digest/sha1'
 require 'spec_helper'
 require 'qiniu/rs'
+require 'qiniu/rs/exceptions'
 
 module Qiniu
   describe RS do
@@ -30,10 +31,13 @@ module Qiniu
     end
 
     after :all do
-      result = Qiniu::RS.drop(@bucket)
-      puts result.inspect
+      result = Qiniu::RS.unpublish(@domain)
       result.should_not be_false
 
+      result1 = Qiniu::RS.drop(@bucket)
+      puts result1.inspect
+      result1.should_not be_false
+
       result2 = Qiniu::RS.drop(@test_image_bucket)
       puts result2.inspect
       result2.should_not be_false
@@ -79,6 +83,7 @@ module Qiniu
       end
     end
 
+=begin
     context ".set_watermark" do
       it "should works" do
         options = {
@@ -97,6 +102,7 @@ module Qiniu
         puts result.inspect
       end
     end
+=end
 
     context ".put_auth" do
       it "should works" do
@@ -148,13 +154,36 @@ module Qiniu
         result.should_not be_false
         puts result.inspect
       end
+
+      it "should raise MissingArgsError" do
+        uptoken_opts = {:scope => @bucket, :escape => 0}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => __FILE__,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        lambda { Qiniu::RS.upload_file(upload_opts) }.should raise_error(RS::MissingArgsError)
+      end
+
+      it "should raise NoSuchFileError" do
+        uptoken_opts = {:scope => @bucket, :escape => 0}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => 'no_this_file',
+          :bucket => @bucket,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        lambda { Qiniu::RS.upload_file(upload_opts) }.should raise_error(RS::NoSuchFileError)
+      end
     end
 
     context ".resumable_upload_file" do
       it "should works" do
         # generate bigfile for testing
         localfile = "test_bigfile"
-        File.open(localfile, "w"){|f| 5242888.times{f.write(Random.rand(9).to_s)}}
+        File.open(localfile, "w"){|f| 5242888.times{f.write(rand(9).to_s)}}
         key = Digest::SHA1.hexdigest(localfile+Time.now.to_s)
         # generate the upload token
         uptoken_opts = {:scope => @bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com", :escape => 0}
@@ -255,12 +284,14 @@ module Qiniu
       end
     end
 
+=begin
     context ".unpublish" do
       it "should works" do
         result = Qiniu::RS.unpublish(@domain)
         result.should_not be_false
       end
     end
+=end
 
     context ".delete" do
       it "should works" do
@@ -334,6 +365,16 @@ module Qiniu
         data = Qiniu::RS.generate_upload_token({:scope => 'test_bucket', :expires_in => 3600, :escape => 0})
         data.should_not be_empty
         puts data.inspect
+        data.split(":").length.should == 3
+      end
+    end
+
+    context ".generate_download_token" do
+      it "should works" do
+        data = Qiniu::RS.generate_download_token({:expires_in => 1, :pattern => 'http://qiniu-rs-test.dn.qbox.me/*'})
+        data.should_not be_empty
+        puts data.inspect
+        data.split(":").length.should == 3
       end
     end
 

data/spec/qiniu/tokens/qbox_token_spec.rb

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+require 'qiniu/tokens/qbox_token'
+
+module Qiniu
+  module RS
+    describe QboxToken do
+      before :all do
+        @qbox_token = QboxToken.new(:url => 'www.qiniutek.com?key1=value1',
+                                    :params => { :key2 => 'value2' })
+        @qbox_token.access_key = 'access_key'
+        @qbox_token.secret_key = 'secret_key'
+      end
+
+      context "#generate_token" do
+        it "should generate token" do
+          @qbox_token.generate_token.should_not be_empty
+        end
+      end
+
+      context "#generate_signature" do
+        it "should generate signature" do
+          @qbox_token.generate_signature.should == "www.qiniutek.com?key1=value1\nkey2=value2"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu-rs
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
@@ -156,6 +156,7 @@ files:
 - lib/qiniu/rs/utils.rb
 - lib/qiniu/rs/version.rb
 - lib/qiniu/tokens/access_token.rb
+- lib/qiniu/tokens/download_token.rb
 - lib/qiniu/tokens/qbox_token.rb
 - lib/qiniu/tokens/upload_token.rb
 - qiniu-rs.gemspec
@@ -171,6 +172,7 @@ files:
 - spec/qiniu/rs/utils_spec.rb
 - spec/qiniu/rs/version_spec.rb
 - spec/qiniu/rs_spec.rb
+- spec/qiniu/tokens/qbox_token_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/qiniu/ruby-sdk
 licenses: []
@@ -186,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4300609686795785448
+      hash: 3127268457999881368
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4300609686795785448
+      hash: 3127268457999881368
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -215,4 +217,5 @@ test_files:
 - spec/qiniu/rs/utils_spec.rb
 - spec/qiniu/rs/version_spec.rb
 - spec/qiniu/rs_spec.rb
+- spec/qiniu/tokens/qbox_token_spec.rb
 - spec/spec_helper.rb