activestorage_qinium 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e590bb1798ce61b646b065e247820d3febcc2eebb0efa5475e2240701ccbf14a
-  data.tar.gz: 7711785ef96a898e174fa7157608a2b8f1e4d84a3b8e9a386ea0ff07fdf3c5f1
+  metadata.gz: '08e39c5af245eba9281ed6e5013a0747c36d7da69620adaf2244d70847a3e648'
+  data.tar.gz: 1158e940e113c509c04e56e9a3a99fdeb1cb1aa88144123c3078378b21b0e3db
 SHA512:
-  metadata.gz: 0e53820bad4cb1197da14cef634b6476d11b35222321033b90a4c7b7d356de72418dd33ebb2d3daaf660c167a6b13af1f1498e6e1571e3cc29bbd794abf0c830
-  data.tar.gz: a706dc0cb47e2b2e91832439d815e72e1a53ecce9426330ad28811860e61084dd99476d79f65f08034b1d57d5ee976c621ee58802096251f3ffb64c1f9724083
+  metadata.gz: 4ab2a096e129d3bf26b14c7766479dbd8b4ed6cdbcf70ba49d99d60a677eb63f375a1f2fd74c88dfeede77fe3b8e121c807ff9b99f71a6bdfc87de9626811130
+  data.tar.gz: bfadf92e3ac9affddf56a48438ef49d5780cb04183c356c506a04443126526b15056c5b1d5959d4ec130bca24eb37e9a418d4c82ea3af2042c25acb44f076df8

data/lib/active_storage/service/qinium_service.rb

@@ -10,7 +10,7 @@ module ActiveStorage
              to: :config
 
     def self.analyzers
-      [ActiveStorage::Analyzer::QiniumImageAnalyzer]
+      @analyzers ||= [ActiveStorage::Analyzer::QiniumImageAnalyzer]
     end
 
     def initialize(options)
@@ -132,25 +132,46 @@ module ActiveStorage
 
     def url(key, **options)
       instrument :url, key: key do |payload|
-        fop = if options[:fop].present? # 内容预处理
-                options[:fop]
-              elsif options[:disposition].to_s == "attachment" # 下载附件
-                attname = URI.encode_www_form_component (options[:filename] || key).to_s
-                "attname=#{attname}"
-              end
-
+        # 根据七牛云文档：https://developer.qiniu.com/kodo/1659/download-setting
+        # 1. 使用 attname 参数可以让浏览器下载而不是打开
+        # 2. 使用 response-content-disposition 参数可以自定义 Content-Disposition 响应头
+        # 3. 使用 response-content-type 参数可以自定义 Content-Type 响应头
+  
+        disposition = options[:disposition].to_s.downcase
+        content_type = options[:content_type]
+  
+        # 构建查询参数
+        query_params = []
+  
+        if options[:fop].present? # 内容预处理
+          query_params << options[:fop]
+        elsif disposition == "attachment" # 下载附件
+          attname = URI.encode_www_form_component (options[:filename] || key).to_s
+          query_params << "attname=#{attname}"
+        elsif disposition == "inline" # 预览（inline）
+          # 明确设置 Content-Disposition 为 inline，确保浏览器预览而不是下载
+          query_params << "response-content-disposition=inline"
+          # 如果提供了 content_type，也设置 Content-Type 响应头
+          # 这对于 PDF 文件特别重要，确保 Content-Type: application/pdf
+          query_params << "response-content-type=#{URI.encode_www_form_component(content_type)}" if content_type.present?
+        end
+  
+        # 构建 URL
         url = if config.public
                 url_encoded_key = key.split("/").map { |x| CGI.escape(x) }.join("/")
-                ["#{protocol}://#{domain}/#{url_encoded_key}", fop].compact.join("?")
+                base_url = "#{protocol}://#{domain}/#{url_encoded_key}"
+                query_params.any? ? "#{base_url}?#{query_params.join('&')}" : base_url
               else
                 expires_in = options[:expires_in] ||
                              Rails.application.config.active_storage.service_urls_expire_in ||
                              3600
+                # 对于私有资源，需要将查询参数传递给授权 URL 生成
+                fop = query_params.join('&') if query_params.any?
                 Qinium::Auth.authorize_download_url(domain, key,
                                                     access_key, secret_key,
                                                     schema: protocol, fop: fop, expires_in: expires_in)
               end
-
+  
         payload[:url] = url
         url
       end

data/lib/active_storage_qinium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageQinium
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_qinium
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - xiaohui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qinium