paperclip-storage-aliyun 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8531e6601564efe368735f05147b68f4401c495
-  data.tar.gz: e2317360addbbce35acd8bf2947a532cdf11f8c2
+  metadata.gz: fc88eeef9e399e74817562b2fbb525257e0240cf
+  data.tar.gz: 680b18f58b81bace15aa4e63e59fe7d862e6128d
 SHA512:
-  metadata.gz: 1f7ce3fda9227a3937a1d04e7acce987c60028187496261c493176f87e016fcaba3083fc7a9977b28af313ac9a92b0ffef6af5ba092a052f40baaac65f7b52e6
-  data.tar.gz: abef51e1bbeb91ac622f74ed61f17bde84026d91eba1ebf423b11833ff770b2a4912d385ec09de6728d16f4d5d0bfafb44517696f0b43e268d4cc6cd3b10753d
+  metadata.gz: 540eb2053d03facff5b05791eaee3e829296bd1cd6f149326598369530c425307ac5d2fa407dd13ab5479855b8063d1b38268a9fc53a3de912e9e7c52ea4fa44
+  data.tar.gz: 24098248c2e5786d0e091c10bd9e5f7eecd70cb930a789fcfa1ebc0b2334388ee71236d2927f07f085dd871bc7a66fb97663d1565bb4e42bae28c7e7703318ef

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://ruby.taobao.org'
+source 'https://gems.ruby-china.org'
 
 gemspec
 

data/README.md

@@ -45,3 +45,19 @@ Similar to Paperclip::Storage::S3, there are four options for the url by now:
 - `:aliyun_alias_url` : the alias url based on the `host_alias` you give, typically used together with CDN
 
 Please note the values above are all strings, not symbols. You could still make your own url if only you know what you are doing.
+
+#### Test
+1. Update connection settings in `spec/spec_helper.rb`:
+
+  ```ruby
+  # Aliyun defaults
+  OSS_CONNECTION_OPTIONS = {
+    access_id: 'your_access_key_id',
+    access_key: 'your_access_key_secret',
+    bucket: 'your_bucket',
+    data_center: 'your_data_center',
+    internal: false
+  }
+  ```
+
+2. Run `bundle exec rspec spec`.

data/lib/aliyun/connection.rb

@@ -93,7 +93,7 @@ module Aliyun
         'Host' => @aliyun_upload_host,
         'Expect' => '100-Continue'
       }
-      response = RestClient.put(URI.encode(url), file, headers)
+      response = RestClient.put(url, file, headers)
       response.code == 200 ? path_to_url(path) : nil
     end
 
@@ -113,7 +113,7 @@ module Aliyun
         'Authorization' => sign('DELETE', bucket_path, '', '', date)
       }
       url = path_to_url(path)
-      response = RestClient.delete(URI.encode(url), headers)
+      response = RestClient.delete(url, headers)
       response.code == 204 ? url : nil
     end
 
@@ -132,7 +132,7 @@ module Aliyun
         'Authorization' => sign('GET', bucket_path, '', '', date)
       }
       url = path_to_url(path)
-      response = RestClient.get(URI.encode(url), headers)
+      response = RestClient.get(url, headers)
       response.body
     end
 
@@ -176,7 +176,7 @@ module Aliyun
     # @param path [String] the path to retrieve the file on remote storage
     # @return [String] the expected full path, e.g. "http://martin-test.oss-cn-hangzhou.aliyuncs.com/oss-api.pdf"
     def path_to_url(path)
-      path =~ %r{^https?://} ? path : "http://#{aliyun_upload_host}/#{path}"
+      URI.encode(path =~ %r{^https?://} ? path : "http://#{aliyun_upload_host}/#{path}")
     end
 
     private

data/paperclip-storage-aliyun.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.summary      = 'Extend a Aliyun OSS storage for paperclip'
   s.description  = 'Extend a Aliyun OSS storage for paperclip'
-  s.version      = '0.1.0'
+  s.version      = '0.1.1'
   s.files        = `git ls-files`.split("\n")
   s.authors      = ['Martin Hong', 'Aidi Stan']
   s.email        = 'hongzeqin@gmail.com'

data/spec/aliyun_spec.rb

@@ -40,11 +40,23 @@ describe Aliyun::Connection do
       response_code = Net::HTTP.get_response(URI.parse(url)).code
       expect(response_code).to eq('404')
     end
+
+    describe "delete attachment with Chinese name" do
+      it "delete the attachment" do
+        path = "a/美女.jpg"
+        @connection.put path, load_attachment('美女.jpg')
+        url = @connection.delete path
+        response_code = Net::HTTP.get_response(URI.parse(url)).code
+        expect(response_code).to eq('404')
+      end
+    end
   end
 
   describe '#exists?' do
     before :all do
       @connection.put @path, load_attachment('girl.jpg')
+      @path_include_chinese = "美女.jpg"
+      @connection.put @path_include_chinese, load_attachment("美女.jpg")
     end
 
     it 'return true if the file has been uploaded' do
@@ -55,5 +67,11 @@ describe Aliyun::Connection do
       @connection.delete @path
       expect(@connection.exists?(@path)).to be_falsey
     end
+
+    it "also return true for existed file with path include chinese characters" do
+      expect(@connection.exists?(@path_include_chinese)).to be_truthy
+      url = "http://#{@connection.aliyun_upload_host}/#{@path_include_chinese}"
+      expect(@connection.exists?(url)).to be_truthy
+    end
   end
 end

data/spec/lib/paperclip/storage/aliyun_spec.rb

@@ -69,5 +69,19 @@ describe Paperclip::Storage::Aliyun do
       response_code = Net::HTTP.get_response(URI.parse(attachment_url)).code
       expect(response_code).to eq('404')
     end
+
+    context "work with path include Chinese characters" do
+      before do
+        @file_with_chinese_char_name = load_attachment("美女.jpg")
+        @post_with_chinese_char_name_file = Post.create attachment: @file_with_chinese_char_name
+      end
+
+      it "deletes the attachment from Aliyun" do
+        attachment_url = @post_with_chinese_char_name_file.attachment.url
+        @post_with_chinese_char_name_file.destroy
+        response_code = Net::HTTP.get_response(URI.parse(attachment_url)).code
+        expect(response_code).to eq('404')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,8 +7,8 @@ Dir[Bundler.root.join('spec/support/**/*.rb')].each(&method(:require))
 
 # Aliyun defaults
 OSS_CONNECTION_OPTIONS = {
-  access_id: '3VL9XMho8iCuslj8',
-  access_key: 'VAUI2q7Tc6yTf1jr3kBsEUzZ84gEa2',
+  access_id: '4adTRa4dWto3vxiq',
+  access_key: 'hzEWBDWlt3N0SPPj6EfYAr4ISdaizW',
   bucket: 'martin-test',
   data_center: 'hangzhou',
   internal: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Martin Hong
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -60,6 +60,7 @@ files:
 - spec/aliyun_spec.rb
 - spec/attachments/girl.jpg
 - spec/attachments/masu.pdf
+- spec/attachments/美女.jpg
 - spec/fixtures/schema.rb
 - spec/lib/paperclip/storage/aliyun_spec.rb
 - spec/spec_helper.rb
@@ -90,4 +91,3 @@ signing_key:
 specification_version: 4
 summary: Extend a Aliyun OSS storage for paperclip
 test_files: []
-has_rdoc: