Remove deprecated ActiveStorage::Current#host and `ActiveStorage::C…

…urrent#host=` methods
rails · Mar 3, 2023 · 0591de5 · 0591de5
1 parent 4edaa41
commit 0591de5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
+
+    *Rafael Mendonça França*
+
 *   Remove deprecated invalid default content types in Active Storage configurations.
 
     *Rafael Mendonça França*

diff --git a/activestorage/app/models/active_storage/current.rb b/activestorage/app/models/active_storage/current.rb
@@ -2,14 +2,4 @@
 
 class ActiveStorage::Current < ActiveSupport::CurrentAttributes # :nodoc:
   attribute :url_options
-
-  def host=(host)
-    ActiveStorage.deprecator.warn("ActiveStorage::Current.host= is deprecated, instead use ActiveStorage::Current.url_options=")
-    self.url_options = { host: host }
-  end
-
-  def host
-    ActiveStorage.deprecator.warn("ActiveStorage::Current.host is deprecated, instead use ActiveStorage::Current.url_options")
-    self.url_options&.dig(:host)
-  end
 end
diff --git a/activestorage/test/service/disk_service_test.rb b/activestorage/test/service/disk_service_test.rb
@@ -50,8 +50,7 @@ class ActiveStorage::Service::DiskServiceTest < ActiveSupport::TestCase
   end
 
   test "URL generation keeps working with ActiveStorage::Current.host set" do
-    ActiveStorage::Current.url_options = nil
-    assert_deprecated(ActiveStorage.deprecator) { ActiveStorage::Current.host = "https://example.com" }
+    ActiveStorage::Current.url_options = { host: "https://example.com" }
 
     original_url_options = Rails.application.routes.default_url_options.dup
     Rails.application.routes.default_url_options.merge!(protocol: "http", host: "test.example.com", port: 3001)

diff --git a/guides/source/7_1_release_notes.md b/guides/source/7_1_release_notes.md
@@ -122,6 +122,8 @@ Please refer to the [Changelog][active-storage] for detailed changes.
 
 *   Remove deprecated invalid default content types in Active Storage configurations.
 
+*   Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
+
 ### Deprecations
 
 ### Notable changes