carrierwave-aliyun 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2566558b43cc5a630c144191041c2a623249734b2875e1da28f8778a553adf2b
-  data.tar.gz: 3f773081c2e49cd85b83b0677afc108694a1b9b604685460e815330f736b81dc
+  metadata.gz: 54c88d264e49631dd46a637080fc79b10cb73d487910a1608afd4ac67cf65561
+  data.tar.gz: 7362e2b9d48547d369994443b105af5f4d57f7a34b64a7c78b51b9ecf940aa8e
 SHA512:
-  metadata.gz: c51793690e631ceb49e0536f76471a4d34bf4cbbb8adeabfddfed95abd4d924c20f1c2c8ac017580bc8785c00c4f0ef1e3b30ca534ecc333aaeb20040fbfe38f
-  data.tar.gz: 34381bab3c7e15f45a231a37adba1481c75499083cdf69a408b0891bb2915ba517b4333926147760c2ee250d9a9675233e2f804068cd6f884f6d145ca71762de
+  metadata.gz: 6589f76ad4cc466e3bd1acb690a0759786cb7ec2517fe2e51c2aeb0ad044053ff1b6d373bc04b51c75db6cb34551f0fe1a9d22c688bb66579a1d8f8303af37c7
+  data.tar.gz: '00487944ad9d21be007c4f1148ce676e376c621f9d1de6207347d1f621351fda81c48b2f8100801cb6cff18965923447ae1034a396406da93b012280bb34590e'

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.0
+
+- 整理修复 OSS 文件访问 URL 的生成方式，去掉 img host，保持和最新 OSS API 一样的逻辑。
+- 生成 URL 的时候，不再强制替换为 https，保持 `aliyun_host` 的配置；
+
 ## 1.1.2
 
 - 修正 aliyun-sdk 0.7.0 以上 Thumb URL 生成的支持；

data/lib/carrierwave/aliyun/bucket.rb

@@ -3,12 +3,12 @@
 module CarrierWave
   module Aliyun
     class Bucket
-      PATH_PREFIX = %r{^/}
+      PATH_PREFIX = %r{^/}.freeze
       CHUNK_SIZE = 1024 * 1024
 
       attr_reader :access_key_id, :access_key_secret, :bucket, :region, :mode, :host
 
-      attr_reader :endpoint, :img_endpoint, :upload_endpoint
+      attr_reader :endpoint, :upload_endpoint, :get_endpoint
 
       def initialize(uploader)
         if uploader.aliyun_area.present?
@@ -16,7 +16,7 @@ module CarrierWave
           uploader.aliyun_region ||= uploader.aliyun_area
         end
 
-        if uploader.aliyun_private_read != nil
+        unless uploader.aliyun_private_read.nil?
           ActiveSupport::Deprecation.warn(%(config.aliyun_private_read will deprecation in carrierwave-aliyun 1.1.0, please use `aliyun_mode = :private` instead.))
           uploader.aliyun_mode ||= uploader.aliyun_private_read ? :private : :public
         end
@@ -38,15 +38,15 @@ module CarrierWave
         @mode              = (uploader.aliyun_mode || :public).to_sym
 
         # Host for get request
-        @host = uploader.aliyun_host || "https://#{self.bucket}.oss-#{self.region}.aliyuncs.com"
+        @endpoint = "https://#{bucket}.oss-#{region}.aliyuncs.com"
+        @host = uploader.aliyun_host || @endpoint
 
         unless @host.include?("//")
-          raise "config.aliyun_host requirement include // http:// or https://, but you give: #{self.host}"
+          raise "config.aliyun_host requirement include // http:// or https://, but you give: #{host}"
         end
 
-        @endpoint = "https://oss-#{self.region}.aliyuncs.com"
-        @upload_endpoint = uploader.aliyun_internal == true ? "https://oss-#{self.region}-internal.aliyuncs.com" : @endpoint
-        @img_endpoint = "https://img-#{self.region}.aliyuncs.com"
+        @get_endpoint = "https://oss-#{region}.aliyuncs.com"
+        @upload_endpoint = uploader.aliyun_internal == true ? "https://oss-#{region}-internal.aliyuncs.com" : "https://oss-#{region}.aliyuncs.com"
       end
 
       # 上传文件
@@ -70,7 +70,7 @@ module CarrierWave
             stream << file.read(CHUNK_SIZE) until file.eof?
           end
           path_to_url(path)
-        rescue => e
+        rescue StandardError => e
           raise "Put file failed: #{e}"
         end
       end
@@ -95,7 +95,7 @@ module CarrierWave
         end
 
         [obj, chunk_buff.join("")]
-      rescue => e
+      rescue StandardError => e
         raise "Get content faild: #{e}"
       end
 
@@ -110,36 +110,38 @@ module CarrierWave
         path = path.sub(PATH_PREFIX, "")
         oss_upload_client.delete_object(path)
         path_to_url(path)
-      rescue => e
+      rescue StandardError => e
         raise "Delete failed: #{e}"
       end
 
       ##
       # 根据配置返回完整的上传文件的访问地址
       def path_to_url(path, thumb: nil)
-        path = path.sub(PATH_PREFIX, "")
-
-        if thumb
-          [self.host, [path, thumb].join("")].join("/")
-        else
-          [self.host, path].join("/")
-        end
+        get_url(path, thumb: thumb)
       end
 
       # 私有空间访问地址，会带上实时算出的 token 信息
       # 有效期 15 minutes
       def private_get_url(path, thumb: nil)
+        get_url(path, private: true, thumb: thumb)
+      end
+
+      def get_url(path, private: false, thumb: nil)
         path = path.sub(PATH_PREFIX, "")
 
-        url = if thumb
-                thumb = thumb.gsub('?', '')
-                parameters = Hash[*thumb.split('=')]
-                img_client.object_url(path, true, 15.minutes, parameters)
+        url = if thumb&.start_with?("?")
+                # foo.jpg?x-oss-process=image/resize,h_100
+                parameters = { "x-oss-process" => thumb.split("=").last }
+                oss_client.object_url(path, private, 15.minutes, parameters)
               else
-                oss_client.object_url(path, true, 15.minutes)
+                oss_client.object_url(path, private, 15.minutes)
               end
 
-        url.sub("http://", "https://")
+        unless private
+          url = [url, thumb].join("") unless thumb&.start_with?("?")
+        end
+
+        url.sub(endpoint, host)
       end
 
       def head(path)
@@ -149,26 +151,19 @@ module CarrierWave
 
       private
 
-        def oss_client
-          return @oss_client if defined?(@oss_client)
-          client = ::Aliyun::OSS::Client.new(endpoint: self.endpoint,
-            access_key_id: self.access_key_id, access_key_secret: self.access_key_secret)
-          @oss_client = client.get_bucket(self.bucket)
-        end
+      def oss_client
+        return @oss_client if defined?(@oss_client)
 
-        def img_client
-          return @img_client if defined?(@img_client)
-          client = ::Aliyun::OSS::Client.new(endpoint: self.img_endpoint,
-            access_key_id: self.access_key_id, access_key_secret: self.access_key_secret)
-          @img_client = client.get_bucket(self.bucket)
-        end
+        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: self.upload_endpoint,
-            access_key_id: self.access_key_id, access_key_secret: self.access_key_secret)
-          @oss_upload_client = client.get_bucket(self.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)
+        @oss_upload_client = client.get_bucket(bucket)
+      end
     end
   end
 end

data/lib/carrierwave/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module CarrierWave
   module Aliyun
-    VERSION = "1.1.3"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave