diff --git a/Gemfile.lock b/Gemfile.lock index efdbd99..a86ed17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - qiniu-rs (2.1.2) + qiniu-rs (2.2.0) json (~> 1.7.3) mime-types (~> 1.19) rest-client (~> 1.6.7) diff --git a/lib/qiniu/rs.rb b/lib/qiniu/rs.rb index 4f06cab..08ccd60 100755 --- a/lib/qiniu/rs.rb +++ b/lib/qiniu/rs.rb @@ -118,6 +118,15 @@ module Qiniu Image.preivew_url(url, spec) end + def image_mogrify_preview_url(source_image_url, options) + Image.mogrify_preview_url(source_image_url, options) + end + + def image_mogrify_save_as(bucket, key, source_image_url, options) + code, data = RS.image_mogrify_save_as(bucket, key, source_image_url, options) + code == StatusOK ? data : false + 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 diff --git a/lib/qiniu/rs/image.rb b/lib/qiniu/rs/image.rb index 86a25d4..7866c67 100755 --- a/lib/qiniu/rs/image.rb +++ b/lib/qiniu/rs/image.rb @@ -14,6 +14,24 @@ module Qiniu url + '/imagePreview/' + spec.to_s end + def mogrify_preview_url(source_image_url, options) + source_image_url + '?' + generate_mogrify_params_string(options) + end + + def generate_mogrify_params_string(options = {}) + opts = {} + options.each do |k, v| + opts[k.to_s] = v + end + params_string = "" + keys = ["thumbnail", "gravity", "crop", "quality", "rotate", "format"] + keys.each do |key| + params_string += %Q(/#{key}/#{opts[key]}) unless opts[key].nil? + end + params_string += '/auto-orient' unless opts["auto_orient"].nil? + 'imageMogr' + params_string + end + end end end diff --git a/lib/qiniu/rs/rs.rb b/lib/qiniu/rs/rs.rb index b45f197..3d75c3b 100755 --- a/lib/qiniu/rs/rs.rb +++ b/lib/qiniu/rs/rs.rb @@ -57,6 +57,18 @@ module Qiniu batch("delete", bucket, keys) end + def save_as(bucket, key, source_url, op_params_string) + encoded_uri = encode_entry_uri(bucket, key) + save_as_string = '/save-as/' + encoded_uri + new_url = source_url + '?' + op_params_string + save_as_string + Auth.request new_url + end + + def image_mogrify_save_as(bucket, key, source_image_url, options) + mogrify_params_string = Image.generate_mogrify_params_string(options) + save_as(bucket, key, source_image_url, mogrify_params_string) + end + end end end diff --git a/lib/qiniu/rs/version.rb b/lib/qiniu/rs/version.rb index b13923f..cf22346 100755 --- a/lib/qiniu/rs/version.rb +++ b/lib/qiniu/rs/version.rb @@ -2,6 +2,6 @@ module Qiniu module RS - VERSION = "2.1.2" + VERSION = "2.2.0" end end diff --git a/spec/qiniu/rs/image_spec.rb b/spec/qiniu/rs/image_spec.rb index 9075040..f603b38 100755 --- a/spec/qiniu/rs/image_spec.rb +++ b/spec/qiniu/rs/image_spec.rb @@ -9,7 +9,7 @@ module Qiniu module RS describe Image do - before :each do + before :all do =begin code, data = Qiniu::RS::Auth.exchange_by_password!("test@qbox.net", "test") code.should == 200 @@ -20,11 +20,15 @@ module Qiniu puts data.inspect =end - @bucket = "test_images" + @bucket = "test_images_12345" @key = "image_logo_for_test.png" local_file = File.expand_path('../' + @key, __FILE__) + result = Qiniu::RS.drop(@bucket) + result.should_not be_false + puts result.inspect + put_url = Qiniu::RS.put_auth(10) put_url.should_not be_false put_url.should_not be_empty @@ -32,21 +36,42 @@ module Qiniu :file => local_file, :bucket => @bucket, :key => @key, + :mime_type => "image/png", :enable_crc32_check => true result.should be_true + + + result = Qiniu::RS.get(@bucket, @key) + result["url"].should_not be_empty + puts result.inspect + @source_image_url = result["url"] + + @mogrify_options = { + :thumbnail => "!120x120r", + :gravity => "center", + :crop => "!120x120a0a0", + :quality => 85, + :rotate => 45, + :format => "jpg", + :auto_orient => true + } end context ".info" do it "should works" do - result = Qiniu::RS.get(@bucket, @key) - result["url"].should_not be_empty - puts result.inspect - code, data = Qiniu::RS::Image.info(result["url"]) + code, data = Qiniu::RS::Image.info(@source_image_url) code.should == 200 puts data.inspect end end + context ".mogrify_preview_url" do + it "should works" do + mogrify_preview_url = Qiniu::RS::Image.mogrify_preview_url(@source_image_url, @mogrify_options) + puts mogrify_preview_url.inspect + end + end + end end end diff --git a/spec/qiniu/rs_spec.rb b/spec/qiniu/rs_spec.rb index df47efe..732be23 100755 --- a/spec/qiniu/rs_spec.rb +++ b/spec/qiniu/rs_spec.rb @@ -10,6 +10,9 @@ module Qiniu @bucket = 'qiniu_rs_test' @key = Digest::SHA1.hexdigest Time.now.to_s @domain = 'cdn.example.com' + + @test_image_bucket = 'test_images_12345' + @test_image_key = 'image_logo_for_test.png' end =begin @@ -138,7 +141,7 @@ module Qiniu context ".image_info" do it "should works" do - data = Qiniu::RS.get("test_images", "image_logo_for_test.png") + data = Qiniu::RS.get(@test_image_bucket, @test_image_key) data.should_not be_false data.should_not be_empty puts data.inspect @@ -149,6 +152,32 @@ module Qiniu end end + context ".image_mogrify_save_as" do + it "should works" do + data = Qiniu::RS.get(@test_image_bucket, @test_image_key) + data.should_not be_false + data.should_not be_empty + puts data.inspect + + dest_bucket = "test_thumbnails_bucket" + dest_key = "cropped-" + @test_image_key + src_img_url = data["url"] + mogrify_options = { + :thumbnail => "!120x120r", + :gravity => "center", + :crop => "!120x120a0a0", + :quality => 85, + :rotate => 45, + :format => "jpg", + :auto_orient => true + } + result = Qiniu::RS.image_mogrify_save_as(dest_bucket, dest_key, src_img_url, mogrify_options) + result.should_not be_false + result.should_not be_empty + puts result.inspect + end + end + context ".generate_upload_token" do it "should works" do data = Qiniu::RS.generate_upload_token({:scope => 'test_bucket', :expires_in => 3600})