upyun 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ede2802f726646a9e884163947fd0deb0bda7bb
-  data.tar.gz: ffd7837ffa0dd88cf1f204fe10a95eb91a9c3ad3
+  metadata.gz: a0e0c04999244534cf121c344eac1cbb059e3d06
+  data.tar.gz: 6c0f41e3d546ff7427e163da6fcf9c39ea244de4
 SHA512:
-  metadata.gz: 722d70c68fbd1e73efd3cf4b7361e4290715902fc28a4d949bd5f2e39eb4d0de3d58e016c7c954fcee3daef1eee4af9d760efbaafc983752aa8481ec66aaa637
-  data.tar.gz: 895bccf056eac1f6e35314dca90c297e4cfbdb1561c274300d35e2d7aaa296bb0de4541e5c37f6bccd8350c1563e470d06b27737991fb79eafdde87a21818f11
+  metadata.gz: 7e6d5b2263b1cf97ead353bbaf218ea71a7c68d6557b6a19ace4ee5af1de616b7aa2226a8cddfb2e97410f0e7cd2ebde034f35195ead9c1930966e6488f0413f
+  data.tar.gz: a316cabb91311c7fb843a2a16c3bb0620f8506134120e00c3965c4166f46b9a42034daa7a6ebd8365d07fd8c6a5f2d8e7e7f0dca48623fad2fc37a4cae3da4c4

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## CHANGE LOG
 
+### v1.0.8
+- URI encode '[]'
+
 ### v1.0.7
 - 表单上传返回的信息不论是否设置了 `return-url`, 返回信息一致
 

data/README.md

@@ -13,7 +13,7 @@
 在 `Gemfile` 中加入以下代码
 
 ```ruby
-gem 'upyun', '~> 1.0.5'
+gem 'upyun', '~> 1.0.8'
 ```
 
 然后执行如下命令安装:
@@ -300,7 +300,7 @@ upyun.upload(File.new('filepath.png'))
 
 ```ruby
 opts = {
-  'save_key' => '/foo/bar.jpg',
+  'save-key' => '/foo/bar.jpg',
   'content-type' => 'image/jpeg',
   'image-width-range' => '0,1024',
   'return-url' => 'http://www.example.com'

data/lib/upyun/rest.rb

@@ -98,6 +98,9 @@ module Upyun
 
       def fullpath(path)
         decoded = URI::encode(URI::decode(path.to_s.force_encoding('utf-8')))
+
+        # URI::encode did not encode '[]'
+        decoded = decoded.gsub('[', '%5B').gsub(']', '%5D')
         "/#{@bucket}#{decoded.start_with?('/') ? decoded : '/' + decoded}"
       end
 

data/lib/upyun/version.rb

@@ -1,3 +1,3 @@
 module Upyun
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/spec/upyun_spec.rb

@@ -26,25 +26,36 @@ describe "Upyun Restful API Basic testing" do
   describe ".put" do
     before { @path = "/ruby-sdk/foo/#{String.random}/test.jpg" }
 
-    it "PUT a file" do
-      expect(@upyun.put(@path, File.new(@file, 'rb'))).to be true
+    it "PUT an image should return image information" do
+      metas = @upyun.put(@path, File.new(@file, 'rb'))
+      expect(metas).to include(:width, :height, :frames, :file_type)
+      expect(metas[:width].is_a?(Integer))
+      expect(metas[:height].is_a?(Integer))
+      expect(metas[:frames].is_a?(Integer))
+      expect(metas[:file_type].is_a?(String))
     end
 
-    it "PUT a binary string" do
+    it "PUT a binary string should return no more information" do
       expect(@upyun.put(@path, @str)).to be true
     end
 
-    it "PUT with some extra process headers" do
+    it "PUT with some extra headers" do
       headers = {
         'Contetn-type' => 'image/jpeg',
         'x-gmkerl-type' => 'fix_width',
         'x-gmkerl-value' => 42,
         'x-gmkerl-unsharp' => true
       }
-      expect(@upyun.put(@path, File.new(@file, 'rb'), headers)).to be true
+      metas = @upyun.put(@path, File.new(@file, 'rb'), headers)
+
+      expect(metas).to include(:width, :height, :frames, :file_type)
+      expect(metas[:width].is_a?(Integer))
+      expect(metas[:height].is_a?(Integer))
+      expect(metas[:frames].is_a?(Integer))
+      expect(metas[:file_type].is_a?(String))
     end
 
-    describe "PUT while the path is not encoded" do
+    describe "PUT in Chinese path" do
       before(:all) { @path_cn = '/ruby-sdk/foo/这是中文路径/foo.txt' }
 
       it "should success" do
@@ -59,10 +70,110 @@ describe "Upyun Restful API Basic testing" do
         expect(@upyun.get(URI.encode(@path_cn))).to eq(@str)
       end
 
+      it "after all, delete should success" do
+        expect(@upyun.delete(@path_cn)).to be true
+      end
+
       after(:all) { @upyun.delete(@path_cn) }
     end
 
-    it "put a file to Picture bucket should return the image's metadata" do
+    describe "PUT with '%2B' encoded url path" do
+      before(:all) do
+        @path_2b = '/ruby-sdk/foo/%2B/foo.txt'
+        @str_2b = 'This is 2b string binary.'
+      end
+
+      it "shoud success" do
+        expect(@upyun.put(@path_2b, @str_2b)).to be true
+      end
+
+      it "then get the same url should also success" do
+        expect(@upyun.get(@path_2b)).to eq(@str_2b)
+      end
+
+      it "then get replaced('%2B' -> '+') should also success" do
+        expect(@upyun.get(@path_2b.gsub("%2B", "+"))).to eq(@str_2b)
+      end
+
+      it "after all, delete should success" do
+        expect(@upyun.delete(@path_2b)).to be true
+      end
+
+      after(:all) { @upyun.delete(@path_2b) }
+    end
+
+    describe "PUT with '+' encoded url path" do
+      before(:all) do
+        @path_plus = '/ruby-sdk/foo/+/foo.txt'
+        @str_plus = 'This is plus string.'
+      end
+
+      it "should success" do
+        expect(@upyun.put(@path_plus, @str_plus)).to be true
+      end
+
+      it "then get the same url should also success" do
+        expect(@upyun.get(@path_plus)).to eq(@str_plus)
+      end
+
+      it "then get replaced('+' -> '%2B') should also success" do
+        expect(@upyun.get(@path_plus.gsub("+", "%2B"))).to eq(@str_plus)
+      end
+
+      it "after all, delete should success" do
+        expect(@upyun.delete(@path_plus)).to be true
+      end
+
+      after(:all) { @upyun.delete(@path_plus) }
+    end
+
+    describe "PUT with '%20' encoded url path" do
+      before(:all) do
+        @path_20 = '/ruby-sdk/bar/%20/foo.txt'
+        @str_20 = 'This is %20 string.'
+      end
+
+      it "should success" do
+        expect(@upyun.put(@path_20, @str_20)).to be true
+      end
+
+      it "then get the same url should also success" do
+        expect(@upyun.get(@path_20)).to eq(@str_20)
+      end
+
+      it "then get replaced('%20' -> ' ') should also success" do
+        expect(@upyun.get(@path_20.gsub("%20", " "))).to eq(@str_20)
+      end
+
+      it "after all, delete should success" do
+        expect(@upyun.delete(@path_20)).to be true
+      end
+
+      after(:all) { @upyun.delete(@path_20) }
+    end
+
+    describe "PUT with '[{}]' encoded url path" do
+      before(:all) do
+        @path_sq = '/ruby-sdk/bar/[f{o]/}o.txt'
+        @str_sq = 'This is %sq string.'
+      end
+
+      it "should success" do
+        expect(@upyun.put(@path_sq, @str_sq)).to be true
+      end
+
+      it "then get the same url should also success" do
+        expect(@upyun.get(@path_sq)).to eq(@str_sq)
+      end
+
+      it "after all, delete should success" do
+        expect(@upyun.delete(@path_sq)).to be true
+      end
+
+      after(:all) { @upyun.delete(@path_sq) }
+    end
+
+    it "Put a file to PICTURE bucket should return the image's metadata" do
       upyunp = Upyun::Rest.new('sdkimg', 'tester', 'grjxv2mxELR3', {}, Upyun::ED_TELECOM)
       metas = upyunp.put(@path, File.new(@file), content_type: 'image/jpeg')
       expect(metas).to include(:width, :height, :frames, :file_type)
@@ -208,9 +319,15 @@ describe "Form Upload", current: true do
       expect(res.keys).to include(:code, :message, :url, :time)
       expect(res[:code]).to eq(200)
       expect(res[:message]).to match(/ok/)
+      expect(res[:url]).to eq(Time.now.utc.strftime('/%Y/%m/%d/upyun.jpg'))
       expect(fd.closed?).to eq(true)
     end
 
+    it "with default 'save-key' should return '%Y/%m/%d/{filename}{.suffix}'" do
+      res = @form.upload(@file)
+      expect(res[:url]).to eq(Time.now.utc.strftime('/%Y/%m/%d/upyun.jpg'))
+    end
+
     it "set 'save-key' should success" do
       res = @form.upload(@file, {'save-key' => 'name-ed keypath'})
       expect(res[:code]).to eq(200)
@@ -223,7 +340,7 @@ describe "Form Upload", current: true do
       expect(res[:message]).to match(/Authorize has expired/)
     end
 
-    it "set 'return-url' should a hash" do
+    it "set 'return-url' should return a hash" do
       res = @form.upload(@file, {'return-url' => 'http://www.example.com'})
       expect(res).to be_instance_of(Hash)
       expect(res[:code]).to eq(200)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upyun
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - jsvisa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client