activestorage_saas 5.2.5.2 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d926492586f0ab3058a8ff4a48a7cec2824747366c677f9c91f5c46a658535
-  data.tar.gz: 1c57c47f19302d6edc4953e6dcf94cd7871f0e22dda6670955c99639f2e3fffb
+  metadata.gz: d2582d10000f7aae9780b0d273c172c4a76cb08c97bf092126979ce4110d00d8
+  data.tar.gz: 7f88a5f75a7a18bf1587d114e2b87d7d9888afd633d88488868910b495b2c72a
 SHA512:
-  metadata.gz: b9101363a32b4d5fbe122d0c7e4953fd10c0a7b2dce02f3d83c4ba42e80745a88d3a50111a4ad100417b6b4e2f3a6244cf5c16f8f07539afbaedea2ea8adde67
-  data.tar.gz: b5cb1539cbc4129abcee5c5f7b1df6a3b2773a9a87cd4426c223be3bd6ca41ab82632d93deff93b9a59fd4d90a97394c3ae320afc397f4ef0ea16bfd75aa0738
+  metadata.gz: f7d76f176c4a9c6ed75544f7008d874363c0cd9b80a372af94d93c8d24800835644fc18ed62e96546e4ea924491b789e8ec07e676e3aaa9bbc1e7b19bff4aad0
+  data.tar.gz: 5d9ed9018b5a423dc66ed88bec3b93e34abd12d060c11ca245767a9eb91aa22bf2115bbef8e73e1c5fdedf17a698c139303a641dd1da81ddbc617a30ce7fb998

data/Gemfile

@@ -5,8 +5,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activestorage_saas.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rails", "~> 7.0"
+gem "sqlite3"
+gem "propshaft"
+gem "rspec-rails", "~> 5.1"
 
-gem "rspec", "~> 3.0"
+gem "guard-rspec", "~> 4.7"
 
-gem "rubocop", "~> 1.21"
+gem "aws-sdk-s3", "~> 1.114"

data/Gemfile.lock

@@ -1,112 +1,236 @@
 PATH
   remote: .
   specs:
-    activestorage_saas (5.2.5.1)
-      activestorage (= 5.2.5)
+    activestorage_saas (7.0.4)
+      activestorage (>= 7.0.3.1, <= 7.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.5)
-      actionview (= 5.2.5)
-      activesupport (= 5.2.5)
-      rack (~> 2.0, >= 2.0.8)
+    actioncable (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4)
+      actionpack (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activesupport (= 7.0.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
+      rack (~> 2.0, >= 2.2.0)
       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)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.4)
+      actionpack (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       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)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.4)
+      activesupport (= 7.0.4)
+      globalid (>= 0.3.6)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activestorage (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activesupport (= 7.0.4)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4)
       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)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.664.0)
+    aws-sdk-core (3.168.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.117.1)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.2)
+      aws-eventstream (~> 1, >= 1.0.2)
     builder (3.2.4)
+    coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
     erubi (1.11.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    guard (2.18.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    jmespath (1.6.1)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    lumberjack (1.2.8)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
-    nokogiri (1.13.8)
+    minitest (5.16.3)
+    nenv (0.3.0)
+    net-imap (0.3.1)
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.1.0)
-      ast (~> 2.4.1)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    propshaft (0.6.4)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     racc (1.6.0)
     rack (2.2.4)
     rack-test (2.0.2)
       rack (>= 1.3)
+    rails (7.0.4)
+      actioncable (= 7.0.4)
+      actionmailbox (= 7.0.4)
+      actionmailer (= 7.0.4)
+      actionpack (= 7.0.4)
+      actiontext (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activemodel (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
+      bundler (>= 1.15.0)
+      railties (= 7.0.4)
     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)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     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)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       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)
+      rspec-support (~> 3.12.0)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.12.0)
+    shellany (0.0.1)
+    sqlite3 (1.5.4)
+      mini_portile2 (~> 2.8.0)
+    thor (1.2.1)
+    timeout (0.3.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activestorage_saas!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.21)
+  aws-sdk-s3 (~> 1.114)
+  guard-rspec (~> 4.7)
+  propshaft
+  rails (~> 7.0)
+  rspec-rails (~> 5.1)
+  sqlite3
 
 BUNDLED WITH
-   2.3.10
+   2.3.17

data/Guardfile

@@ -0,0 +1,42 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/Rakefile

@@ -1,12 +1,8 @@
-# frozen_string_literal: true
+require "bundler/setup"
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
 
-require "rubocop/rake_task"
+load "rails/tasks/statistics.rake"
 
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]
+require "bundler/gem_tasks"

data/activestorage_saas.gemspec

@@ -1,11 +1,8 @@
 # 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.version = "7.0.4"
   spec.authors = ["xiaohui"]
   spec.email = ["xiaohui@tanmer.com"]
 
@@ -29,5 +26,5 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activestorage", activestorage_version
+  spec.add_dependency "activestorage", '>=7.0.3.1', '<= 7.0.4'
 end

data/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

data/lib/active_storage/service/saas_service.rb

@@ -1,3 +1,4 @@
+require 'ruby2_keywords'
 module ActiveStorage
   class Service
     # # config/storage.yml
@@ -22,25 +23,32 @@ module ActiveStorage
       end
 
       Service.public_instance_methods(false).each do |name|
+        next if name.in?(%i[name=])
+
         define_method name do |*args, &block|
           service.public_send(name, *args, &block)
         end
+        ruby2_keywords name
+      end
+
+      def name=(_)
+        # do nothing, name should be service.name
       end
 
       redefine_method :url_expires_in do
         @options.fetch(:url_expires_in, 5.minutes)
       end
 
-      def method_missing(name, *args, &block)
+      ruby2_keywords def method_missing(name, *args, &block)
         service.public_send(name, *args, &block)
       end
 
-      def respond_to_missing?(method)
+      def respond_to_missing?(method, _include_all)
         service.respond_to?(method)
       end
 
       def http_method_for_direct_upload
-        service.service_http_method_for_direct_upload if service.respond_to?(:http_method_for_direct_upload)
+        service.http_method_for_direct_upload if service.respond_to?(:http_method_for_direct_upload)
       end
 
       def http_response_type_for_direct_upload
@@ -65,15 +73,12 @@ module ActiveStorage
       end
 
       def service
-        @service ||= blob&.tenant_storage_service&.to_service || default_service
+        @service ||= (blob && ActiveStorageSaas.service_resolver.call(blob)) || default_service
       end
 
-      private
-
-        def default_service
-          @default_service ||= ActiveStorage::Service.configure @options[:default_service],
-                                                                Rails.configuration.active_storage.service_configurations
-        end
+      def default_service
+        @default_service ||= ActiveStorage::Blob.services.fetch(@options[:default_service])
+      end
     end
   end
 end

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!(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,47 @@
+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)
+        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,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_saas
 version: !ruby/object:Gem::Version
-  version: 5.2.5.2
+  version: 7.0.4
 platform: ruby
 authors:
 - xiaohui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 7.0.3.1
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.3.1
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 7.0.4
 description: Each tenant can set its own storage service, ActiveStorage service can
   be dynamically loaded.
 email:
@@ -37,25 +43,23 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - 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
+- config/initializers/active_storage_saas.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
+- 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
 - sig/activestorage_saas.rbs
 homepage: https://github.com/xiaohui-zhangxh/activestorage_saas
 licenses:

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)
-  }
-}

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

@@ -1,78 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-import { DirectUpload } from "./direct_upload_controller/direct_upload";
-
-const URL = window.URL || window.webkitURL
-
-function setupFilePreview(target, file){
-  const onLoaded = function(){
-    URL.revokeObjectURL(target.src)
-    target.removeEventListener('load', onLoaded)
-  }
-  target.addEventListener('load', onLoaded)
-  target.src = URL.createObjectURL(file)
-}
-export default class extends Controller {
-  static targets = ['file', 'preview'];
-  static values = {
-    url: String,
-  }
-
-  initialize(){
-    this.onFileChange = this.onFileChange.bind(this)
-  }
-
-  fileTargetConnected(target){
-    if(!target.hiddenInput){
-      const hiddenInput = document.createElement("input")
-      hiddenInput.type = "hidden"
-      hiddenInput.name = target.name
-      target.insertAdjacentElement("beforebegin", hiddenInput)
-      target.removeAttribute('name')
-      target.hiddenInput = hiddenInput
-    }
-    target.addEventListener('change', this.onFileChange)
-  }
-
-  fileTargetDisconnected(target){
-    target.removeEventListener('change', this.onFileChange)
-  }
-
-  onFileChange(event){
-    const { target } = event
-    const { hiddenInput, files } = target
-    const file = files[0]
-    if(!file) return
-
-    const directUpload = new DirectUpload(file, this.urlValue, this)
-
-    if(this.hasPreviewTarget){
-      setupFilePreview(this.previewTarget, file)
-    }
-
-    directUpload.create((error, attributes) => {
-      if(error){
-        hiddenInput.removeAttribute('value')
-      }else{
-        hiddenInput.setAttribute('value', attributes.signed_id)
-      }
-    })
-  }
-
-  directUploadWillCreateBlobWithXHR(xhr) {
-    this.dispatch("before-blob-request", { detail: xhr })
-  }
-
-  directUploadWillStoreFileWithXHR(xhr) {
-    this.dispatch('started', { detail: xhr })
-    this.dispatch('progress', { detail: { percent: 0 } })
-    xhr.upload.addEventListener("progress", event => this.uploadRequestDidProgress(event))
-  }
-
-  uploadRequestDidProgress(event){
-    const percent = event.loaded / event.total
-    this.dispatch('progress', { detail: { percent } })
-    if(percent == 1){
-      this.dispatch('uploaded')
-    }
-  }
-}

data/app/models/tenant_storage_service.rb

@@ -1,5 +0,0 @@
-class TenantStorageService < ApplicationRecord
-  belongs_to :tenant, inverse_of: :storage_services
-
-  store :service_options, coder: ActiveRecord::Coders::JSON
-end

data/db/migrate/001_activestorage_saas_tables.rb

@@ -1,17 +0,0 @@
-class ActivestorageSaasTables < ActiveRecord::Migration[5.2]
-  def change
-    tenant_class = ActiveStorageSaas.tenant_class_name.constantize
-    tenant_primary_key = tenant_class.columns.find{|col| col.name == tenant_class.primary_key }
-    create_table :tenant_storage_services do |t|
-      t.references :tenant, type: tenant_primary_key.type, foreign_key: { to_table: tenant_class.table_name }
-      t.string :service_name
-      t.json :service_options
-
-      t.timestamps
-    end
-
-    add_reference tenant_class.table_name.to_sym, :tenant_storage_service, foreign_key: true
-    add_reference :active_storage_blobs, :tenant, type: tenant_primary_key.type, foreign_key: true
-    add_reference :active_storage_blobs, :tenant_storage_service, foreign_key: true
-  end
-end

data/lib/active_storage_saas/blob_patch.rb

@@ -1,51 +0,0 @@
-require 'active_storage/service/saas_service'
-
-module ActiveStorageSaas
-  module BlobPatch
-    extend ActiveSupport::Concern
-
-    included do
-      belongs_to :tenant, class_name: ActiveStorageSaas.tenant_class_name # rubocop: disable Rails/ReflectionClassName
-      belongs_to :tenant_storage_service, optional: true
-
-      redefine_method :service do
-        class_service = self.class.service
-        if class_service.is_a?(ActiveStorage::Service::SaasService)
-          @service ||= ActiveStorage::Service::SaasService.new(class_service.options.merge(blob: self))
-        else
-          class_service
-        end
-      end
-    end
-
-    def service_http_method_for_direct_upload
-      service.respond_to?(:http_method_for_direct_upload) ? service.http_method_for_direct_upload : nil
-    end
-
-    def service_http_response_type_for_direct_upload
-      service.respond_to?(:http_response_type_for_direct_upload) ? service.http_response_type_for_direct_upload : nil
-    end
-
-    # support sending data from form instead of headers
-    def service_form_data_for_direct_upload(expires_in: service.url_expires_in)
-      return {} unless service.respond_to?(:form_data_for_direct_upload)
-
-      service.form_data_for_direct_upload(key,
-                                          expires_in: expires_in,
-                                          content_type: content_type,
-                                          content_length: byte_size,
-                                          checksum: checksum)
-    end
-
-    private
-
-      def saas_service?
-        service.is_a?(ActiveStorage::Service::SaasService)
-      end
-
-      def analyzer_class
-        analyzers = saas_service? ? service.analyzers : ActiveStorage.analyzers
-        analyzers.detect { |klass| klass.accept?(self) } || ActiveStorage::Analyzer::NullAnalyzer
-      end
-  end
-end