activestorage-aliyun 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6de8c6a19e97cc39b456d90df755854de54dd4338b123c37d0276055056514f
-  data.tar.gz: 93f6427de6343b3d65be549c6d88676ed6141c17c66457f2a1848d200a2bfcf5
+  metadata.gz: 13d2065fdd23d9b862a8aab77c90ff972dccf68c9e42ee04e0fb04e62328026f
+  data.tar.gz: 3b3e025934acb414c4510562b5bd76dcb2217a4df52632e53fe80745a037ec02
 SHA512:
-  metadata.gz: ccb3cd37cd09c9dae72ee43fca32b5583900d184f12ea10b774d75f4b3b41df2139f34a308849e28a6820cb9f88e7f4de16a7fd30d4f4eb62dc1f4988ffc8187
-  data.tar.gz: 75de0836b30d849cd90397b0140b7e11ac01d0768effa5046f64d208d2027f32b06e61e3626568461f25aa0e020407866520019683ebd254294d4d6884586d0d
+  metadata.gz: e30124997158c3a6f42fd2810e582fd729955bab04c180cd5ef1bd4b37d9bb666e3abc9d5cfb37125ed3c46a0afdccbe41bc588863f5e0371f5dcdba0de75a31
+  data.tar.gz: 639a5f5ecdb2a9b3d0b1bdb47937893466bb15c61361412ee38d68f9755d9a1ca01f5a20b34e86cb8a9dfc20b25872adbfb40d43bda8d653207e3af456e1a0b0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.0
+
+- Fix upload method option for Rails 5.2.1.1
+- Fix signature issue when config path is / #20
+
 ## 0.5.1
 
 - Set OSS Object `content-type` on uploading.

data/lib/active_storage/service/aliyun_service.rb

@@ -8,9 +8,9 @@ module ActiveStorage
       @config = config
     end
 
-    def upload(key, io, checksum: nil)
+    def upload(key, io, checksum: nil, content_type: nil, disposition: nil, filename: nil)
       instrument :upload, key: key, checksum: checksum do
-        content_type = Marcel::MimeType.for(io)
+        content_type ||= Marcel::MimeType.for(io)
         bucket.put_object(path_for(key), content_type: content_type) do |stream|
           stream << io.read
         end
@@ -118,10 +118,13 @@ module ActiveStorage
 
       def path_for(key)
         root_path = config.fetch(:path, nil)
-        return key unless root_path
+        if root_path.blank? || root_path == "/"
+          full_path = key
+        else
+          full_path = File.join(root_path, key)
+        end
 
-        root_path = root_path.sub(/^\//, "")
-        File.join(root_path, key)
+        full_path.gsub(/^\//, "").gsub(/[\/]+/, "/")
       end
 
       def object_url(key, sign:, expires_in: 60, params: {})

data/lib/active_storage_aliyun/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageAliyun
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jason Lee