aliyun-sdk 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b400456da8877a797a2caecc64fd696f54f129f3
-  data.tar.gz: 0bc030c00b7bc81a234bfa7ac52db10a1cbc7f71
+  metadata.gz: 0eb63cbc2eaef6904f149227af4fe4aadaf492b3
+  data.tar.gz: c77132cb5b467b459f84641ede4ae9335d626ff1
 SHA512:
-  metadata.gz: 71786966777a2ebcbbdf370bf436c8d5d983e710f0fca4f2f2c7e63ea8dab9fc51982b457a4cdfeeb3085cb4509260cd8646b15de374bd41b0ca114ae647d121
-  data.tar.gz: b03108695f1e78fae5c0ab4dc2da904b9af2409e93d4bb0529da78a1fa10f28e1f2548165890dc7710f35b364765559ecdcc60d2e5444f9035489fb5a737e831
+  metadata.gz: befbf2ca1b3b80e69d58fcea1c4c6d2dcab38499cfecd2aa4f8c8827b098b5ab912a7efe388b8d24e6ace7a065f0eb2a4464b0be713190c5d7120020fab57bc5
+  data.tar.gz: 9c1384ed6d63ba3a71634276b48dbe04e757fc865152f9fcd9bb52e3cb7a750e30afd8d519aebaafc60157be35845d6e315e6087e795125398b2e62ea6727356

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Change Log
 
+### v0.7.0 / 2018-06-05
+
+- deps: upgrade nokogiri to > 1.6 and ruby version >= 2.0
+
 ### v0.6.0 / 2017-07-23
 
 - deps: upgrade rest-client to 2.x

data/lib/aliyun/oss/bucket.rb

@@ -608,7 +608,7 @@ module Aliyun
 
         resource = "/#{name}/#{key}"
         unless sub_res.empty?
-          resource << "?#{sub_res.join('&')}"
+          resource << (resource.include?('?') ? "&#{sub_res.join('&')}" : "?#{sub_res.join('&')}")
         end
 
         string_to_sign = "" <<
@@ -623,7 +623,8 @@ module Aliyun
           query.merge('Signature' => CGI.escape(signature))
           .map { |k, v| "#{k}=#{v}" }.join('&')
 
-        [url, query_string].join('?')
+        link_char = url.include?('?') ? '&' : '?'
+        [url, query_string].join(link_char)
       end
 
       # 获取用户所设置的ACCESS_KEY_ID

data/lib/aliyun/oss/http.rb

@@ -125,7 +125,12 @@ module Aliyun
         url.host = "#{bucket}." + url.host if bucket && !@config.cname && !isIP
         url.path = '/'
         url.path << "#{bucket}/" if bucket && isIP
-        url.path << "#{CGI.escape(object)}" if object
+
+        if object
+          path, query = object.split('?')
+          url.path << path.split('/').map { |seg| CGI.escape(seg) }.join('/')
+          url.query = query.split('&').map { |kv| k, v = kv.split('='); "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join('&') if query
+        end
 
         url.to_s
       end

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
 
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
 
 end # Aliyun

data/spec/aliyun/oss/client/bucket_spec.rb

@@ -467,29 +467,52 @@ module Aliyun
           expect(signature).to eq(sig)
         end
 
-        it "should get object url with STS" do
-          sts_bucket = Client.new(
-            :endpoint => @endpoint,
-            :access_key_id => 'xxx',
-            :access_key_secret => 'yyy',
-            :sts_token => 'zzz').get_bucket(@bucket_name)
-
-          object_url = 'http://rubysdk-bucket.oss-cn-hangzhou.aliyuncs.com/yeah'
-
-          url = sts_bucket.object_url('yeah')
-          path = url[0, url.index('?')]
-          expect(path).to eq(object_url)
-
-          query = {}
-          url[url.index('?') + 1, url.size].split('&')
-            .each { |s| k, v = s.split('='); query[k] = v }
-
-          expect(query.key?('Expires')).to be true
-          expect(query.key?('Signature')).to be true
-          expect(query['OSSAccessKeyId']).to eq('xxx')
-          expect(query['security-token']).to eq('zzz')
+        context 'should use STS' do
+          it "get object url" do
+            sts_bucket = Client.new(
+              :endpoint => @endpoint,
+              :access_key_id => 'xxx',
+              :access_key_secret => 'yyy',
+              :sts_token => 'zzz').get_bucket(@bucket_name)
+
+            object_url = 'http://rubysdk-bucket.oss-cn-hangzhou.aliyuncs.com/yeah'
+
+            url = sts_bucket.object_url('yeah')
+            path = url[0, url.index('?')]
+            expect(path).to eq(object_url)
+
+            query = {}
+            url[url.index('?') + 1, url.size].split('&')
+              .each { |s| k, v = s.split('='); query[k] = v }
+
+            expect(query.key?('Expires')).to be true
+            expect(query.key?('Signature')).to be true
+            expect(query['OSSAccessKeyId']).to eq('xxx')
+            expect(query['security-token']).to eq('zzz')
+          end
+
+          it "get object url with query string" do
+            sts_bucket = Client.new(
+              :endpoint => @endpoint,
+              :access_key_id => 'xxx',
+              :access_key_secret => 'yyy',
+              :sts_token => 'zzz').get_bucket(@bucket_name)
+
+            url = sts_bucket.object_url('ico.png?x-oss-process=image/resize,m_fill,h_100,w_100')
+            path = url[0, url.index('?')]
+            expect(path).to eq('http://rubysdk-bucket.oss-cn-hangzhou.aliyuncs.com/ico.png')
+
+            query = {}
+            url[url.index('?') + 1, url.size].split('&')
+              .each { |s| k, v = s.split('='); query[k] = v }
+
+            expect(query.key?('Expires')).to be true
+            expect(query.key?('Signature')).to be true
+            expect(query['OSSAccessKeyId']).to eq('xxx')
+            expect(query['security-token']).to eq('zzz')
+            expect(query['x-oss-process']).to eq('image%2Fresize%2Cm_fill%2Ch_100%2Cw_100')
+          end
         end
-
       end # object operations
 
       context "multipart operations" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-sdk
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tianlong Wu
 autorequire: 
 bindir: lib/aliyun
 cert_chain: []
-date: 2017-07-23 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="