carrierwave-aliyun 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a96d213f40d85c4e9cb135f1e32490fd3dcd2c38e1fe4c5fb866a0c06f8813
-  data.tar.gz: 372720e762645aed633542bce67a177b1718a1282ddf0012ca8d52eab554718d
+  metadata.gz: '09185a0291f96fed424df86a4be3815f13171b74f4b6d891b945de90bdc3924d'
+  data.tar.gz: ff50669bd39b9da0ff3b9c5c00c9e646fc0f3f46e7f0b1b45643c9d76abe66fd
 SHA512:
-  metadata.gz: a4957fb8b0998385cd932c142688cfd6dd8a2d9a971822a0fbf345e26382f2b44055e9a68e59a6ebc9c2ffae64a225eac6e30b97e43c4499ba177684982d38c0
-  data.tar.gz: 808b8d986b14cf9fcc25fd551c752a81e55bf59cd42db1b08b3c124a0de920254ea1f79fa5ca91a6c45ace1078716c097579f15f824edfa1117f5229a1b0c6db
+  metadata.gz: fd28e434c5bd6d43ccfff8f5b98dff4343d1440c3ded461397b95bde45e280bfde4481e0c06d0af3da8d38009620546c36cd777fd5c6bae893038e94533cc8ba
+  data.tar.gz: 88a37bc5bbf656be44cb50232943faac2ba26698fdee306f3441f0365e853066fdfb97297b9c7c0012d256ba80f02b69f78af8e585938de7917926dfa473f4a1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 1.2.1
 
+- 修正 #79 某些场景中文文件名无法正确上传的问题；
+- 修正 #70 上传文件以后 tmp 目录依然还残留着 cache 文件的问题；
+
+## 1.2.1
+
 - 实现 `size` 方法，修正更新图片数组时，新上传的图片会取代旧图片的问题。(#73)
 
 ## 1.2.0

data/README.md

@@ -2,7 +2,7 @@
 
 This gem adds support for [Aliyun OSS](http://oss.aliyun.com) to [CarrierWave](https://github.com/jnicklas/carrierwave/)
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-aliyun.svg)](https://rubygems.org/gems/carrierwave-aliyun) [![Build Status](https://travis-ci.org/huacnlee/carrierwave-aliyun.svg?branch=master)](https://travis-ci.org/huacnlee/carrierwave-aliyun) [![Code Climate](https://codeclimate.com/github/huacnlee/carrierwave-aliyun/badges/gpa.svg)](https://codeclimate.com/github/huacnlee/carrierwave-aliyun)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-aliyun.svg)](https://rubygems.org/gems/carrierwave-aliyun) [![build](https://github.com/huacnlee/carrierwave-aliyun/workflows/build/badge.svg)](https://github.com/huacnlee/carrierwave-aliyun/actions?query=workflow%3Abuild)
 
 > NOTE: 此 Gem 是一个 CarrierWave 的组件，你需要配合 CarrierWave 一起使用，如果你需要直接用 Aliyun OSS，可以尝试用 [aliyun-sdk](https://github.com/aliyun/aliyun-oss-ruby-sdk) 这个 Gem。
 

data/lib/carrierwave/aliyun/bucket.rb

@@ -6,9 +6,8 @@ module CarrierWave
       PATH_PREFIX = %r{^/}.freeze
       CHUNK_SIZE = 1024 * 1024
 
-      attr_reader :access_key_id, :access_key_secret, :bucket, :region, :mode, :host
-
-      attr_reader :endpoint, :upload_endpoint, :get_endpoint
+      attr_reader :access_key_id, :access_key_secret, :bucket, :region, :mode, :host, :endpoint, :upload_endpoint,
+                  :get_endpoint
 
       def initialize(uploader)
         if uploader.aliyun_area.present?
@@ -137,9 +136,7 @@ module CarrierWave
                 oss_client.object_url(path, private, 15.minutes)
               end
 
-        unless private
-          url = [url, thumb].join("") unless thumb&.start_with?("?")
-        end
+        url = [url, thumb].join("") if !private && !thumb&.start_with?("?")
 
         url.sub(endpoint, host)
       end
@@ -149,19 +146,26 @@ module CarrierWave
         oss_upload_client.get_object(path)
       end
 
+      # list_objects for test
+      def list_objects(opts = {})
+        oss_client.list_objects(opts)
+      end
+
       private
 
       def oss_client
         return @oss_client if defined?(@oss_client)
 
-        client = ::Aliyun::OSS::Client.new(endpoint: get_endpoint, access_key_id: access_key_id, access_key_secret: access_key_secret)
+        client = ::Aliyun::OSS::Client.new(endpoint: get_endpoint, access_key_id: access_key_id,
+                                           access_key_secret: access_key_secret)
         @oss_client = client.get_bucket(bucket)
       end
 
       def oss_upload_client
         return @oss_upload_client if defined?(@oss_upload_client)
 
-        client = ::Aliyun::OSS::Client.new(endpoint: upload_endpoint, access_key_id: access_key_id, access_key_secret: access_key_secret)
+        client = ::Aliyun::OSS::Client.new(endpoint: upload_endpoint, access_key_id: access_key_id,
+                                           access_key_secret: access_key_secret)
         @oss_upload_client = client.get_bucket(bucket)
       end
     end

data/lib/carrierwave/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module CarrierWave
   module Aliyun
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

data/lib/carrierwave/storage/aliyun.rb

@@ -37,22 +37,11 @@ module CarrierWave
         # do nothing, because there's no such things as 'empty directory'
       end
 
-      def clean_cache!(_seconds)
-        will_remove_keys = []
-        bucket.list_objects(prefix: uploader.cache_path).each do |file|
-          next unless file.is_a?(Object)
-          time = file.key.scan(/(\d+)-\d+-\d+(?:-\d+)?/).first.map { |t| t.to_i }
-          time = Time.at(*time)
-          will_remove_keys << item.key if time < (Time.now.utc - seconds)
-        end
-        bucket.batch_delete_objects(will_remove_keys)
-      end
-
       private
 
-        def bucket
-          @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
-        end
+      def bucket
+        @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
+      end
     end
   end
 end

data/lib/carrierwave/storage/aliyun_file.rb

@@ -6,11 +6,13 @@ module CarrierWave
       attr_writer :file
       attr_reader :uploader, :path
 
-      alias_method :filename, :path
-      alias_method :identifier, :filename
+      alias filename path
+      alias identifier filename
 
       def initialize(uploader, base, path)
-        @uploader, @path, @base = uploader, escape(path), base
+        @uploader = uploader
+        @path = path
+        @base = base
       end
 
       def file
@@ -18,11 +20,9 @@ module CarrierWave
       end
 
       def size
-        file.headers[:content_length].to_i rescue nil
-      end
-
-      def escape(path)
-        CGI.escape(path).gsub("%2F", "/")
+        file.headers[:content_length].to_i
+      rescue StandardError
+        nil
       end
 
       def read
@@ -34,7 +34,7 @@ module CarrierWave
       def delete
         bucket.delete(path)
         true
-      rescue => e
+      rescue StandardError => e
         # If the file's not there, don't panic
         puts "carrierwave-aliyun delete file failed: #{e}"
         nil
@@ -95,7 +95,8 @@ module CarrierWave
 
       def original_filename
         return @original_filename if @original_filename
-        if @file && @file.respond_to?(:original_filename)
+
+        if @file&.respond_to?(:original_filename)
           @file.original_filename
         elsif path
           ::File.basename(path)
@@ -104,9 +105,9 @@ module CarrierWave
 
       private
 
-        def bucket
-          @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
-        end
+      def bucket
+        @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave