Skip to content

Commit f00157e

Browse files
authored
Merge pull request rails#53153 from zzak/asto-registry-inspect
Add inspect to ActiveStorage::Service, ActiveStorage::Service::Registry, and ActiveStorage::Service::Configurator
2 parents c62ddb1 + 357bb38 commit f00157e

File tree

6 files changed

+67
-0
lines changed

6 files changed

+67
-0
lines changed

activestorage/lib/active_storage/service.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ def public?
148148
@public
149149
end
150150

151+
def inspect # :nodoc:
152+
"#<#{self.class}#{name.present? ? " name=#{name.inspect}" : ""}>"
153+
end
154+
151155
private
152156
def private_url(key, expires_in:, filename:, disposition:, content_type:, **)
153157
raise NotImplementedError

activestorage/lib/active_storage/service/configurator.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ def build(service_name)
1919
)
2020
end
2121

22+
def inspect # :nodoc:
23+
attrs = configurations.any? ?
24+
" configurations=[#{configurations.keys.map(&:inspect).join(", ")}]" : ""
25+
"#<#{self.class}#{attrs}>"
26+
end
27+
2228
private
2329
def config_for(name)
2430
configurations.fetch name do

activestorage/lib/active_storage/service/registry.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ def fetch(name)
2222
end
2323
end
2424

25+
def inspect # :nodoc:
26+
attrs = configurations.any? ?
27+
" configurations=[#{configurations.keys.map(&:inspect).join(", ")}]" : ""
28+
"#<#{self.class}#{attrs}>"
29+
end
30+
2531
private
2632
attr_reader :configurations, :services
2733

activestorage/test/service/configurator_test.rb

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,19 @@ class ActiveStorage::Service::ConfiguratorTest < ActiveSupport::TestCase
2121
end
2222
end
2323

24+
test "inspect attributes" do
25+
config = {
26+
local: { service: "Disk", root: "/tmp/active_storage_configurator_test" },
27+
tmp: { service: "Disk", root: "/tmp/active_storage_configurator_test_tmp" },
28+
}
29+
30+
configurator = ActiveStorage::Service::Configurator.new(config)
31+
assert_match(/#<ActiveStorage::Service::Configurator configurations=\[:local, :tmp\]>/, configurator.inspect)
32+
33+
configurator = ActiveStorage::Service::Configurator.new({})
34+
assert_match(/#<ActiveStorage::Service::Configurator>/, configurator.inspect)
35+
end
36+
2437
test "azure service is deprecated" do
2538
msg = <<~MSG.squish
2639
`ActiveStorage::Service::AzureStorageService` is deprecated and will be
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# frozen_string_literal: true
2+
3+
require "test_helper"
4+
5+
class ActiveStorage::Service::RegistryTest < ActiveSupport::TestCase
6+
test "inspect attributes" do
7+
registry = ActiveStorage::Service::Registry.new({})
8+
assert_match(/#<ActiveStorage::Service::Registry>/, registry.inspect)
9+
end
10+
11+
test "inspect attributes with config" do
12+
config = {
13+
local: { service: "Disk", root: "/tmp/active_storage_registry_test" },
14+
tmp: { service: "Disk", root: "/tmp/active_storage_registry_test_tmp" },
15+
}
16+
17+
registry = ActiveStorage::Service::Registry.new(config)
18+
assert_match(/#<ActiveStorage::Service::Registry configurations=\[:local, :tmp\]>/, registry.inspect)
19+
end
20+
end

activestorage/test/service_test.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# frozen_string_literal: true
2+
3+
require "test_helper"
4+
5+
class ActiveStorage::ServiceTest < ActiveSupport::TestCase
6+
test "inspect attributes" do
7+
config = {
8+
local: { service: "Disk", root: "/tmp/active_storage_service_test" },
9+
tmp: { service: "Disk", root: "/tmp/active_storage_service_test_tmp" },
10+
}
11+
12+
service = ActiveStorage::Service.configure(:local, config)
13+
assert_match(/#<ActiveStorage::Service::DiskService name=:local>/, service.inspect)
14+
15+
service = ActiveStorage::Service.new
16+
assert_match(/#<ActiveStorage::Service>/, service.inspect)
17+
end
18+
end

0 commit comments

Comments
 (0)