aliyunoss 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ab6499245a17d4022343848dea9974e95309a5748eb230ed4e576cf9239e96
-  data.tar.gz: 6d353d67e14ebab41f7465961b02984280aa1cac08d89a2a422decd6aadfac65
+  metadata.gz: 433bc4b7e35cc8b1f84173e0962fbac93b4fae4b4e167b9b716e8d5f46418487
+  data.tar.gz: 60aa4bc582d36bf810196002be4c8152051f452de57b0ea975f6a05e6796da5e
 SHA512:
-  metadata.gz: d89365a0762d01cadbee4fea9e9aca18674d49d8bd4c76bc9597dff91415f0b22a4967fae8f4f1b82f9021d543671612a007e648763ed4293689ca38f4a98fc4
-  data.tar.gz: 77d5136397e45db437cfecd604e0dc2208ced0d178c1e81f17d0072796881ab7639673ca53ca5465874c753773ce3630ab61ef4b3876dbba086eb95d80fcf67a
+  metadata.gz: 432a817f2035de139b8f529f258fa6b575929b0fc45cc840da9fbba19a416a901ad24c5bf82dc7a60fe4eee4ade25cfed8407e3bae6c053c29fc5590dc027fd3
+  data.tar.gz: bbba5fa52b383f6ef157cfcc7aa4de5d57e4bace25ba79bb30e3686ec328640f3f5df86cf7296230ceabe73eae05f0c3964a79b9aa8faab960a96559c1a9d1b8

data/lib/aliyunoss/api.rb

@@ -208,6 +208,19 @@ HERE
         Aliyun::Oss::OssRequest.new(bucket, path).url_for_sharing(expires_in)
       end
 
+      # 
+      # return headers for uploading object
+      # options
+      # 
+      def headers_for_upload(bucket, path, filename: nil, 
+                             content_type:, content_length:, checksum:, custom_metadata: {})
+        Aliyun::Oss::OssRequest.new(bucket, path).headers_for_write(filename: filename,
+                                                                    content_type: content_type,
+                                                                    content_length: content_length,
+                                                                    checksum: checksum,
+                                                                    custom_metadata: custom_metadata)
+      end
+
       # 
       # Post Object
       #

data/lib/aliyunoss/bucket.rb

@@ -45,9 +45,12 @@ module Aliyun
       # Download file from remote server
       # 
       def download(path, options = {})
-        Aliyun::Oss::API.get_object(self, path, options)
-          .raise_unless(Net::HTTPOK)
-          .body
+        response = Aliyun::Oss::API.get_object(self, path, options)
+        if response.code.to_i >= 200 and response.code.to_i < 300
+          response.body
+        else
+          raise OssException.new(response)
+        end
       end
 
       # 
@@ -85,6 +88,16 @@ module Aliyun
         Aliyun::Oss::API.generate_share_url(self, path, expires_in)
       end
 
+      def direct_upload_headers(path, filename: nil, 
+                             content_type:, content_length:, checksum:, custom_metadata: {})
+        Aliyun::Oss::API.headers_for_upload(self, path, 
+                                            filename: filename,
+                                            content_type: content_type,
+                                            content_length: content_length,
+                                            checksum: checksum,
+                                            custom_metadata: custom_metadata)
+      end
+
       # 
       # Generate public url for path
       # 

data/lib/aliyunoss/oss_request.rb

@@ -26,10 +26,10 @@ module Aliyun
       # 
       def get_uri
         if @domain
-          uri = URI("https://#{domain}/")
+          uri = URI("https://#{@domain}/")
         else
           if @bucket
-            uri = URI("https://#{bucket.name}.#{bucket.location}.#{host}")
+            uri = URI("https://#{@bucket.name}.#{@bucket.location}.#{host}")
           else
             uri = URI("https://oss.#{host}")
           end
@@ -89,6 +89,25 @@ module Aliyun
         uri.to_s
       end
 
+      def headers_for_write(filename: nil, content_type:, content_length:, 
+                            checksum:, custom_metadata: {})
+        @headers = {
+          "Content-Type" => content_type, 
+          "Content-MD5" => checksum, 
+          "Date" => Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT'),
+          "Content-Length" => content_length
+        }
+
+        if filename != nil
+          @headers["Content-Disposition"] = "attachment; filename=\"#{filename}\""
+        end
+
+        request = Net::HTTP.send(:const_get, 'Put').new(get_uri)
+        @headers.each_pair {|k,v| request[k] = v}
+        @headers['Authorization'] = 'OSS ' +  access_key_id + ':' + signature(request)
+        @headers
+      end
+
       #
       # Get http header value by attribute 
       # 
@@ -160,6 +179,7 @@ module Aliyun
           if @queries[k] then "#{k}=#{@queries[k]}" else "#{k}" end
         end
           
+
         "/#{@bucket.name}#{@path}?#{array.sort.join('&')}"
       end
 

data/lib/aliyunoss/version.rb

@@ -1,5 +1,5 @@
 module Aliyun
   module Oss
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

data/spec/aliyunoss/bucket_spec.rb

@@ -41,6 +41,30 @@ describe Aliyun::Oss::Bucket do
     expect(data.length).to eq(File.open( File.join(__dir__, "png", "test-1.png")).size)
   end
 
+  it 'should generate direct upload headers' do
+    file = File.join(__dir__, 'png', 'test-1.png')
+    md5 = OpenSSL::Digest::MD5
+    checksum = Base64.encode64(md5.digest(IO.read(file))).strip
+    headers = @bucket.direct_upload_headers('/test-1.png', 
+                                            filename: 'test-1.png',
+                                            content_type: 'image/png',
+                                            content_length: IO.read(file).bytesize,
+                                            checksum: checksum,
+                                            custom_metadata: {})
+    
+    # Now let's upload using these headers
+    uri = URI("https://#{@bucket.name}.#{@bucket.location}.aliyuncs.com/test-1.png")
+    request = Net::HTTP::Put.new(uri)
+    headers.each_pair { |k,v| request[k] = v }
+    request.body = IO.read(file)
+
+    Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+      response = http.request(request)
+      expect(response.code.to_s).to eq('200')
+    end
+    
+  end
+
   it 'should upload data to server in multipart way' do
     path = '/multi-part-test.dat'
     @bucket.multipart_upload_initiate(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyunoss
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - yijiecc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri