Respect default serving strategy in rails_{blob,representation}_{url,path}

Author: aliismayilov

activestorage/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   After setting `config.active_storage.resolve_model_to_route = :rails_storage_proxy`
+    `rails_blob_path` and `rails_representation_path` will generate proxy URLs by default.
+
+    *Ali Ismayilov*
+
 *   Declare `ActiveStorage::FixtureSet` and `ActiveStorage::FixtureSet.blob` to
     improve fixture integration
 

activestorage/config/routes.rb

@@ -16,19 +16,15 @@
   end
 
   direct :rails_representation do |representation, options|
-    signed_blob_id = representation.blob.signed_id
-    variation_key  = representation.variation.key
-    filename       = representation.blob.filename
-
-    route_for(:rails_blob_representation, signed_blob_id, variation_key, filename, options)
+    route_for(ActiveStorage.resolve_model_to_route, representation, options)
   end
 
   resolve("ActiveStorage::Variant") { |variant, options| route_for(ActiveStorage.resolve_model_to_route, variant, options) }
   resolve("ActiveStorage::VariantWithRecord") { |variant, options| route_for(ActiveStorage.resolve_model_to_route, variant, options) }
   resolve("ActiveStorage::Preview") { |preview, options| route_for(ActiveStorage.resolve_model_to_route, preview, options) }
 
   direct :rails_blob do |blob, options|
-    route_for(:rails_service_blob, blob.signed_id, blob.filename, options)
+    route_for(ActiveStorage.resolve_model_to_route, blob, options)
   end
 
   resolve("ActiveStorage::Blob")       { |blob, options| route_for(ActiveStorage.resolve_model_to_route, blob, options) }

activestorage/test/urls/rails_storage_proxy_url_test.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "database/setup"
+
+class RailsStorageProxyUrlTest < ActiveSupport::TestCase
+  include Rails.application.routes.url_helpers
+
+  setup do
+    @blob = create_file_blob filename: "racecar.jpg"
+    @was_resolve_model_to_route, ActiveStorage.resolve_model_to_route = ActiveStorage.resolve_model_to_route, :rails_storage_proxy
+  end
+
+  teardown do
+    ActiveStorage.resolve_model_to_route = @was_resolve_model_to_route
+  end
+
+  test "rails_storage_proxy_path generates proxy path" do
+    assert_includes rails_storage_proxy_path(@blob, only_path: true), "/rails/active_storage/blobs/proxy/"
+  end
+
+  test "rails_storage_redirect_path generates redirect path" do
+    assert_includes rails_storage_redirect_path(@blob, only_path: true), "/rails/active_storage/blobs/redirect/"
+  end
+
+  test "rails_blob_path generates proxy path" do
+    assert_includes rails_blob_path(@blob, only_path: true), "/rails/active_storage/blobs/proxy/"
+  end
+
+  test "rails_blob_path with variant generates proxy path" do
+    variant = @blob.variant(resize: "100x100")
+    assert_includes rails_blob_path(variant, only_path: true), "/rails/active_storage/representations/proxy/"
+  end
+
+  test "rails_representation_path generates proxy path" do
+    variant = @blob.variant(resize: "100x100")
+    assert_includes rails_representation_path(variant, only_path: true), "/rails/active_storage/representations/proxy/"
+  end
+end

activestorage/test/urls/rails_storage_redirect_url_test.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "database/setup"
+
+class RailsStorageRedirectUrlTest < ActiveSupport::TestCase
+  include Rails.application.routes.url_helpers
+
+  setup do
+    @blob = create_file_blob filename: "racecar.jpg"
+    @was_resolve_model_to_route, ActiveStorage.resolve_model_to_route = ActiveStorage.resolve_model_to_route, :rails_storage_redirect
+  end
+
+  teardown do
+    ActiveStorage.resolve_model_to_route = @was_resolve_model_to_route
+  end
+
+  test "rails_storage_proxy_path generates proxy path" do
+    assert_includes rails_storage_proxy_path(@blob, only_path: true), "/rails/active_storage/blobs/proxy/"
+  end
+
+  test "rails_storage_redirect_path generates redirect path" do
+    assert_includes rails_storage_redirect_path(@blob, only_path: true), "/rails/active_storage/blobs/redirect/"
+  end
+
+  test "rails_blob_path generates redirect path" do
+    assert_includes rails_blob_path(@blob, only_path: true), "/rails/active_storage/blobs/redirect/"
+  end
+
+  test "rails_blob_path with variant generates redirect path" do
+    variant = @blob.variant(resize: "100x100")
+    assert_includes rails_blob_path(variant, only_path: true), "/rails/active_storage/representations/redirect/"
+  end
+
+  test "rails_representation_path generates proxy path" do
+    variant = @blob.variant(resize: "100x100")
+    assert_includes rails_representation_path(variant, only_path: true), "/rails/active_storage/representations/redirect/"
+  end
+end