activestorage-aliyun 0.6.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed55a80edfa6cea56565fecdbfc7c3bad58d2516981dd352c4f944e3fc4f79c
-  data.tar.gz: 9be8033111a8ac4292ba371bdf56858d15344dee07b522c09ddcdfa7da834700
+  metadata.gz: 49de212acae6a9c8e99b3ca01602eca84414955eafc1f965b6e1a35fcdbc3241
+  data.tar.gz: 8923a8b87a36f28d34ccac03369a13d1cb18c9db9da94843437c1ef8d281cb46
 SHA512:
-  metadata.gz: f4c286312be492b34b44cf66d81f283a9f207b8c35c1c15754c7375a9bfc1aeeb03bcc5f03f04e6fbcf93f1807ef18cc4266c8e4611ed2075fa1722f062adfd8
-  data.tar.gz: f54e749f298d269c9106a899ff911fdf51785433f239f534232a259cb7eb3dce1edfe0a4d056bea65f1a852fa686693236f4472bf02d6b2c66f203578d9365ff
+  metadata.gz: cf61f0de45f6c8e7ea1e8b495beeab96ef523cb3984075b1b4727adb6dfc3fd8f3b97e8712825640482f8f34f2dc3b5142a9d384bba4d4fec7940f10bf623c98
+  data.tar.gz: c35ecb00a20b765844b241fd8eda14a9eafab64de1894ba7ec5d4a885b1a188cb985590c5b7460ebe8794dca7ecd4b9df802fa0616f401d4afa3133b51bcad62

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.0
+
+- Update for support Rals 6.1 permanent URL, and compatiable with Rails 6.0.
+- `mode` config has deprecated, use `public: true` instead.
+
 ## 0.6.4
 
 - Fix public url generate issue. #37

data/README.md

@@ -25,7 +25,7 @@ $ bundle
 config/storage.yml
 
 ```yml
-production:
+aliyun:
   service: Aliyun
   access_key_id: "your-oss-access-key-id"
   access_key_secret: "your-oss-access-key-secret"
@@ -33,19 +33,20 @@ production:
   endpoint: "https://oss-cn-beijing.aliyuncs.com"
   # path prefix, default: /
   path: "my-app-files"
-  # Bucket mode: [public, private], default: public
-  mode: "public"
+  # Bucket public: true/false, default: true, for generate public/private URL.
+  public: true
 ```
 
 ### Custom Domain
 
 ```yml
-production:
+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"
+  public: false
   # Enable cname to use custom domain
   cname: true
 ```

data/lib/active_storage/service/aliyun_service.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "aliyun/oss"
 
 module ActiveStorage
@@ -6,6 +7,14 @@ module ActiveStorage
     def initialize(**config)
       Aliyun::Common::Logging.set_log_file("/dev/null")
       @config = config
+
+      @public = @config.fetch(:public, false)
+
+      # Compatible with mode config
+      if @config.fetch(:mode, nil) == "public"
+        ActiveSupport::Deprecation.warn("mode has deprecated, and will remove in 1.1.0, use public: true instead.")
+        @public = true
+      end
     end
 
     CHUNK_SIZE = 1024 * 1024
@@ -68,26 +77,6 @@ module ActiveStorage
       end
     end
 
-    def url(key, expires_in:, filename: nil, content_type:, disposition:, params: {})
-      instrument :url, key: key do |payload|
-        sign    = private_mode? || disposition == :attachment
-        filekey = path_for(key)
-
-        if sign
-          params["response-content-type"] = content_type unless content_type.blank?
-
-          if filename
-            filename = ActiveStorage::Filename.wrap(filename)
-            params["response-content-disposition"] = content_disposition_with(type: disposition, filename: filename)
-          end
-        end
-
-        generated_url = object_url(filekey, sign: sign, expires_in: expires_in, params: params)
-        payload[:url] = generated_url
-        generated_url
-      end
-    end
-
     # You must setup CORS on OSS control panel to allow JavaScript request from your site domain.
     # https://www.alibabacloud.com/help/zh/doc-detail/31988.htm
     # https://help.aliyun.com/document_detail/31925.html
@@ -115,9 +104,47 @@ module ActiveStorage
       }
     end
 
+    # Remove this in Rails 6.1, compatiable with Rails 6.0.0
+    def url(key, **options)
+      instrument :url, key: key do |payload|
+        generated_url =
+          if public?
+            public_url(key, **options)
+          else
+            private_url(key, **options)
+          end
+
+        payload[:url] = generated_url
+
+        generated_url
+      end
+    end
+
     private
       attr_reader :config
 
+      def private_url(key, expires_in: 60, filename: nil, content_type: nil, disposition: nil, params: {}, **)
+        filekey = path_for(key)
+
+        params["response-content-type"] = content_type unless content_type.blank?
+
+        if filename
+          filename = ActiveStorage::Filename.wrap(filename)
+          params["response-content-disposition"] = content_disposition_with(type: disposition, filename: filename)
+        end
+
+        object_url(filekey, sign: true, expires_in: expires_in, params: params)
+      end
+
+      def public_url(key, params: {}, **)
+        object_url(path_for(key), sign: false, params: params)
+      end
+
+      # Remove this in Rails 6.1, compatiable with Rails 6.0.0
+      def public?
+        @public == true
+      end
+
       def path_for(key)
         root_path = config.fetch(:path, nil)
         if root_path.blank? || root_path == "/"
@@ -129,7 +156,7 @@ module ActiveStorage
         full_path.gsub(/^\//, "").gsub(/[\/]+/, "/")
       end
 
-      def object_url(key, sign:, expires_in: 60, params: {})
+      def object_url(key, sign: false, expires_in: 60, params: {})
         url = bucket.object_url(key, false)
         unless sign
           return url if params.blank?
@@ -151,7 +178,7 @@ module ActiveStorage
         string_to_sign = ["GET", "", "", expires, resource].join("\n")
         query["Signature"] = bucket.sign(string_to_sign)
 
-        [url, query.to_query].join('?')
+        [url, query.to_query].join("?")
       end
 
       def bucket
@@ -160,11 +187,6 @@ module ActiveStorage
         @bucket
       end
 
-      # Bucket mode :public | :private
-      def private_mode?
-        @private_mode ||= config.fetch(:mode, "public").to_s == "private"
-      end
-
       def authorization(key, content_type, checksum, date)
         filename = File.expand_path("/#{bucket.name}/#{path_for(key)}")
         addition_headers = "x-oss-date:#{date}"
@@ -185,6 +207,5 @@ module ActiveStorage
           cname: config.fetch(:cname, false)
         )
       end
-
   end
 end

data/lib/active_storage_aliyun/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveStorageAliyun
-  VERSION = '0.6.4'
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Jason Lee
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: aliyun-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Wraps the Aliyun OSS as an Active Storage service