better_ross 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a13f14d3ce2844aa823e8d7a4014f659561a326
-  data.tar.gz: fa02613618b59a88abee6a864c09b7445e6c8f9f
+  metadata.gz: f1f1d2390671663b426392fce34c982614ce9110
+  data.tar.gz: a94351861b7ed3b6bd668f02a35ac03e35f2d39c
 SHA512:
-  metadata.gz: b145fb3260c5258eacc5e0ec4540c43070c4e1d248b6513adf0759689b0de1c8c52a98d6f797fce33dcd6d69e238ab76a763e7ca73f97fe84f21d93448a2157c
-  data.tar.gz: a4b7d45a67939038b9ba0892cf96dbe85f7fedd11137bf37bf44737d389b643d0de664e80f3b2acc8186a80b6d2209198f284fe9d3bd1cb6a14afb7f9f560abf
+  metadata.gz: 0e04beaec8462b1ade61b1b7ccbfb7cdfd58863ab3ce5d68df70cdd66b1f6120f6f6997e5dbf7641da28d387b2e2e1931f8747afdf269d67be61b5bc067a5d8b
+  data.tar.gz: 73b092e5b364abba6aeb95b0a205655465a5273b8cff0bb4588eec4eea278034d37b1b4d3cb91df59f619f1a784351c8fcc0a627794b304ac406693aa692eb52

data/lib/ross/client.rb

@@ -16,21 +16,42 @@ module ROSS
       end
     end
     
-    def put(path, content, options={})
+    def put(path, content, options={}, xoss = {})
       # content_md5 = Digest::MD5.hexdigest(content)
-      content_type = options[:content_type] || "application/octet-stream"
+      content_type = options.has_key?(:content_type) ? options[:content_type] : "application/octet-stream"
       date = Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
-      auth_sign = sign("PUT", path, date, content_type) #, content_md5)
       headers = {
-        "Authorization" => "OSS #{@appid}:#{auth_sign}", 
+        "Authorization" => auth_sign("PUT", path, date, content_type, nil, xoss),
         "Content-Type" => content_type,
-        "Content-Length" => content.length,
         "Date" => date,
-        "Host" => @aliyun_host,
+        "Host" => @aliyun_host
       }
+      headers["Content-Length"] = content.length unless content.nil? # content can be nil
+      xoss.each_pair{|k,v| headers["x-oss-#{k}"] = v }
       response = RestClient.put(request_url(path), content, headers)
     end
 
+    def delete(path)
+      date = Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
+      content_type = nil
+      headers = {
+        "Authorization" => auth_sign("DELETE", path, date, content_type),
+        "Content-Type" => content_type,
+        "Date" => date,
+        "Host" => @aliyun_host
+      }
+      RestClient.delete(request_url(path), headers)
+    end
+
+    def copy(sour_path, dest_path)
+      put(dest_path, nil, {content_type: nil}, {'copy-source' => bucket_path(sour_path)})
+    end
+
+    def rename(sour_path, dest_path)
+      copy(sour_path, dest_path)
+      delete(path)
+    end
+
     def put_file(path, file, options = {})
       put(path, File.read(file), options)
     end
@@ -52,15 +73,23 @@ module ROSS
     end
     
     private
-    def sign(verb, path, date, content_type = nil, content_md5 = nil)
-      canonicalized_oss_headers = ''
-      canonicalized_resource = "/#{@bucket_name}/#{path.gsub(/^\//, '')}"
+    def sign(verb, path, date, content_type = nil, content_md5 = nil, xoss = {})
+      canonicalized_oss_headers = xoss.sort.map{|k,v| "x-oss-#{k}:".downcase + v + "\n"}.join
+      canonicalized_resource = bucket_path(path)
       string_to_sign = "#{verb}\n\n#{content_type}\n#{date}\n#{canonicalized_oss_headers}#{canonicalized_resource}"
       digest = OpenSSL::Digest.new('sha1')
       h = OpenSSL::HMAC.digest(digest, @appkey, string_to_sign)
       Base64.encode64(h).strip
     end
 
+    def auth_sign(verb, path, date, content_type = nil, content_md5 = nil, xoss = {})
+      "OSS #{@appid}:#{sign(verb, path, date, content_type, content_md5, xoss)}"
+    end
+
+    def bucket_path(path)
+      "/#{@bucket_name}/#{path.gsub(/^\//, '')}"
+    end
+
     def request_url(path)
       "http://#{@aliyun_host}/#{@bucket_name}/#{URI.encode(path)}"
     end

data/ross.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name = 'better_ross'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.platform = Gem::Platform::RUBY
   s.summary = "ROSS is a ruby client for aliyun oss"
   s.authors = ["Fizz Wu"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_ross
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Fizz Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client