paperclip-storage-aliyun 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25b96669f6b0a9f6c7f727cecd1ef74045f3a69aa0ace67b0558b6c7f15fb358
-  data.tar.gz: 2ba4caf9e55a44037772e7059075cce390dcf27f6a903b052d058dd554d07189
+  metadata.gz: ff16e09b8b10e23dd324564800cc616a8a18f10f8b565232cc07828f188e4187
+  data.tar.gz: b19db842235f98300bebe578bc0ba04fe5d3901382aea376b14b5ecf49e7eae3
 SHA512:
-  metadata.gz: d46717fbd0418be321ae684a2ecc64c405fb4d51a8b265041896a924fa8994721962ba346902e9a95bb790a5b3cb9513a2bc05a63e0beddf2fe7f7dd377d166f
-  data.tar.gz: 1dc297fe30701431f94144ac5e08604f9181b45b188cf9f719dd30529b309a83cc5be8560fb5f54f3ecfe9bbd3ccfb48e3e5370e3ca2178300ec016da4c800e3
+  metadata.gz: b25f22a60b2c143cb8defa97c95046f7b03520298ba9a9467bd9252ff7629025aa7e3201cf4be8c38b093ea5e3730dc1d35d49eaa93e003953c82ff5b40f6e3f
+  data.tar.gz: dc7a329077c64cde95e3ffa7389f18bb386e1cd3d058434301e5e1e9db5ea6b122470b593f10bfc97f885b97e319fa7e83f07387cf752e56ea5ef4932f5baa25

data/lib/aliyun/connection.rb

@@ -20,6 +20,8 @@ module Aliyun
 
     attr_reader :aliyun_protocol
 
+    attr_reader :aliyun_protocol_relative_url
+
     # Initialize the OSS connection
     #
     # @param [Hash] An options to specify connection details
@@ -29,15 +31,17 @@ module Aliyun
     # @option data_center [String] available data center name, e.g. 'cn-hangzhou'
     # @option internal [true, false] if the service should be accessed through internal network
     # @option host_alias [String] the alias of the host, such as the CDN domain name
+    # @option protocol [String] 'http' or 'https', default to 'http'
+    # @option protocol_relative_url [true, false] if to use protocol relative url, https://en.wikipedia.org/wiki/Wikipedia:Protocol-relative_URL
     # @note both access_id and acces_key are related to authorization algorithm:
     #   https://docs.aliyun.com/#/pub/oss/api-reference/access-control&signature-header
     def initialize(options = {})
       @aliyun_access_id = options[:access_id]
       @aliyun_access_key = options[:access_key]
       @aliyun_bucket = options[:bucket]
+      @aliyun_protocol_relative_url = !!options[:protocol_relative_url]
       @aliyun_protocol = options[:protocol] || 'http'
 
-
       @aliyun_upload_host = "#{@aliyun_bucket}.#{get_endpoint(options)}"
       @aliyun_internal_host = "#{@aliyun_bucket}.#{get_endpoint(options.merge(internal: true))}"
       @aliyun_external_host = "#{@aliyun_bucket}.#{get_endpoint(options.merge(internal: false))}"

data/lib/aliyun/data_center.rb

@@ -2,7 +2,7 @@ require 'aliyun/errors'
 
 module Aliyun
   module DataCenter
-    # https://docs.aliyun.com/#/pub/oss/product-documentation/domain-region
+    # https://help.aliyun.com/document_detail/31837.html
     AVAILABLE_DATA_CENTERS = %w(
       oss-cn-hangzhou
       oss-cn-shanghai
@@ -11,6 +11,8 @@ module Aliyun
       oss-cn-zhangjiakou
       oss-cn-huhehaote
       oss-cn-shenzhen
+      oss-cn-heyuan
+      oss-cn-chengdu
       oss-cn-hongkong
       oss-us-west-1
       oss-us-east-1

data/lib/paperclip/storage/aliyun.rb

@@ -16,20 +16,28 @@ module Paperclip
         end
       end
 
+      def build_aliyun_object_url(host, style)
+        if oss_connection.aliyun_protocol_relative_url
+          "//#{host}/#{path(style).sub(%r{\A/}, '')}"
+        else
+          "#{oss_connection.aliyun_protocol}://#{host}/#{path(style).sub(%r{\A/}, '')}"
+        end
+      end
+
       def aliyun_upload_url(style = default_style)
-        "#{oss_connection.aliyun_protocol}://#{oss_connection.aliyun_upload_host}/#{path(style).sub(%r{\A/}, '')}"
+        build_aliyun_object_url(oss_connection.aliyun_upload_host, style)
       end
 
       def aliyun_internal_url(style = default_style)
-        "#{oss_connection.aliyun_protocol}://#{oss_connection.aliyun_internal_host}/#{path(style).sub(%r{\A/}, '')}"
+        build_aliyun_object_url(oss_connection.aliyun_internal_host, style)
       end
 
       def aliyun_external_url(style = default_style)
-        "#{oss_connection.aliyun_protocol}://#{oss_connection.aliyun_external_host}/#{path(style).sub(%r{\A/}, '')}"
+        build_aliyun_object_url(oss_connection.aliyun_external_host, style)
       end
 
       def aliyun_alias_url(style = default_style)
-        "#{oss_connection.aliyun_protocol}://#{oss_connection.aliyun_alias_host}/#{path(style).sub(%r{\A/}, '')}"
+        build_aliyun_object_url(oss_connection.aliyun_alias_host, style)
       end
 
       def exists?(style = default_style)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Martin Hong
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -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.6
 signing_key: 
 specification_version: 4
 summary: Extend a Aliyun OSS storage for paperclip