activestorage_upyun 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed799a10214b73035941a3cd3ce0df53715424118f5f92631f971da783776b14
-  data.tar.gz: 3ed031623b3be001835849dd329db0833fa996f73e110b47a10f55ee85c54372
+  metadata.gz: 73c80de02ef4e126bb4978f584f6be1cae119ea3b94607038e60bda1f7dbad88
+  data.tar.gz: 816fe2ceb51be81919920ae6926f7507ebb5c70976ba5ff5dd4f3d481590cf4f
 SHA512:
-  metadata.gz: ca715bd2e7f87244f2e537c4a732cafd0c802cc0cb5690ebab6853956ffefc213ae7600c21e9361b677b6a1f214bcafb7674ef28f0774c414bdfd31e803fd3e5
-  data.tar.gz: b74928ab2c6d61b7b0e6e14150189f4d71fcaa7fb821d1cb9b3e94353b98d59a7d51c19988eaa732f9c1a3bea020beb0f33f432144a974bc64a5f6a3a13c8585
+  metadata.gz: aead81d0973f6f46576ad8320face4cfc9e873eaed9c37db440b4c36da670d3b05cd4f1aba1b8adb2b1ed27e7a36c2dff606b800bb21c65d540bf54bc4ef54d4
+  data.tar.gz: 9e2cbd7adeef15f92ffed4d6f8086a44003572487525ab0b406aed781b9ae9fa70c5e985e0854fd76f0155322d20c948df981549d33f54a70d550361623c1105

data/lib/active_storage/service/upyun_service.rb

@@ -37,7 +37,7 @@ module ActiveStorage
       @upyun = Upyun::Rest.new(bucket, operator, password, options)
     end
 
-    def upload(key, io, checksum: nil, content_type: nil, disposition: nil, filename: nil)
+    def upload(key, io, checksum: nil, content_type: nil, disposition: nil, filename: nil, custom_metadata: {}, **)
       instrument :upload, key: key, checksum: checksum do
         begin
           result = @upyun.put(path_for(key), io)
@@ -89,7 +89,7 @@ module ActiveStorage
       end
     end
 
-    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
+    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {})
       instrument :url, key: key do |payload|
         url = [ENDPOINT, @bucket , @folder, key].join('/')
         payload[:url] = url
@@ -97,7 +97,7 @@ module ActiveStorage
       end
     end
 
-    def headers_for_direct_upload(key, content_type:, checksum:, content_length:, **)
+    def headers_for_direct_upload(key, content_type:, checksum:, custom_metadata: {}, **)
       user = @operator
       pwd = md5(@password)
       method = 'PUT'
@@ -109,13 +109,22 @@ module ActiveStorage
         OpenSSL::HMAC.digest('sha1', pwd, str)
       )
       auth = "UPYUN #{@operator}:#{signature}"
-      {"Content-Type" => content_type, "Authorization" => auth, "X-Date" => date}
+      {
+        "Content-Type" => content_type,
+        "Authorization" => auth,
+        "X-Date" => date,
+        **custom_metadata_headers(custom_metadata)
+      }
+    end
+
+    def custom_metadata_headers(metadata)
+      metadata.transform_keys { |key| "x-upyun-meta-#{key}" }
     end
 
     def delete_prefixed(prefix)
       instrument :delete_prefixed, prefix: prefix do
          items = @upyun.getlist "/#{@folder}/#{prefix}"
-         unless items[:error]
+         if items.is_a?(Array)
           items.each do |file|
            @upyun.delete("/#{@folder}/#{prefix}#{file[:name]}")
           end
@@ -129,7 +138,7 @@ module ActiveStorage
     def url_for(key, params: {})
       url = [@host, @folder, key].join('/')
       return url if params.blank?
-      process = params.delete(:process)
+      process = params.dig(:process)
       identifier = @upload_options[:identifier] || IDENTIFIER
       url = [url, process].join(identifier) if process
       url
@@ -140,7 +149,7 @@ module ActiveStorage
     end
 
     def fullpath(path)
-      decoded = URI::encode(URI::decode(path.to_s.force_encoding('utf-8')))
+      decoded = CGI.escape(CGI.unescape(path.to_s.force_encoding('utf-8')))
       decoded = decoded.gsub('[', '%5B').gsub(']', '%5D')
       "/#{@bucket}#{decoded.start_with?('/') ? decoded : '/' + decoded}"
     end

data/lib/activestorage_upyun/version.rb

@@ -1,3 +1,3 @@
 module ActivestorageUpyun
-  VERSION = '0.5.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_upyun
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - doabit
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -98,7 +98,7 @@ homepage: https://github.com/doabit/activestorage_upyun
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Upyun service for activestorage
 test_files: []