activestorage-aliyun 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8321ccf6fc37943c33a6ac6058a28ecdc1b60830d0669c6cdd05dbb5d562cd79
-  data.tar.gz: d72dc8b28b787110497de6c0a774d6bf1488b066412fafe8d6d24782ef3ef638
+  metadata.gz: 8e1d0cce28e49848d648e656a281dd9a0848b2e3f601fcce2813977501e9f321
+  data.tar.gz: ce8902fe4003bc87ebe1ae6a7f7f1b55af136a05fbabc44856eaaf0e9116d0c8
 SHA512:
-  metadata.gz: b5086e941f5f4969b3cfbf5b3b329611090aa388d29dca9ab37478cf8937ccb3d8be0814aea78a6349b0fa7c4fd36e57257b86fb275f280ea01cc8d12aab5a21
-  data.tar.gz: 5722b12bd0c4f1b35ec9032ee470ae2dd55baa47f08663d2f7bc88c3870ee6417523f5fefd3bab9893066c6e5b84b8ef23f0a812360c297496d9ec04b133c197
+  metadata.gz: 1d55c0ac4bfbe3dcf9ad29a37990cc843e3d3352a3b978c8ec2ca702e30d2207be7d3edad2e6f2b44f56c87bf330a79a00f5eb0a40b291fe24fa940d2d976b61
+  data.tar.gz: 11e6a67d777d4c07f2cd9edcfef2886d47ccc6f5561cebc43e9df95722bee051a7e19ee8986dec9ae05d3010756a06964be9a0aa7d40908c7ff518823f741c67

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+https://github.com/huacnlee/activestorage-aliyun/releases
+
 ## 1.1.0
 
 - Add custo_metadata args in service method for Rails 7 supports.

data/README.md

@@ -28,12 +28,12 @@ config/storage.yml
 ```yml
 aliyun:
   service: Aliyun
-  access_key_id: "your-oss-access-key-id"
-  access_key_secret: "your-oss-access-key-secret"
-  bucket: "bucket-name"
-  endpoint: "https://oss-cn-beijing.aliyuncs.com"
+  access_key_id: 'your-oss-access-key-id'
+  access_key_secret: 'your-oss-access-key-secret'
+  bucket: 'bucket-name'
+  endpoint: 'https://oss-cn-beijing.aliyuncs.com'
   # path prefix, default: /
-  path: "my-app-files"
+  path: 'my-app-files'
   # Bucket public: true/false, default: true, for generate public/private URL.
   public: true
 ```
@@ -43,13 +43,13 @@ aliyun:
 ```yml
 aliyun:
   service: Aliyun
-  access_key_id: "your-oss-access-key-id"
-  access_key_secret: "your-oss-access-key-secret"
-  bucket: "bucket-name"
-  endpoint: "https://file.myhost.com"
+  access_key_id: 'your-oss-access-key-id'
+  access_key_secret: 'your-oss-access-key-secret'
+  bucket: 'bucket-name'
+  endpoint: 'https://oss-cn-beijing.aliyuncs.com'
   public: false
-  # Enable cname to use custom domain
-  cname: true
+  # Custom host for get file url, if this present, upload still use `endpoint`, but download url will use this.
+  host: 'https://file.myhost.com'
 ```
 
 ### Use for image url

data/lib/active_storage/service/aliyun_service.rb

@@ -29,7 +29,7 @@ module ActiveStorage
     end
 
     def download(key, &block)
-      if block_given?
+      if block
         instrument :streaming_download, key: key do
           bucket.get_object(path_for(key), &block)
         end
@@ -156,25 +156,25 @@ module ActiveStorage
     def path_for(key)
       root_path = config.fetch(:path, nil)
       full_path = if root_path.blank? || root_path == "/"
-                    key
-                  else
-                    File.join(root_path, key)
-                  end
+        key
+      else
+        File.join(root_path, key)
+      end
 
-      full_path.gsub(%r{^/}, "").gsub(%r{/+}, "/")
+      full_path.gsub(%r{^/}, "").squeeze("/")
     end
 
     def object_url(key, sign: false, expires_in: 60, params: {})
-      url = bucket.object_url(key, false)
+      url = host_bucket.object_url(key, false)
       unless sign
         return url if params.blank?
 
         return "#{url}?#{params.to_query}"
       end
 
-      resource = "/#{bucket.name}/#{key}"
-      expires  = Time.now.to_i + expires_in
-      query    = {
+      resource = "/#{host_bucket.name}/#{key}"
+      expires = Time.now.to_i + expires_in
+      query = {
         "Expires" => expires,
         "OSSAccessKeyId" => config.fetch(:access_key_id)
       }
@@ -183,7 +183,7 @@ module ActiveStorage
       resource += "?" + params.map { |k, v| "#{k}=#{v}" }.sort.join("&") if params.present?
 
       string_to_sign = ["GET", "", "", expires, resource].join("\n")
-      query["Signature"] = bucket.sign(string_to_sign)
+      query["Signature"] = host_bucket.sign(string_to_sign)
 
       [url, query.to_query].join("?")
     end
@@ -195,6 +195,14 @@ module ActiveStorage
       @bucket
     end
 
+    def host_bucket
+      return @host_bucket if defined? @host_bucket
+
+      host_bucket_client = host ? host_client : client
+      @host_bucket = host_bucket_client.get_bucket(config.fetch(:bucket))
+      @host_bucket
+    end
+
     def authorization(key, content_type, checksum, date)
       filename = File.expand_path("/#{bucket.name}/#{path_for(key)}")
       addition_headers = "x-oss-date:#{date}"
@@ -207,6 +215,10 @@ module ActiveStorage
       config.fetch(:endpoint, "https://oss-cn-hangzhou.aliyuncs.com")
     end
 
+    def host
+      config.fetch(:host, nil)
+    end
+
     def client
       @client ||= Aliyun::OSS::Client.new(
         endpoint: endpoint,
@@ -215,5 +227,14 @@ module ActiveStorage
         cname: config.fetch(:cname, false)
       )
     end
+
+    def host_client
+      @host_client ||= Aliyun::OSS::Client.new(
+        endpoint: host,
+        access_key_id: config.fetch(:access_key_id),
+        access_key_secret: config.fetch(:access_key_secret),
+        cname: config.fetch(:cname, false)
+      )
+    end
   end
 end

data/lib/active_storage_aliyun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageAliyun
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-aliyun
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aliyun-sdk
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Wraps the Aliyun OSS as an Active Storage service