aliyun-sdk 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f304be3ae5b8631ce2fba50d0d0b8d7e6635eb79
-  data.tar.gz: 7393a38208b5effa30efed0db2758d499f79afa4
+  metadata.gz: 3351c07de0b29f43528b3bcb1a3ce7acae4cd9be
+  data.tar.gz: e748094c575c5f22e775723d88794c92f2819d3b
 SHA512:
-  metadata.gz: 2affe8557b33db121bfb3ba8cb123c4c16ee8f204fa1fa1f3a6583a8e1592c936c03a3a576e24eb21fb7ba290f56920df2d85a722793501af9359806c3a723ca
-  data.tar.gz: 475ea25895a767732e9fc912d22db312e4d7ffde00ae16d253cbd3baf8d343a3d68f919562c1a2dadb910e124de02fb95d60658ba32979cd496790417b9fc33f
+  metadata.gz: 7ca9fac250cd61d7f9adee1012e033e29a5eeecd5c890f795b0bfb3be4e1094475eb10fcf976e78b3d1662ba8b1046329698375928495c620762bb56228a6714
+  data.tar.gz: d5a21aea9411798f93e44f45142abb488c67c4ec06c4b0ff7382cac289862fddac10976f488e9aac59a441b8e2528d9e6844614dd2e95b21d1cb092c09cdffaf

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Change Log
 
+### v0.4.0 / 2016-05-19
+
+- Enable copy objects of different buckets(but in the same region)
+
 ### v0.3.7
 
 - Remove monkey patch for Hash

data/README.md

@@ -1,7 +1,7 @@
 # Aliyun OSS SDK for Ruby
 
 [![Gem Version](https://badge.fury.io/rb/aliyun-sdk.svg)](https://badge.fury.io/rb/aliyun-sdk)
-[![Build Status](https://travis-ci.org/aliyun/aliyun-oss-ruby-sdk.svg)](https://travis-ci.org/aliyun/aliyun-oss-ruby-sdk)
+[![Build Status](https://travis-ci.org/aliyun/aliyun-oss-ruby-sdk.svg?branch=master)](https://travis-ci.org/aliyun/aliyun-oss-ruby-sdk?branch=master)
 [![Coverage Status](https://coveralls.io/repos/aliyun/aliyun-oss-ruby-sdk/badge.svg?branch=master&service=github)](https://coveralls.io/github/aliyun/aliyun-oss-ruby-sdk?branch=master)
 
 -----
@@ -157,20 +157,20 @@ aliyun-sdk中包含了STS的SDK，使用时只需要`require 'aliyun/sts'`即可
 ## 模拟目录结构
 
 OSS是Object存储服务，本身不支持目录结构，所有的object都是“平”的。但是
-用户可以通过设置object的key为"/foo/bar/file"这样的形式来模拟目录结构。
+用户可以通过设置object的key为"foo/bar/file"这样的形式来模拟目录结构。
 假设现在有以下Objects：
 
-    /foo/x
-    /foo/bar/f1
-    /foo/bar/dir/file
-    /foo/hello/file
+    foo/x
+    foo/bar/f1
+    foo/bar/dir/file
+    foo/hello/file
 
-列出"/foo/"目录下的所有文件就是以"/foo/"为prefix进行`list_objects`，但
-是这样也会把"/foo/bar/"下的所有object也列出来。为此需要用到delimiter参
+列出"foo/"目录下的所有文件就是以"foo/"为prefix进行`list_objects`，但
+是这样也会把"foo/bar/"下的所有object也列出来。为此需要用到delimiter参
 数，其含义是从prefix往后遇到第一个delimiter时停止，这中间的key作为
 Object的common prefix，包含在`list_objects`的结果中。
 
-    objs = bucket.list_objects(:prefix => '/foo/', :delimiter => '/')
+    objs = bucket.list_objects(:prefix => 'foo/', :delimiter => '/')
     objs.each do |i|
       if i.is_a?(Aliyun::OSS::Object) # a object
         puts "object: #{i.key}"
@@ -179,9 +179,9 @@ Object的common prefix，包含在`list_objects`的结果中。
       end
     end
     # output
-    object: /foo/x
-    common prefix: /foo/bar/
-    common prefix: /foo/hello/
+    object: foo/x
+    common prefix: foo/bar/
+    common prefix: foo/hello/
 
 Common prefix让用户不需要遍历所有的object（可能数量巨大）而找出前缀，
 在模拟目录结构时非常有用。
@@ -413,6 +413,7 @@ bundle exec rake test
 更多文档请查看：
 
 - 阿里云官网文档：http://help.aliyun.com/product/8314910_oss.html
+- OSS官网SDK文档：https://help.aliyun.com/document_detail/oss/sdk/ruby-sdk/install.html
 
 
 [region-list]: https://help.aliyun.com/document_detail/oss/user_guide/endpoint_region.html

data/lib/aliyun/oss/bucket.rb

@@ -355,6 +355,8 @@ module Aliyun
       # @param source [String] 源object名字
       # @param dest [String] 目标object名字
       # @param opts [Hash] 拷贝object时的选项（可选）
+      # @option opts [String] :src_bucket 源object所属的Bucket，默认与
+      #  目标文件为同一个Bucket。源Bucket与目标Bucket必须属于同一个Region。
       # @option opts [String] :acl 目标文件的acl属性，默认为private
       # @option opts [String] :meta_directive 指定是否拷贝源object的
       #  meta信息，默认为{OSS::MetaDirective::COPY}：即拷贝object的时

data/lib/aliyun/oss/client.rb

@@ -28,7 +28,7 @@ module Aliyun
       #  KEY SECRET，如果不填则会尝试匿名访问
       # @option opts [Boolean] :cname [可选] 指定endpoint是否是用户绑
       #  定的域名
-      # @option opts [Boolean] :sts_token [可选] 指定STS的
+      # @option opts [String] :sts_token [可选] 指定STS的
       #  SecurityToken，如果指定，则使用STS授权访问
       # @option opts [Fixnum] :open_timeout [可选] 指定建立连接的超时
       #  时间，默认为10秒

data/lib/aliyun/oss/protocol.rb

@@ -829,11 +829,14 @@ module Aliyun
       end
 
       # Copy an object in the bucket. The source object and the dest
-      # object must be in the same bucket.
+      # object may be from different buckets of the same region.
       # @param bucket_name [String] the bucket name
       # @param src_object_name [String] the source object name
       # @param dst_object_name [String] the dest object name
       # @param opts [Hash] options
+      # @option opts [String] :src_bucket specify the source object's
+      #  bucket. It MUST be in the same region as the dest bucket. It
+      #  defaults to dest bucket if not specified.
       # @option opts [String] :acl specify the dest object's
       #  ACL. See {OSS::ACL}
       # @option opts [String] :meta_directive specify what to do
@@ -857,9 +860,10 @@ module Aliyun
                      "source object: #{src_object_name}, dest object: "\
                      "#{dst_object_name}, options: #{opts}")
 
+        src_bucket = opts[:src_bucket] || bucket_name
         headers = {
           'x-oss-copy-source' =>
-            @http.get_resource_path(bucket_name, src_object_name),
+            @http.get_resource_path(src_bucket, src_object_name),
           'content-type' => opts[:content_type]
         }
         (opts[:metas] || {})
@@ -1096,8 +1100,11 @@ module Aliyun
       # @param part_no [Integer] the part number
       # @param source_object [String] the source object name to copy from
       # @param opts [Hash] options
+      # @option opts [String] :src_bucket specify the source object's
+      #  bucket. It MUST be in the same region as the dest bucket. It
+      #  defaults to dest bucket if not specified.
       # @option opts [Array<Integer>] :range the bytes range to
-      #  copy, int the format: [begin(inclusive), end(exclusive]
+      #  copy, int the format: [begin(inclusive), end(exclusive)]
       # @option opts [Hash] :condition preconditions to copy the
       #  object. See #get_object
       def upload_part_by_copy(
@@ -1113,9 +1120,10 @@ module Aliyun
           fail ClientError, "Range must be an array containing 2 Integers."
         end
 
+        src_bucket = opts[:src_bucket] || bucket_name
         headers = {
           'x-oss-copy-source' =>
-            @http.get_resource_path(bucket_name, source_object)
+            @http.get_resource_path(src_bucket, source_object)
         }
         headers['range'] = get_bytes_range(range) if range
         headers.merge!(get_copy_conditions(conditions)) if conditions

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
 
-    VERSION = "0.3.7"
+    VERSION = "0.4.0"
 
 end # Aliyun

data/spec/aliyun/oss/multipart_spec.rb

@@ -228,6 +228,25 @@ module Aliyun
             .with(:body => nil, :query => query, :headers => headers)
         end
 
+        it "should upload a part by copy object from different bucket" do
+          txn_id = 'xxxyyyzzz'
+          part_no = 1
+          src_bucket = 'source-bucket'
+          copy_source = "/#{src_bucket}/src_obj"
+
+          query = {'partNumber' => part_no, 'uploadId' => txn_id}
+          headers = {'x-oss-copy-source' => copy_source}
+
+          stub_request(:put, request_path)
+            .with(:query => query, :headers => headers)
+
+          @protocol.upload_part_by_copy(
+            @bucket, @object, txn_id, part_no, 'src_obj', :src_bucket => src_bucket)
+
+          expect(WebMock).to have_requested(:put, request_path)
+            .with(:body => nil, :query => query, :headers => headers)
+        end
+
         it "should return part etag" do
           txn_id = 'xxxyyyzzz'
           part_no = 1

data/spec/aliyun/oss/object_spec.rb

@@ -23,8 +23,8 @@ module Aliyun
         p
       end
 
-      def get_resource_path(object)
-        "/#{@bucket}/#{object}"
+      def get_resource_path(object, bucket = nil)
+        "/#{bucket || @bucket}/#{object}"
       end
 
       def mock_copy_object(last_modified, etag)
@@ -314,6 +314,28 @@ module Aliyun
           expect(result[:etag]).to eq(etag)
         end
 
+        it "should copy object of different buckets" do
+          src_bucket = 'source-bucket'
+          src_object = 'ruby'
+          dst_object = 'rails'
+          url = get_request_path(dst_object)
+
+          last_modified = Time.parse(Time.now.rfc822)
+          etag = '0000'
+          stub_request(:put, url).to_return(
+            :body => mock_copy_object(last_modified, etag))
+
+          result = @protocol.copy_object(
+            @bucket, src_object, dst_object, :src_bucket => src_bucket)
+
+          expect(WebMock).to have_requested(:put, url)
+            .with(:body => nil, :headers => {
+                    'x-oss-copy-source' => get_resource_path(src_object, src_bucket)})
+
+          expect(result[:last_modified]).to eq(last_modified)
+          expect(result[:etag]).to eq(etag)
+        end
+
         it "should set acl and conditions when copy object" do
           src_object = 'ruby'
           dst_object = 'rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Tianlong Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri