aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-20 14:05:18 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-20 14:05:18 -0500
commit5dbe5eaeb84b470624f1a2785315ddd4f7b1a4e3 (patch)
tree7f5465fab0fa3bad5fced07ce5ad5815f75ec140 /lib
parent66d94ed78dced24cdd186e8bb5877cc6d43f5da8 (diff)
downloadrails-5dbe5eaeb84b470624f1a2785315ddd4f7b1a4e3.tar.gz
rails-5dbe5eaeb84b470624f1a2785315ddd4f7b1a4e3.tar.bz2
rails-5dbe5eaeb84b470624f1a2785315ddd4f7b1a4e3.zip
Follow AR like naming of factory method
Diffstat (limited to 'lib')
-rw-r--r--lib/active_storage/controllers/variants_controller.rb2
-rw-r--r--lib/active_storage/variant.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/active_storage/controllers/variants_controller.rb b/lib/active_storage/controllers/variants_controller.rb
index 24cee16e80..094f94e706 100644
--- a/lib/active_storage/controllers/variants_controller.rb
+++ b/lib/active_storage/controllers/variants_controller.rb
@@ -4,7 +4,7 @@ require "active_storage/blob"
class ActiveStorage::Controllers::VariantsController < ActionController::Base
def show
if blob_key = decode_verified_key
- variant = ActiveStorage::Variant.lookup(blob_key: blob_key, variation_key: params[:variation_key])
+ variant = ActiveStorage::Variant.find_or_create_by(blob_key: blob_key, variation_key: params[:variation_key])
redirect_to variant.url
else
head :not_found
diff --git a/lib/active_storage/variant.rb b/lib/active_storage/variant.rb
index 9b9dad43da..f005454b00 100644
--- a/lib/active_storage/variant.rb
+++ b/lib/active_storage/variant.rb
@@ -7,7 +7,7 @@ class ActiveStorage::Variant
attr_reader :blob, :variation
delegate :service, to: :blob
- def self.lookup(blob_key:, variation_key:)
+ def self.find_or_create_by(blob_key:, variation_key:)
new ActiveStorage::Blob.find_by!(key: blob_key), variation: verifier.verify(variation_key)
end