From 46da4ee7daf1ecaa2fc47a260ccb58e119a1b5ea Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 23 Jul 2017 11:05:20 -0500
Subject: Switch to simpler signed_id for blob rather than full GlobalID

We don't need to lookup multiple different classes, so no need to use a globalid.
---
 app/models/active_storage/blob.rb                 | 9 +++++++++
 app/models/active_storage/service/disk_service.rb | 1 +
 2 files changed, 10 insertions(+)

(limited to 'app/models')

diff --git a/app/models/active_storage/blob.rb b/app/models/active_storage/blob.rb
index 6bd3941cd8..7b45d3ad25 100644
--- a/app/models/active_storage/blob.rb
+++ b/app/models/active_storage/blob.rb
@@ -2,6 +2,7 @@ require "active_storage/service"
 require "active_storage/filename"
 require "active_storage/purge_job"
 require "active_storage/variant"
+require "active_storage/variation"
 
 # Schema: id, key, filename, content_type, metadata, byte_size, checksum, created_at
 class ActiveStorage::Blob < ActiveRecord::Base
@@ -13,6 +14,10 @@ class ActiveStorage::Blob < ActiveRecord::Base
   class_attribute :service
 
   class << self
+    def find_signed(id)
+      find ActiveStorage.verifier.verify(id)
+    end
+
     def build_after_upload(io:, filename:, content_type: nil, metadata: nil)
       new.tap do |blob|
         blob.filename     = filename
@@ -33,6 +38,10 @@ class ActiveStorage::Blob < ActiveRecord::Base
   end
 
 
+  def signed_id
+    ActiveStorage.verifier.generate(id)
+  end
+
   def key
     # We can't wait until the record is first saved to have a key for it
     self[:key] ||= self.class.generate_unique_secure_token
diff --git a/app/models/active_storage/service/disk_service.rb b/app/models/active_storage/service/disk_service.rb
index a2a27528c1..905f41c138 100644
--- a/app/models/active_storage/service/disk_service.rb
+++ b/app/models/active_storage/service/disk_service.rb
@@ -2,6 +2,7 @@ require "fileutils"
 require "pathname"
 require "digest/md5"
 require "active_support/core_ext/numeric/bytes"
+require "active_storage/verified_key_with_expiration"
 
 class ActiveStorage::Service::DiskService < ActiveStorage::Service
   attr_reader :root
-- 
cgit v1.2.3