activestorage_saas 5.2.5.2 → 7.2.3

data/lib/active_storage_saas/blob_model_mixin.rb

@@ -0,0 +1,48 @@
+require 'active_storage/service/saas_service'
+
+module ActiveStorageSaas
+  module BlobModelMixin
+    extend ActiveSupport::Concern
+
+    included do
+      prepend InstanceMethods
+    end
+
+    prepended do
+      prepend InstanceMethods
+    end
+
+    module InstanceMethods
+      extend ActiveSupport::Concern
+
+      prepended do
+        redefine_method :service do
+          @service ||= begin
+            raise KeyError, "storage service name should not be 'saas'" if service_name.to_s == 'saas'
+
+            services.fetch(service_name) { |_| ActiveStorageSaas.service_resolver.call(self) } || global_service
+          end
+        end
+
+        validate on: :save do
+          errors.add(:service_name, :invalid) if service_name.to_s == 'saas'
+        end
+      end
+
+      private
+
+        def global_service
+          self.class.service
+        end
+
+        def analyzer_class
+          analyzers = service.class.respond_to?(:analyzers) ? service.class.analyzers : ActiveStorage.analyzers
+          analyzers.detect { |klass| klass.accept?(self) } || ActiveStorage::Analyzer::NullAnalyzer
+        end
+
+        def validate_service_name_in_services
+          ActiveStorageSaas.service_name_validator.call(service_name) || super
+        end
+    end
+  end
+end

data/lib/active_storage_saas/direct_uploads_controller_mixin.rb

@@ -0,0 +1,31 @@
+module ActiveStorageSaas
+  module DirectUploadsControllerMixin
+    extend ActiveSupport::Concern
+
+    included do
+      prepend InstanceMethods
+    end
+
+    prepended do
+      prepend InstanceMethods
+    end
+
+    module InstanceMethods
+      def create
+        blob = ActiveStorage::Blob.create_before_direct_upload!(**blob_args)
+        render json: direct_upload_json(blob)
+      end
+
+      def callback
+        ActiveStorageSaas.direct_upload_callback.call(self)
+      end
+
+      private
+
+        def blob_args
+          super.merge(ActiveStorageSaas.direct_upload_extra_blob_args.call(self))
+               .merge(service_name: ActiveStorageSaas.service_name_converter.call(self))
+        end
+    end
+  end
+end

data/lib/active_storage_saas/engine.rb

@@ -1,17 +1,38 @@
+require 'active_storage_saas/blob_model_mixin'
+require 'active_storage_saas/direct_uploads_controller_mixin'
+require 'active_storage_saas/storage_service_configuration_model_mixin'
 module ActiveStorageSaas
   class Engine < Rails::Engine
-    config.before_configuration do
-      # disable active_storage routes
-      ActiveStorage::Engine.config.paths['config/routes.rb'] = []
+    config.generators do |g|
+      g.test_framework :rspec
+    end
+    config.active_storage_saas = ActiveSupport::OrderedOptions.new
+
+    initializer "active_storage_saas.configs" do
+      config.after_initialize do |app|
+        default_service_resolver = ->(blob) { StorageServiceConfiguration.from_service_name(blob.service_name)&.to_service }
+        default_service_name_converter = ->(controller) { StorageServiceConfiguration.first.to_service_name }
+        default_service_name_validator = ->(service_name) { StorageServiceConfiguration.valid_service_name?(service_name) }
+        default_direct_upload_extra_blob_args = ->(controller) { { } }
+        ActiveStorageSaas.service_resolver              = app.config.active_storage_saas.service_resolver || default_service_resolver
+        ActiveStorageSaas.service_name_converter        = app.config.active_storage_saas.service_name_converter || default_service_name_converter
+        ActiveStorageSaas.service_name_validator        = app.config.active_storage_saas.service_name_validator || default_service_name_validator
+        ActiveStorageSaas.direct_upload_extra_blob_args = app.config.active_storage_saas.direct_upload_extra_blob_args || default_direct_upload_extra_blob_args
+        ActiveStorage::Blob # call this class to load mixin
+      end
+
+      config.to_prepare do
+        ActiveStorage::DirectUploadsController.include ActiveStorageSaas::DirectUploadsControllerMixin
+      end
     end
 
     config.to_prepare do
       ActionDispatch::Routing::Mapper.include Routes
     end
 
-    initializer 'patch' do
+    initializer 'active_storage_saas.load_mixins' do
       ActiveSupport.on_load(:active_storage_blob) do
-        include ActiveStorageSaas::BlobPatch
+        include ActiveStorageSaas::BlobModelMixin
       end
     end
   end

data/lib/active_storage_saas/routes.rb

@@ -3,9 +3,9 @@ module ActiveStorageSaas
     # rubocop: disable Layout/LineLength
     def draw_active_storage_saas_routes(
       prefix: '/rails/active_storage',
-      blobs_controller: 'active_storage/blobs',
-      representations_controller: 'active_storage/representations',
-      disk_controller: 'active_storage/disk',
+      blobs_controller: 'active_storage_saas/blobs',
+      representations_controller: 'active_storage_saas/representations',
+      disk_controller: 'active_storage_saas/disk',
       direct_uploads_controller: 'active_storage_saas/direct_uploads',
       **option_overrides
     )

data/lib/active_storage_saas/storage_service_configuration_model_mixin.rb

@@ -0,0 +1,48 @@
+module ActiveStorageSaas
+  module StorageServiceConfigurationMixin
+    extend ActiveSupport::Concern
+
+    included do
+      prepend InstanceMethods
+    end
+
+    prepended do
+      prepend InstanceMethods
+    end
+
+    module InstanceMethods
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def service_name_pattern
+          /^#{name}:(\d+)$/
+        end
+
+        def from_service_name(service_name)
+          find_by(id: Regexp.last_match(1)) if service_name =~ service_name_pattern
+        end
+
+        def valid_service_name?(service_name)
+          service_name_pattern.match?(service_name)
+        end
+      end
+
+      def to_service
+        defined_service = ActiveStorage::Blob.services.fetch(service_name)
+        klass = defined_service.class
+        options = ActiveStorage::Blob.services.send(:configurations).fetch(service_name.to_sym).deep_dup
+        options.delete(:service) if service_name == 'amazon'
+        options.deep_merge! service_options.deep_symbolize_keys
+        klass.new(**options).tap do |instance|
+          instance.instance_eval <<~RUBY
+            define_singleton_method(:name) { "#{to_service_name}" }
+          RUBY
+        end
+      end
+
+      def to_service_name
+        "#{self.class.name}:#{id}"
+      end
+    end
+  end
+end

data/lib/active_storage_saas.rb

@@ -3,9 +3,11 @@
 module ActiveStorageSaas
   class Error < StandardError; end
 
-  mattr_accessor :tenant_class_name, default: 'Tenant'
+  mattr_accessor :service_resolver
+  mattr_accessor :service_name_converter
+  mattr_accessor :service_name_validator
+  mattr_accessor :direct_upload_extra_blob_args
 
   require 'active_storage_saas/routes'
-  require 'active_storage_saas/blob_patch'
   require 'active_storage_saas/engine'
 end

data/lib/generators/active_storage_saas/install/USAGE

@@ -0,0 +1,5 @@
+Description:
+    Install ActiveStorageSaas
+
+Example:
+    bin/rails generate active_storage_saas:install

data/lib/generators/active_storage_saas/install/install_generator.rb

@@ -0,0 +1,19 @@
+module ActiveStorageSaas
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path("templates", __dir__)
+    class_option :configuration_model, type: :string, default: 'StorageServiceConfiguration'
+
+    def generate_model
+      generate "model", "#{options['configuration_model']} service_name service_options:json"
+      inject_into_file "app/models/#{options['configuration_model'].underscore}.rb", after: /^class .+\n/ do <<-'RUBY'
+  include ActiveStorageSaas::StorageServiceConfigurationMixin
+
+RUBY
+      end
+    end
+
+    def copy_files
+      template 'config/initializers/active_storage_saas.rb'
+    end
+  end
+end

data/lib/generators/active_storage_saas/install/templates/config/initializers/active_storage_saas.rb

@@ -0,0 +1,6 @@
+Rails.application.configure do
+  # config.active_storage_saas.service_resolver = ->(blob) { StorageServiceConfiguration.from_service_name(blob.service_name)&.to_service }
+  # config.active_storage_saas.service_name_converter = ->(controller) { controller.send(:current_tenant).storage_service&.to_service_name }
+  # config.active_storage_saas.service_name_validator = ->(service_name) { StorageServiceConfiguration.valid_service_name?(service_name) }
+  # config.active_storage_saas.direct_upload_extra_blob_args = ->(controller) { { tenant: controller.send(:current_tenant) } }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_saas
 version: !ruby/object:Gem::Version
-  version: 5.2.5.2
+  version: 7.2.3
 platform: ruby
 authors:
 - xiaohui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2025-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 7.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 7.2.3
 description: Each tenant can set its own storage service, ActiveStorage service can
   be dynamically loaded.
 email:
@@ -32,31 +32,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- ".rubocop.yml"
+- AGENTS.md
 - CHANGELOG.md
+- COVERAGE.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
-- activestorage_saas.gemspec
-- app/controller/active_storage_saas/direct_uploads_controller.rb
-- app/javascript/active_storage_saas/direct_upload_controller.js
-- app/javascript/active_storage_saas/direct_upload_controller/blob_record.js
-- app/javascript/active_storage_saas/direct_upload_controller/blob_upload.js
-- app/javascript/active_storage_saas/direct_upload_controller/direct_upload.js
-- app/javascript/active_storage_saas/direct_upload_controller/file_checksum.js
-- app/javascript/active_storage_saas/direct_upload_controller/helpers.js
-- app/models/tenant_storage_service.rb
-- db/migrate/001_activestorage_saas_tables.rb
 - lib/active_storage/service/saas_service.rb
 - lib/active_storage_saas.rb
-- lib/active_storage_saas/blob_patch.rb
+- lib/active_storage_saas/blob_model_mixin.rb
+- lib/active_storage_saas/direct_uploads_controller_mixin.rb
 - lib/active_storage_saas/engine.rb
 - lib/active_storage_saas/routes.rb
+- lib/active_storage_saas/storage_service_configuration_model_mixin.rb
 - lib/activestorage_saas.rb
-- sig/activestorage_saas.rbs
+- lib/generators/active_storage_saas/install/USAGE
+- lib/generators/active_storage_saas/install/install_generator.rb
+- lib/generators/active_storage_saas/install/templates/config/initializers/active_storage_saas.rb
 homepage: https://github.com/xiaohui-zhangxh/activestorage_saas
 licenses:
 - MIT
@@ -79,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Wraps multi-tenant storage services as ActiveStorage service

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,17 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.6
-  NewCops: enable
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: single_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120
-
-Layout/IndentationConsistency:
-  Enabled: true
-  EnforcedStyle: indented_internal_methods

data/Gemfile.lock

@@ -1,112 +0,0 @@
-PATH
-  remote: .
-  specs:
-    activestorage_saas (5.2.5.1)
-      activestorage (= 5.2.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.2.5)
-      actionview (= 5.2.5)
-      activesupport (= 5.2.5)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.5)
-      activesupport (= 5.2.5)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.5)
-      activesupport (= 5.2.5)
-    activerecord (5.2.5)
-      activemodel (= 5.2.5)
-      activesupport (= 5.2.5)
-      arel (>= 9.0)
-    activestorage (5.2.5)
-      actionpack (= 5.2.5)
-      activerecord (= 5.2.5)
-      marcel (~> 1.0.0)
-    activesupport (5.2.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.2)
-    builder (3.2.4)
-    concurrent-ruby (1.1.10)
-    crass (1.0.6)
-    diff-lcs (1.5.0)
-    erubi (1.11.0)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    marcel (1.0.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.2)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.1.0)
-      ast (~> 2.4.1)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
-      rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.27.0)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
-    unicode-display_width (2.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activestorage_saas!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.21)
-
-BUNDLED WITH
-   2.3.10

data/Rakefile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]

data/activestorage_saas.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-activestorage_version = '5.2.5'
-gem_version = 2
-
-Gem::Specification.new do |spec|
-  spec.name = "activestorage_saas"
-  spec.version = "#{activestorage_version}.#{gem_version}"
-  spec.authors = ["xiaohui"]
-  spec.email = ["xiaohui@tanmer.com"]
-
-  spec.summary = "Wraps multi-tenant storage services as ActiveStorage service"
-  spec.description = "Each tenant can set its own storage service, ActiveStorage service can be dynamically loaded."
-  spec.homepage = "https://github.com/xiaohui-zhangxh/activestorage_saas"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.metadata["homepage_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)})
-    end
-  end
-
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activestorage", activestorage_version
-end

data/app/controller/active_storage_saas/direct_uploads_controller.rb

@@ -1,28 +0,0 @@
-class ActiveStorageSaas::DirectUploadsController < ActiveStorage::BaseController
-  def create
-    blob = ActiveStorage::Blob.create!(blob_args)
-    render json: direct_upload_json(blob)
-  end
-
-  def callback
-    raise NotImplementedError
-  end
-
-  private
-
-    def blob_args
-      blob_args = params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type).to_h.symbolize_keys
-      blob_args.merge! tenant: current_tenant, tenant_storage_service: current_tenant.storage_service
-    end
-
-    def direct_upload_json(blob)
-      blob.as_json(root: false, methods: :signed_id, only: :signed_id)
-          .merge(direct_upload: {
-                   url: blob.service_url_for_direct_upload,
-                   method: blob.service_http_method_for_direct_upload,
-                   responseType: blob.service_http_response_type_for_direct_upload,
-                   headers: blob.service_headers_for_direct_upload,
-                   formData: blob.service_form_data_for_direct_upload.presence
-                 })
-    end
-end

data/app/javascript/active_storage_saas/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_saas/direct_upload_controller/blob_upload.js

@@ -1,45 +0,0 @@
-export class BlobUpload {
-  constructor(blob) {
-    this.blob = blob
-    this.file = blob.file
-
-    const { url, headers, method, responseType } = blob.directUploadData
-
-    this.xhr = new XMLHttpRequest
-    this.xhr.open(method || "PUT", url, true)
-    this.xhr.responseType = 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) {
-    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.file.slice())
-    }
-  }
-
-  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)
-  }
-}