From ccac681122db9747fec9512076772bca345e24b9 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Mon, 5 Mar 2018 11:53:31 -0500
Subject: Generate root-relative paths in Active Storage disk service URL
 methods

Fixes #32129.
---
 .../lib/active_storage/service/disk_service.rb     | 28 ++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'activestorage/lib/active_storage/service/disk_service.rb')

diff --git a/activestorage/lib/active_storage/service/disk_service.rb b/activestorage/lib/active_storage/service/disk_service.rb
index d17eea9046..75b66081c3 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,11 @@ 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_path(
             verified_key_with_expiration,
             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 +104,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_path(verified_token_with_expiration)
 
         payload[:url] = generated_url
 
@@ -121,11 +129,17 @@ module ActiveStorage
         path_for(key).tap { |path| FileUtils.mkdir_p File.dirname(path) }
       end
 
+
       def ensure_integrity_of(key, checksum)
         unless Digest::MD5.file(path_for(key)).base64digest == checksum
           delete key
           raise ActiveStorage::IntegrityError
         end
       end
+
+
+      def url_helpers
+        @url_helpers ||= Rails.application.routes.url_helpers
+      end
   end
 end
-- 
cgit v1.2.3