1 files changed, 24 insertions, 7 deletions
diff --git a/activestorage/lib/active_storage/service/disk_service.rb b/activestorage/lib/active_storage/service/disk_service.rb
index d17eea9046..5b652fe74e 100644
--- a/activestorage/lib/active_storage/service/disk_service.rb
+++ b/activestorage/lib/active_storage/service/disk_service.rb
@@ -9,10 +9,10 @@ module ActiveStorage
   # Wraps a local disk path as an Active Storage service. See ActiveStorage::Service for the generic API
   # documentation that applies to all services.
   class Service::DiskService < Service
-    attr_reader :root, :host
+    attr_reader :root
 
-    def initialize(root:, host: "http://localhost:3000")
-      @root, @host = root, host
+    def initialize(root:)
+      @root = root
     end
 
     def upload(key, io, checksum: nil)
@@ -38,6 +38,15 @@ module ActiveStorage
       end
     end
 
+    def download_chunk(key, range)
+      instrument :download_chunk, key: key, range: range do
+        File.open(path_for(key), "rb") do |file|
+          file.seek range.begin
+          file.read range.size
+        end
+      end
+    end
+
     def delete(key)
       instrument :delete, key: key do
         begin
@@ -69,12 +78,12 @@ module ActiveStorage
         verified_key_with_expiration = ActiveStorage.verifier.generate(key, expires_in: expires_in, purpose: :blob_key)
 
         generated_url =
-          Rails.application.routes.url_helpers.rails_disk_service_url(
+          url_helpers.rails_disk_service_url(
             verified_key_with_expiration,
+            host: current_host,
             filename: filename,
             disposition: content_disposition_with(type: disposition, filename: filename),
-            content_type: content_type,
-            host: host
+            content_type: content_type
           )
 
         payload[:url] = generated_url
@@ -96,7 +105,7 @@ module ActiveStorage
           purpose: :blob_token }
         )
 
-        generated_url = Rails.application.routes.url_helpers.update_rails_disk_service_url(verified_token_with_expiration, host: host)
+        generated_url = url_helpers.update_rails_disk_service_url(verified_token_with_expiration, host: current_host)
 
         payload[:url] = generated_url
 
@@ -127,5 +136,13 @@ module ActiveStorage
           raise ActiveStorage::IntegrityError
         end
       end
+
+      def url_helpers
+        @url_helpers ||= Rails.application.routes.url_helpers
+      end
+
+      def current_host
+        ActiveStorage::Current.host
+      end
   end
 end