carrierwave-aliyun 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d5d5c0acc30b46d90292f4a90c05e90667bdbf40ec97b279342aa215a4f2ff
-  data.tar.gz: f3b67cdf10f5800c250dafce535a6df95951c6c967e825f18fc3a656fa35268f
+  metadata.gz: 876c53c7233505f4afc350bbf46e91c8a488d1842a74f4ee5802259d96468846
+  data.tar.gz: b32c6cc04411c9f5c3115e78b91a7902f3d2a4068cbb325316631363c709de34
 SHA512:
-  metadata.gz: 4d0ba7b297d56905fdb8d24697e02e7ba56f89c0ea91ea7f73784746f404d2a7de2d0161c1a9b9b70c6e66050247ecc0828ce2396bccfa25ab24bd49ba11499c
-  data.tar.gz: 9a6ee10ee4fb3299e9ef3170f1b4e41bc32d5137ee601295b2fed394cc060148f371835519db6af16bc5e6bf0f3be6164b4462b7fba202929505fe0d21562bf6
+  metadata.gz: 8b5211cab35612c46cb22c50816bc9846682cac9aaf14ce293229201550df03c773fde7b843c3fcf6ab0eb1500a14cf7cd0866183be525c10d12dbb26ae4c08b
+  data.tar.gz: a3c1233546856b1fcc834810753bf4390f49dce8c8d9301b77e6096bc77a932280b83c386cf107c981053fefcefb5c1c103e069e1993362cd3937a18d33ef505

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.1
+
+- 对于 CarrierWave 的 cache 机制正确支持；
+
 ## 1.1.0
 
 - 支持 CarrierWave 2.0;

data/lib/carrierwave/aliyun/bucket.rb

@@ -75,6 +75,13 @@ module CarrierWave
         end
       end
 
+      def copy_object(source, dest)
+        source = source.sub(PATH_PREFIX, "")
+        dest = dest.sub(PATH_PREFIX, "")
+
+        oss_upload_client.copy_object(source, dest)
+      end
+
       # 读取文件
       # params:
       # - path - remote 存储路径
@@ -134,7 +141,8 @@ module CarrierWave
       end
 
       def head(path)
-        oss_client.get_object_meta(path)
+        path = path.sub(PATH_PREFIX, "")
+        oss_upload_client.get_object(path)
       end
 
       private

data/lib/carrierwave/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module CarrierWave
   module Aliyun
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/carrierwave/storage/aliyun.rb

@@ -3,14 +3,14 @@
 module CarrierWave
   module Storage
     class Aliyun < Abstract
-      def store!(file)
+      def store!(new_file)
         f = AliyunFile.new(uploader, self, uploader.store_path)
         headers = {
-          content_type: file.content_type,
+          content_type: new_file.content_type,
           content_disposition: uploader.try(:content_disposition)
         }
 
-        f.store(::File.open(file.file), headers)
+        f.store(new_file, headers)
         f
       end
 
@@ -18,19 +18,19 @@ module CarrierWave
         AliyunFile.new(uploader, self, uploader.store_path(identifier))
       end
 
-      def cache!(file)
-        f = AliyunFile.new(uploader, self, uploader.store_path)
+      def cache!(new_file)
+        f = AliyunFile.new(uploader, self, uploader.cache_path)
         headers = {
-          content_type: file.content_type,
+          content_type: new_file.content_type,
           content_disposition: uploader.try(:content_disposition)
         }
 
-        f.store(::File.open(file.file), headers)
+        f.store(new_file, headers)
         f
       end
 
       def retrieve_from_cache!(identifier)
-        AliyunFile.new(uploader, self, uploader.store_path(identifier))
+        AliyunFile.new(uploader, self, uploader.cache_path(identifier))
       end
 
       def delete_dir!(path)
@@ -38,8 +38,21 @@ module CarrierWave
       end
 
       def clean_cache!(_seconds)
-        raise 'use Object Lifecycle Management to clean the cache'
+        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
     end
   end
 end

data/lib/carrierwave/storage/aliyun_file.rb

@@ -2,23 +2,24 @@
 
 module CarrierWave
   module Storage
-    class AliyunFile < CarrierWave::SanitizedFile
-      attr_reader :path
+    class AliyunFile
+      attr_reader :uploader, :path
+
+      alias_method :filename, :path
+      alias_method :identifier, :filename
 
       def initialize(uploader, base, path)
-        @uploader = uploader
-        @path     = URI.encode(path)
-        @base     = base
+        @uploader, @path, @base = uploader, URI.encode(path), base
       end
 
       def read
-        object, body = bucket.get(@path)
+        object, body = bucket.get(path)
         @headers = object.headers
         body
       end
 
       def delete
-        bucket.delete(@path)
+        bucket.delete(path)
         true
       rescue => e
         # If the file's not there, don't panic
@@ -33,9 +34,9 @@ module CarrierWave
       #
       def url(opts = {})
         if bucket.mode == :private
-          bucket.private_get_url(@path, opts)
+          bucket.private_get_url(path, opts)
         else
-          bucket.path_to_url(@path, opts)
+          bucket.path_to_url(path, opts)
         end
       end
 
@@ -49,22 +50,49 @@ module CarrierWave
 
       def store(new_file, headers = {})
         if new_file.is_a?(self.class)
-          new_file.move_to(path)
+          new_file.copy_to(path)
         else
-          bucket.put(@path, new_file, headers)
+          fog_file = new_file.to_file
+          bucket.put(path, fog_file, headers)
+          fog_file.close if fog_file && !fog_file.closed?
         end
+        true
       end
 
       def headers
-        @headers ||= {}
+        @headers ||= begin
+          obj = bucket.head(path)
+          obj.headers
+        end
+      end
+
+      def exists?
+        !!headers
+      end
+
+      def copy_to(new_path)
+        bucket.copy_object(path, new_path)
+        self.class.new(uploader, @base, new_path)
+      end
+
+      def extension
+        path_elements = path.split(".")
+        path_elements.last if path_elements.size > 1
+      end
+
+      def original_filename
+        return @original_filename if @original_filename
+        if @file && @file.respond_to?(:original_filename)
+          @file.original_filename
+        elsif path
+          ::File.basename(path)
+        end
       end
 
       private
 
         def bucket
-          return @bucket if defined? @bucket
-
-          @bucket = CarrierWave::Aliyun::Bucket.new(@uploader)
+          @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
         end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave