aboutsummaryrefslogtreecommitdiffstats
path: root/lib/active_file/site/disk_site.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-04 18:11:06 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-04 18:11:06 +0200
commit4712e2361199c0becc216d392d3d84666bad076b (patch)
tree0d2547043a571050cbc975c3bdf5007e06a4502e /lib/active_file/site/disk_site.rb
parent09878fb19d46674605fb6e48c1b86e2915ad7496 (diff)
downloadrails-4712e2361199c0becc216d392d3d84666bad076b.tar.gz
rails-4712e2361199c0becc216d392d3d84666bad076b.tar.bz2
rails-4712e2361199c0becc216d392d3d84666bad076b.zip
Fix up DiskController and add basic testing
Diffstat (limited to 'lib/active_file/site/disk_site.rb')
-rw-r--r--lib/active_file/site/disk_site.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/active_file/site/disk_site.rb b/lib/active_file/site/disk_site.rb
index ec60175bbf..7916a642c0 100644
--- a/lib/active_file/site/disk_site.rb
+++ b/lib/active_file/site/disk_site.rb
@@ -40,7 +40,7 @@ class ActiveFile::Site::DiskSite < ActiveFile::Site
def url(key, expires_in:, disposition:, filename:)
verified_key_with_expiration = ActiveFile::VerifiedKeyWithExpiration.encode(key, expires_in: expires_in)
- if defined?(Rails)
+ if defined?(Rails) && defined?(Rails.application)
Rails.application.routes.url_helpers.rails_disk_blob_path(verified_key_with_expiration, disposition: disposition)
else
"/rails/blobs/#{verified_key_with_expiration}?disposition=#{disposition}"