activestorage_upyun 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a1a49cc2be589a8801185a27f87bfcab3fbf97299f1075d48d9bbba213ee68b
-  data.tar.gz: f19761541aef40916fab6b03cce9fdde46d9e56eceefb0a581421432fd16ecf5
+  metadata.gz: 73c80de02ef4e126bb4978f584f6be1cae119ea3b94607038e60bda1f7dbad88
+  data.tar.gz: 816fe2ceb51be81919920ae6926f7507ebb5c70976ba5ff5dd4f3d481590cf4f
 SHA512:
-  metadata.gz: 34bcc7fb8348dac77d6efb4e0b8b7197725efa56594f518bd0bdb43e44178497c6d166b04c1df5983276b96c0cb529bfe81dbb8d4db7175c155fdf533ff61083
-  data.tar.gz: 330afc7754b0a809e3f1c1bb32aa4a9b2a2ed8d56fa57c3f078e2e92faf32ce20c02ea3c67f48b80a281420fe2ea11af522eccfb75e5fdbde079fbef6102c029
+  metadata.gz: aead81d0973f6f46576ad8320face4cfc9e873eaed9c37db440b4c36da670d3b05cd4f1aba1b8adb2b1ed27e7a36c2dff606b800bb21c65d540bf54bc4ef54d4
+  data.tar.gz: 9e2cbd7adeef15f92ffed4d6f8086a44003572487525ab0b406aed781b9ae9fa70c5e985e0854fd76f0155322d20c948df981549d33f54a70d550361623c1105

data/README.md

@@ -5,7 +5,7 @@ Upyun service for activestorage.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'activestorage_upyun'
+gem 'activestorage_upyun', require: false
 ```
 
 Set up upyun storage service in config/storage.yml:
@@ -13,9 +13,9 @@ Set up upyun storage service in config/storage.yml:
 ```yml
 upyun:
   service: Upyun
-  bucket: <%= ENV['UPYUUN_BUCKET'] %>
-  operator: <%= ENV['UPYUUN_OPERATOR'] %>
-  password: <%= ENV['UPYUUN_PASSWORD'] %>
+  bucket: <%= ENV['UPYUN_BUCKET'] %>
+  operator: <%= ENV['UPYUN_OPERATOR'] %>
+  password: <%= ENV['UPYUN_PASSWORD'] %>
   host: <%= ENV['UPYUN_HOST'] %>
   folder: <%= ENV['UPYUN_FOLDER'] %>
 ```
@@ -43,9 +43,9 @@ thumb version use `!` as default identifier, if you want to use `_` as identifie
 ```yml
 upyun:
   service: Upyun
-  bucket: <%= ENV['UPYUUN_BUCKET'] %>
-  operator: <%= ENV['UPYUUN_OPERATOR'] %>
-  password: <%= ENV['UPYUUN_PASSWORD'] %>
+  bucket: <%= ENV['UPYUN_BUCKET'] %>
+  operator: <%= ENV['UPYUN_OPERATOR'] %>
+  password: <%= ENV['UPYUN_PASSWORD'] %>
   host: <%= ENV['UPYUN_HOST'] %>
   folder: <%= ENV['UPYUN_FOLDER'] %>
   identifier: _

data/lib/active_storage/service/upyun_service.rb

@@ -1,3 +1,5 @@
+require "upyun"
+
 module ActiveStorage
   # Wraps the upyun Storage Service as an Active Storage service.
   # See ActiveStorage::Service for the generic API documentation that applies to all services.
@@ -7,9 +9,9 @@ module ActiveStorage
   #
   #   upyun:
   #     service: Upyun
-  #     bucket: <%= ENV['UPYUUN_BUCKET'] %>
-  #     operator: <%= ENV['UPYUUN_OPERATOR'] %>
-  #     password: <%= ENV['UPYUUN_PASSWORD'] %>
+  #     bucket: <%= ENV['UPYUN_BUCKET'] %>
+  #     operator: <%= ENV['UPYUN_OPERATOR'] %>
+  #     password: <%= ENV['UPYUN_PASSWORD'] %>
   #     host: <%= ENV['UPYUN_HOST'] %>
   #     folder: <%= ENV['UPYUN_FOLDER'] %>
   #
@@ -20,7 +22,7 @@ module ActiveStorage
   #
   #
   class Service::UpyunService < Service
-    ENDPOINT = 'http://v0.api.upyun.com'
+    ENDPOINT = 'https://v0.api.upyun.com'
     IDENTIFIER = '!'
 
     attr_reader :upyun, :bucket, :operator, :password, :host, :folder, :upload_options
@@ -35,7 +37,7 @@ module ActiveStorage
       @upyun = Upyun::Rest.new(bucket, operator, password, options)
     end
 
-    def upload(key, io, checksum: 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)
@@ -87,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
@@ -95,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'
@@ -107,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
@@ -127,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
@@ -138,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
@@ -151,4 +162,4 @@ module ActiveStorage
       Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
     end
   end
-end
+end

data/lib/activestorage_upyun/version.rb

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

data/lib/activestorage_upyun.rb

@@ -1,6 +1,4 @@
-require "upyun"
 require "activestorage_upyun/version"
 require 'active_storage/service/upyun_service'
 module ActivestorageUpyun
-  # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_upyun
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - doabit
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-29 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: []