aliyunoss 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22926d8762b8b4bf376899763a30ec4be2f719a4f304eb29012331d216c4a07
-  data.tar.gz: b08fd3ba38eadc4c6813b074113e9e2ae4356e41236f19e961b4150c4993abf5
+  metadata.gz: ca7ea420b819bffafd6c076ef8d78a3ef4a204386dacdb51aadcd052f65861ea
+  data.tar.gz: ae333e82382f9968bf9909eea87006c1351cebe2f8a9bc1c15ed4cfaa5b4de4a
 SHA512:
-  metadata.gz: 4f068b547a30385271f91d3f955d47a604f7ed622527d158d50cd659348243910fe0e2c7345ad481240a967846d90eea61d6cdf533537b6b4b3d0e8ec354780f
-  data.tar.gz: e2cec40d40c0e8037755f1cadcdecb2c86652e376169901812feea4882eea0a50b15cba7542056255a3ec2dbb663f77c90b21339b277cd69e8eee07d61ecc47b
+  metadata.gz: 903d5beeb50a74696c7eec0b9a611307b6c7a4236a0b0298d48f4bb4edd789f36f06b96fbb48dd7279e55970297db2859c7b62a5c654bce8cb6bd6d3e27111a9
+  data.tar.gz: 689c7991cc61bcc2fbf46d80530457db8dc5bfeb2393d907e0bc8ca143d2e9b22406efaa17ec4fda2794dda26a8c4fce7409e5acc3a3869481f73cb5f4014100

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

@@ -88,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,27 @@ 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
+        }
+
+        @headers["x-oss-date"] = @headers["Date"]
+
+        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 +181,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.2"
+    VERSION = "0.2.4"
   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.2
+  version: 0.2.4
 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