carrierwave-aliyun 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76d49aaf688f569f6ad24269872e9ff3a773590d63533c472e5fe570bc673ab
-  data.tar.gz: 4a6d40ae6c492edb56fd5804ee7b69ff89cddbc88143f95dc7b2aa5bd8a6a898
+  metadata.gz: f6d5d5c0acc30b46d90292f4a90c05e90667bdbf40ec97b279342aa215a4f2ff
+  data.tar.gz: f3b67cdf10f5800c250dafce535a6df95951c6c967e825f18fc3a656fa35268f
 SHA512:
-  metadata.gz: 478a675dbb9dd3eaea1049c6a33dd892c5ff1458c615c1dff4d0eb6c4eb6a61cb8227bb7fb8d327679fed4cc29c24890ee1fb59399e431b2d845d2afa9960170
-  data.tar.gz: 935fc2b025cb985d5133b198d7aa82e3baec7e7328bea7b33152b2dd90efc753df3c94a407fa102f9bb88465b41cd35e0b953728b49f0956ed24f8ab15ac1e0e
+  metadata.gz: 4d0ba7b297d56905fdb8d24697e02e7ba56f89c0ea91ea7f73784746f404d2a7de2d0161c1a9b9b70c6e66050247ecc0828ce2396bccfa25ab24bd49ba11499c
+  data.tar.gz: 9a6ee10ee4fb3299e9ef3170f1b4e41bc32d5137ee601295b2fed394cc060148f371835519db6af16bc5e6bf0f3be6164b4462b7fba202929505fe0d21562bf6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0
+
+- 支持 CarrierWave 2.0;
+
 ## 1.0.0
 
 - 采用 Aliyun 官方的 SDK 来访问 OSS；

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -17,6 +17,29 @@ module CarrierWave
       def retrieve!(identifier)
         AliyunFile.new(uploader, self, uploader.store_path(identifier))
       end
+
+      def cache!(file)
+        f = AliyunFile.new(uploader, self, uploader.store_path)
+        headers = {
+          content_type: file.content_type,
+          content_disposition: uploader.try(:content_disposition)
+        }
+
+        f.store(::File.open(file.file), headers)
+        f
+      end
+
+      def retrieve_from_cache!(identifier)
+        AliyunFile.new(uploader, self, uploader.store_path(identifier))
+      end
+
+      def delete_dir!(path)
+        # do nothing, because there's no such things as 'empty directory'
+      end
+
+      def clean_cache!(_seconds)
+        raise 'use Object Lifecycle Management to clean the cache'
+      end
     end
   end
 end

data/lib/carrierwave/storage/aliyun_file.rb

@@ -47,8 +47,12 @@ module CarrierWave
         headers[:content_type] = new_content_type
       end
 
-      def store(file, headers = {})
-        bucket.put(@path, file, headers)
+      def store(new_file, headers = {})
+        if new_file.is_a?(self.class)
+          new_file.move_to(path)
+        else
+          bucket.put(@path, new_file, headers)
+        end
       end
 
       def headers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aliyun-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -72,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave