activestorage_qinium 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a957256178e151a2f7cb7980ca1b5d14c2eb581f3aca737d08ef2b22fe3b9821
-  data.tar.gz: 67ed36ff67c18a64f3c7c990993cf289e84726a90b0eed2a9720a2efe4037fd7
+  metadata.gz: 7bb9c6ef6afef08f075c68b456b97cf3baae4a4e0a359387f25ff76ed808e4bf
+  data.tar.gz: 8cdcb99e4f67c3062e8e82ff54abfca70bce81883557c2a1efa0b3d130d63d3b
 SHA512:
-  metadata.gz: 992c598c417a4cb89131e57345f476eed8d461a2a02aa89fbc47cca29951297193ae1e035ef6b1f036209a764b1995076e826e98de2877ee3cf2a09fa3238f95
-  data.tar.gz: a208527fdd58e43fdeb7bf0304ac778a67aa8eec900ce5eca476b96e0f93c53028048b1a7964e2ac83f21eb3a7eb496b054036e2787f63740d7eac20a739217f
+  metadata.gz: 38ddca081df7e934137337ba619755c13788538dfb073f1a77f27789d6347e8bea77f5811b403d0de7d924c35e7b7b352398202efcdab59cddc998488f176d07
+  data.tar.gz: 174f234db5c018b6a65bb09c3c9979b10dcddf56b8772f9248f626bba3e90e321da2d9fc0c581fdddb4e35ba6d1b6bb12aa1cbf3b860f9d41561022f02043c5a

data/CHANGELOG.md

@@ -3,3 +3,7 @@
 ## [0.1.0] - 2022-08-10
 
 - Initial release
+
+## [0.2.1] - 2024-05-09
+
+- Support private download url

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    activestorage_qinium (0.1.0)
-      qinium (~> 0.1.1)
+    activestorage_qinium (0.3.0)
+      qinium (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -12,7 +12,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    qinium (0.1.1)
+    qinium (0.3.0)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)

data/activestorage_qinium.gemspec

@@ -15,11 +15,9 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] =spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
       (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
@@ -28,5 +26,5 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "qinium", "~> 0.1.1"
+  spec.add_dependency "qinium", "~> 0.3.0"
 end

data/lib/active_storage/service/qinium_service.rb

@@ -1,10 +1,12 @@
+require "open-uri"
+require "active_storage/analyzer/qinium_image_analyzer"
 module ActiveStorage
   class Service::QiniumService < Service
     attr_reader :qiniu
 
     delegate :config, :client, to: :qiniu
-    delegate :settings, :bucket_private, :bucket, :access_key, :secret_key, :domain,
-              :protocol, :put_policy_options,
+    delegate :settings, :bucket, :access_key, :secret_key, :domain,
+             :protocol, :put_policy_options,
              to: :config
 
     def self.analyzers
@@ -15,7 +17,7 @@ module ActiveStorage
       @qiniu = Qinium.new(options)
     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 = config.up_host
         payload[:url] = url
@@ -23,15 +25,25 @@ module ActiveStorage
       end
     end
 
-    def form_data_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
+    def http_method_for_direct_upload
+      "POST"
+    end
+
+    def http_response_type_for_direct_upload
+      "json"
+    end
+
+    def form_data_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, **)
       put_policy = Qinium::PutPolicy.new(config, key: key, expires_in: expires_in)
       put_policy.fsize_limit = content_length.to_i + 1000
-      put_policy.mime_limit = content_type
+      # OPTIMIZE: 暂时关闭文件类型限制，避免 xmind 文件无法上传
+      put_policy.mime_limit = nil
       put_policy.detect_mime = 1
       put_policy.insert_only = 1
       {
         key: key,
-        token: put_policy.to_token
+        token: put_policy.to_token,
+        ':file': "file"
       }
     end
 
@@ -46,19 +58,19 @@ module ActiveStorage
         host = nil
         while (blk = io.read(config.block_size))
           data = upload_blk(blk, token: up_token, host: host)
-          ctx = data.fetch('ctx')
-          host = data.fetch('host')
+          ctx = data.fetch("ctx")
+          host = data.fetch("host")
           file_size += blk.size
           blocks.push(ctx)
         end
 
-        _code, data, _headers = qiniu.object.mkfile(token: up_token, file_size: file_size, key: key, mime_type: content_type, blocks: blocks)
+        _code, data, _headers = qiniu.object.mkfile(token: up_token, file_size: file_size, key: key,
+                                                    mime_type: content_type, blocks: blocks)
         data
       end
     end
 
-    def update_metadata(key, **metadata)
-    end
+    def update_metadata(key, **metadata); end
 
     def download(key)
       if block_given?
@@ -81,7 +93,7 @@ module ActiveStorage
         uri = URI(url(key, disposition: :attachment))
         Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |client|
           client.get(uri,
-                     'Range' => "bytes=#{range.begin}-#{range.exclude_end? ? range.end - 1 : range.end}").body
+                     "Range" => "bytes=#{range.begin}-#{range.exclude_end? ? range.end - 1 : range.end}").body
         end
       end
     end
@@ -94,7 +106,13 @@ module ActiveStorage
 
     def delete_prefixed(prefix)
       instrument :delete_prefixed, prefix: prefix do
-        items_for(prefix).each { |item| delete item['key'] }
+        items_for(prefix).each { |item| delete item["key"] }
+      end
+    end
+
+    def fetch(target_url, key)
+      instrument :fetch, target_url: target_url, key: key do
+        qiniu.object.fetch(target_url, key)
       end
     end
 
@@ -110,20 +128,21 @@ module ActiveStorage
       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}"
+              elsif options[:disposition].to_s == "attachment" # 下载附件
+                attname = URI.encode_www_form_component (options[:filename] || key).to_s
                 "attname=#{attname}"
               end
 
-        url = if bucket_private
+        url = if config.public
+                url_encoded_key = key.split("/").map { |x| CGI.escape(x) }.join("/")
+                ["#{protocol}://#{domain}/#{url_encoded_key}", fop].compact.join("?")
+              else
                 expires_in = options[:expires_in] ||
                              Rails.application.config.active_storage.service_urls_expire_in ||
                              3600
-                qiniu.auth.authorize_download_url(settings, domain, key,
-                                                  schema: protocol, fop: fop, expires_in: expires_in)
-              else
-                url_encoded_key = key.split('/').map { |x| CGI.escape(x) }.join('/')
-                ["#{protocol}://#{domain}/#{url_encoded_key}", fop].compact.join('?')
+                Qinium::Auth.authorize_download_url(domain, key,
+                                                    access_key, secret_key,
+                                                    schema: protocol, fop: fop, expires_in: expires_in)
               end
 
         payload[:url] = url
@@ -133,9 +152,9 @@ module ActiveStorage
 
     private
 
-    def items_for(prefix = '')
+    def items_for(prefix = "")
       _code, data, _headers = qiniu.object.list(prefix: prefix)
-      data['items']
+      data["items"]
     end
 
     def upload_blk(blk, token:, host: nil)
@@ -147,8 +166,9 @@ module ActiveStorage
 
     def with_retries(max: 3)
       yield
-    rescue
+    rescue StandardError
       raise if max.zero?
+
       max -= 1
       retry
     end

data/lib/active_storage_qinium/version.rb

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

data/lib/active_storage_qinium.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "active_storage_qinium/version"
-
+require 'qinium'
 module ActiveStorageQinium
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_qinium
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - xiaohui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qinium
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.3.0
 description: Wraps the Qiniu Storage Service as an Active Storage service, support
   muti-tenant settings. https://www.qiniu.com
 email:
@@ -41,16 +41,9 @@ files:
 - README.md
 - Rakefile
 - activestorage_qinium.gemspec
-- app/javascript/active_storage_qinium/direct_upload_controller.js
-- app/javascript/active_storage_qinium/direct_upload_controller/blob_record.js
-- app/javascript/active_storage_qinium/direct_upload_controller/blob_upload.js
-- app/javascript/active_storage_qinium/direct_upload_controller/direct_upload.js
-- app/javascript/active_storage_qinium/direct_upload_controller/file_checksum.js
-- app/javascript/active_storage_qinium/direct_upload_controller/helpers.js
 - lib/active_storage/analyzer/qinium_image_analyzer.rb
 - lib/active_storage/service/qinium_service.rb
 - lib/active_storage_qinium.rb
-- lib/active_storage_qinium/engine.rb
 - lib/active_storage_qinium/version.rb
 - lib/activestorage_qinium.rb
 - sig/activestorage_qinium.rbs
@@ -76,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A muti-tenant SDK wrap the Qiniu Storage Service as an Active Storage service

data/app/javascript/active_storage_qinium/direct_upload_controller/blob_record.js

@@ -1,73 +0,0 @@
-import { getMetaValue } from "./helpers"
-
-export class BlobRecord {
-  constructor(file, checksum, url) {
-    this.file = file
-
-    this.attributes = {
-      filename: file.name,
-      content_type: file.type || "application/octet-stream",
-      byte_size: file.size,
-      checksum: checksum
-    }
-
-    this.xhr = new XMLHttpRequest
-    this.xhr.open("POST", url, true)
-    this.xhr.responseType = "json"
-    this.xhr.setRequestHeader("Content-Type", "application/json")
-    this.xhr.setRequestHeader("Accept", "application/json")
-    this.xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest")
-
-    const csrfToken = getMetaValue("csrf-token")
-    if (csrfToken != undefined) {
-      this.xhr.setRequestHeader("X-CSRF-Token", csrfToken)
-    }
-
-    this.xhr.addEventListener("load", event => this.requestDidLoad(event))
-    this.xhr.addEventListener("error", event => this.requestDidError(event))
-  }
-
-  get status() {
-    return this.xhr.status
-  }
-
-  get response() {
-    const { responseType, response } = this.xhr
-    if (responseType == "json") {
-      return response
-    } else {
-      // Shim for IE 11: https://connect.microsoft.com/IE/feedback/details/794808
-      return JSON.parse(response)
-    }
-  }
-
-  create(callback) {
-    this.callback = callback
-    this.xhr.send(JSON.stringify({ blob: this.attributes }))
-  }
-
-  requestDidLoad(event) {
-    if (this.status >= 200 && this.status < 300) {
-      const { response } = this
-      const { direct_upload } = response
-      delete response.direct_upload
-      this.attributes = response
-      this.directUploadData = direct_upload
-      this.callback(null, this.toJSON())
-    } else {
-      this.requestDidError(event)
-    }
-  }
-
-  requestDidError(event) {
-    this.callback(event, this)
-  }
-
-  toJSON() {
-    const result = {}
-    for (const key in this.attributes) {
-      result[key] = this.attributes[key]
-    }
-    return result
-  }
-}

data/app/javascript/active_storage_qinium/direct_upload_controller/blob_upload.js

@@ -1,45 +0,0 @@
-export class BlobUpload {
-  constructor(blob) {
-    this.blob = blob
-    this.file = blob.file
-    this.dataBuilder = blob.dataBuilder || ((ctx) => ctx.file.slice())
-    const { url, headers } = blob.directUploadData
-    this.xhr = new XMLHttpRequest
-    this.xhr.open("POST", url, true)
-    // this.xhr.responseType = "text"
-    for (const key in headers) {
-      this.xhr.setRequestHeader(key, headers[key])
-    }
-    this.xhr.addEventListener("load", event => this.requestDidLoad(event))
-    this.xhr.addEventListener("error", event => this.requestDidError(event))
-  }
-
-  create(callback) {
-    // debugger
-    this.callback = callback
-    if(this.blob.directUploadData.formData){
-      var formData
-      formData = new FormData()
-      for(const key in this.blob.directUploadData.formData){
-        formData.append(key, this.blob.directUploadData.formData[key])
-      }
-      formData.append('file', this.file)
-      this.xhr.send(formData)
-    }else{
-      this.xhr.send(this.dataBuilder(this.blob))
-    }
-  }
-
-  requestDidLoad(event) {
-    const { status, response } = this.xhr
-    if (status >= 200 && status < 300) {
-      this.callback(null, response)
-    } else {
-      this.requestDidError(event)
-    }
-  }
-
-  requestDidError(event) {
-    this.callback(event, this)
-  }
-}

data/app/javascript/active_storage_qinium/direct_upload_controller/direct_upload.js

@@ -1,48 +0,0 @@
-import { FileChecksum } from "./file_checksum"
-import { BlobRecord } from "./blob_record"
-import { BlobUpload } from "./blob_upload"
-
-let id = 0
-
-export class DirectUpload {
-  constructor(file, url, delegate) {
-    this.id = ++id
-    this.file = file
-    this.url = url
-    this.delegate = delegate
-  }
-
-  create(callback) {
-    FileChecksum.create(this.file, (error, checksum) => {
-      if (error) {
-        callback(error)
-        return
-      }
-
-      const blob = new BlobRecord(this.file, checksum, this.url)
-      notify(this.delegate, "directUploadWillCreateBlobWithXHR", blob.xhr)
-
-      blob.create(error => {
-        if (error) {
-          callback(error)
-        } else {
-          const upload = new BlobUpload(blob)
-          notify(this.delegate, "directUploadWillStoreFileWithXHR", upload.xhr)
-          upload.create(error => {
-            if (error) {
-              callback(error)
-            } else {
-              callback(null, blob.toJSON())
-            }
-          })
-        }
-      })
-    })
-  }
-}
-
-function notify(object, methodName, ...messages) {
-  if (object && typeof object[methodName] == "function") {
-    return object[methodName](...messages)
-  }
-}

data/app/javascript/active_storage_qinium/direct_upload_controller/file_checksum.js

@@ -1,53 +0,0 @@
-import SparkMD5 from "spark-md5"
-
-const fileSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice
-
-export class FileChecksum {
-  static create(file, callback) {
-    const instance = new FileChecksum(file)
-    instance.create(callback)
-  }
-
-  constructor(file) {
-    this.file = file
-    this.chunkSize = 2097152 // 2MB
-    this.chunkCount = Math.ceil(this.file.size / this.chunkSize)
-    this.chunkIndex = 0
-  }
-
-  create(callback) {
-    this.callback = callback
-    this.md5Buffer = new SparkMD5.ArrayBuffer
-    this.fileReader = new FileReader
-    this.fileReader.addEventListener("load", event => this.fileReaderDidLoad(event))
-    this.fileReader.addEventListener("error", event => this.fileReaderDidError(event))
-    this.readNextChunk()
-  }
-
-  fileReaderDidLoad(event) {
-    this.md5Buffer.append(event.target.result)
-
-    if (!this.readNextChunk()) {
-      const binaryDigest = this.md5Buffer.end(true)
-      const base64digest = btoa(binaryDigest)
-      this.callback(null, base64digest)
-    }
-  }
-
-  fileReaderDidError(event) {
-    this.callback(`Error reading ${this.file.name}`)
-  }
-
-  readNextChunk() {
-    if (this.chunkIndex < this.chunkCount || (this.chunkIndex == 0 && this.chunkCount == 0)) {
-      const start = this.chunkIndex * this.chunkSize
-      const end = Math.min(start + this.chunkSize, this.file.size)
-      const bytes = fileSlice.call(this.file, start, end)
-      this.fileReader.readAsArrayBuffer(bytes)
-      this.chunkIndex++
-      return true
-    } else {
-      return false
-    }
-  }
-}

data/app/javascript/active_storage_qinium/direct_upload_controller/helpers.js

@@ -1,51 +0,0 @@
-export function getMetaValue(name) {
-  const element = findElement(document.head, `meta[name="${name}"]`)
-  if (element) {
-    return element.getAttribute("content")
-  }
-}
-
-export function findElements(root, selector) {
-  if (typeof root == "string") {
-    selector = root
-    root = document
-  }
-  const elements = root.querySelectorAll(selector)
-  return toArray(elements)
-}
-
-export function findElement(root, selector) {
-  if (typeof root == "string") {
-    selector = root
-    root = document
-  }
-  return root.querySelector(selector)
-}
-
-export function dispatchEvent(element, type, eventInit = {}) {
-  const { disabled } = element
-  const { bubbles, cancelable, detail } = eventInit
-  const event = document.createEvent("Event")
-
-  event.initEvent(type, bubbles || true, cancelable || true)
-  event.detail = detail || {}
-
-  try {
-    element.disabled = false
-    element.dispatchEvent(event)
-  } finally {
-    element.disabled = disabled
-  }
-
-  return event
-}
-
-export function toArray(value) {
-  if (Array.isArray(value)) {
-    return value
-  } else if (Array.from) {
-    return Array.from(value)
-  } else {
-    return [].slice.call(value)
-  }
-}

data/app/javascript/active_storage_qinium/direct_upload_controller.js

@@ -1,55 +0,0 @@
-import { Controller } from "stimulus";
-import { DirectUpload } from "./direct_upload_controller/direct_upload";
-
-export default class extends Controller {
-  static targets = ['file'];
-  static values = {
-    'url': String
-  }
-
-  initialize(){
-    this.onFileChange = this.onFileChange.bind(this)
-  }
-
-  connect(){
-    this.hiddenInput = document.createElement("input")
-    this.hiddenInput.type = "hidden"
-    this.hiddenInput.name = this.fileTarget.name
-    this.fileTarget.removeAttribute('name')
-    this.fileTarget.insertAdjacentElement("beforebegin", this.hiddenInput)
-    this.fileTarget.addEventListener('change', this.onFileChange)
-  }
-
-  disconnect(){
-    this.fileTarget.removeEventListener('change', this.onFileChange)
-  }
-
-  onFileChange(event){
-    const { target } = event
-    const { files } = target
-    const directUpload = new DirectUpload(files[0], this.urlValue, this)
-
-    directUpload.create((error, attributes) => {
-      if(error){
-        this.hiddenInput.removeAttribute('value')
-      }else{
-        this.hiddenInput.setAttribute('value', attributes.signed_id)
-      }
-    })
-  }
-
-  // DirectUpload delegate
-
-  directUploadWillCreateBlobWithXHR(xhr) {
-    // this.dispatch("before-blob-request", { xhr })
-  }
-
-  directUploadWillStoreFileWithXHR(xhr) {
-    // this.dispatch("before-storage-request", { xhr })
-    xhr.upload.addEventListener("progress", event => this.uploadRequestDidProgress(event))
-  }
-
-  uploadRequestDidProgress(event){
-
-  }
-}

data/lib/active_storage_qinium/engine.rb

@@ -1,4 +0,0 @@
-module ActiveStorageQinium
-  class Engine < Rails::Engine
-  end
-end