Move Rails version specific code in separated modules

Author: Mattia Roccoberton

lib/active_storage/service/db_service.rb

@@ -1,11 +1,24 @@
 # frozen_string_literal: true
 
+require 'active_storage/service/db_service_rails60'
+require 'active_storage/service/db_service_rails61'
+require 'active_storage/service/db_service_rails70'
+
 module ActiveStorage
   # Wraps a DB table as an Active Storage service. See ActiveStorage::Service
   # for the generic API documentation that applies to all services.
   class Service::DBService < Service
-    def initialize(**)
+    if Rails::VERSION::MAJOR >= 7
+      include ActiveStorage::DBServiceRails70
+    elsif Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR == 1
+      include ActiveStorage::DBServiceRails61
+    else
+      include ActiveStorage::DBServiceRails60
+    end
+
+    def initialize(public: false, **)
       @chunk_size = ENV.fetch('ASDB_CHUNK_SIZE') { 1.megabytes }
+      @public = public
     end
 
     def upload(key, io, checksum: nil, **)
@@ -62,17 +75,6 @@ def exist?(key)
       end
     end
 
-    if Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR == 0
-      def url(key, expires_in:, filename:, disposition:, content_type:)
-        instrument :url, key: key do |payload|
-          opts = { expires_in: expires_in, filename: filename, content_type: content_type, disposition: disposition }
-          generate_url(key, opts).tap do |generated_url|
-            payload[:url] = generated_url
-          end
-        end
-      end
-    end
-
     def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {})
       instrument :url, key: key do |payload|
         verified_token_with_expiration = ActiveStorage.verifier.generate(
@@ -99,25 +101,6 @@ def headers_for_direct_upload(_key, content_type:, **)
 
     private
 
-    def current_host
-      if ActiveStorage::Current.respond_to? :url_options
-        opts = ActiveStorage::Current.url_options || {}
-        url = "#{opts[:protocol]}#{opts[:host]}"
-        url += ":#{opts[:port]}" if opts[:port]
-        url || ''
-      else
-        ActiveStorage::Current.host
-      end
-    end
-
-    def private_url(key, expires_in:, filename:, content_type:, disposition:, **)
-      generate_url(key, expires_in: expires_in, filename: filename, content_type: content_type, disposition: disposition)
-    end
-
-    def public_url(key, filename:, content_type: nil, disposition: :attachment, **)
-      generate_url(key, expires_in: nil, filename: filename, content_type: content_type, disposition: disposition)
-    end
-
     def generate_url(key, expires_in:, filename:, content_type:, disposition:)
       content_disposition = content_disposition_with(type: disposition, filename: filename)
       verified_key_with_expiration = ActiveStorage.verifier.generate(
@@ -164,13 +147,5 @@ def stream(key)
     def url_helpers
       @url_helpers ||= ::ActiveStorageDB::Engine.routes.url_helpers
     end
-
-    def url_options
-      if ActiveStorage::Current.respond_to? :url_options
-        ActiveStorage::Current.url_options
-      else
-        { host: ActiveStorage::Current.host }
-      end
-    end
   end
 end

lib/active_storage/service/db_service_rails60.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ActiveStorage
+  module DBServiceRails60
+    def url(key, expires_in:, filename:, disposition:, content_type:)
+      instrument :url, key: key do |payload|
+        generate_url(key, expires_in: expires_in, filename: filename, content_type: content_type, disposition: disposition).tap do |generated_url|
+          payload[:url] = generated_url
+        end
+      end
+    end
+
+    private
+
+    def current_host
+      url_options[:host]
+    end
+
+    def url_options
+      {
+        host: ActiveStorage::Current.host
+      }
+    end
+  end
+end

lib/active_storage/service/db_service_rails61.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ActiveStorage
+  module DBServiceRails61
+    private
+
+    def current_host
+      url_options[:host]
+    end
+
+    def private_url(key, expires_in:, filename:, content_type:, disposition:, **)
+      generate_url(
+        key,
+        expires_in: expires_in,
+        filename: filename,
+        content_type: content_type,
+        disposition: disposition
+      )
+    end
+
+    def public_url(key, filename:, content_type: nil, disposition: :attachment, **)
+      generate_url(
+        key,
+        expires_in: nil,
+        filename: filename,
+        content_type: content_type,
+        disposition: disposition
+      )
+    end
+
+    def url_options
+      {
+        host: ActiveStorage::Current.host
+      }
+    end
+  end
+end

lib/active_storage/service/db_service_rails70.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ActiveStorage
+  module DBServiceRails70
+    private
+
+    def current_host
+      opts = url_options || {}
+      url = "#{opts[:protocol]}#{opts[:host]}"
+      url + ":#{opts[:port]}" if opts[:port]
+    end
+
+    def private_url(key, expires_in:, filename:, content_type:, disposition:, **)
+      generate_url(
+        key,
+        expires_in: expires_in,
+        filename: filename,
+        content_type: content_type,
+        disposition: disposition
+      )
+    end
+
+    def public_url(key, filename:, content_type: nil, disposition: :attachment, **)
+      generate_url(
+        key,
+        expires_in: nil,
+        filename: filename,
+        content_type: content_type,
+        disposition: disposition
+      )
+    end
+
+    def url_options
+      ActiveStorage::Current.url_options
+    end
+  end
+end

spec/rails_helper.rb

@@ -6,6 +6,12 @@
   add_filter %r{^/lib/active_storage_db/version.rb}
   add_filter %r{^/spec/}
   add_filter %r{^/vendor/}
+
+  case ENV['RAILS']
+  when '6.0' then add_filter /_rails61|_rails70/
+  when '6.1' then add_filter /_rails60|_rails70/
+  when '7.0' then add_filter /_rails60|_rails61/
+  end
 end
 
 require 'spec_helper'
@@ -35,13 +41,22 @@
   config.use_transactional_fixtures = true
 
   config.before(:suite) do
+    db_config =
+      if ActiveRecord::Base.respond_to? :connection_db_config
+        ActiveRecord::Base.connection_db_config.configuration_hash
+      else
+        ActiveRecord::Base.connection_config
+      end
+
     intro = ('-' * 80)
     intro << "\n"
     intro << "- Ruby:          #{RUBY_VERSION}\n"
     intro << "- Rails:         #{Rails.version}\n"
     intro << "- ActiveStorage: #{ActiveStorage.version}\n"
-    intro << "- DB_TEST:       #{ENV['DB_TEST']}\n"
+    intro << "- DB adapter:    #{db_config[:adapter]}\n"
+    intro << "- DB name:       #{db_config[:database]}\n"
     intro << ('-' * 80)
+
     RSpec.configuration.reporter.message(intro)
   end
 end