1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Generate getter and setter methods in mixin

Generated attachment getter and setter methods are created within
the model's `GeneratedAssociationMethods` module to allow overriding
and composition using `super`.

Includes tests for new functionality.

Co-authored-by: Josh Susser <josh@hasmanythrough.com>
Co-authored-by: Jamon Douglas <terrildouglas@gmail.com>
This commit is contained in:
Josh Susser 2018-05-17 14:22:00 -07:00
parent 6c05728a50
commit fd0bd1bf68
3 changed files with 62 additions and 2 deletions

View file

@ -1,3 +1,9 @@
* Generated attachment getter and setter methods are created
within the model's `GeneratedAssociationMethods` module to
allow overriding and composition using `super`.
*Josh Susser*, *Jamon Douglas*
* Add `ActiveStorage::Blob#open`, which downloads a blob to a tempfile on disk * Add `ActiveStorage::Blob#open`, which downloads a blob to a tempfile on disk
and yields the tempfile. Deprecate `ActiveStorage::Downloading`. and yields the tempfile. Deprecate `ActiveStorage::Downloading`.

View file

@ -28,7 +28,7 @@ module ActiveStorage
# If the +:dependent+ option isn't set, the attachment will be purged # If the +:dependent+ option isn't set, the attachment will be purged
# (i.e. destroyed) whenever the record is destroyed. # (i.e. destroyed) whenever the record is destroyed.
def has_one_attached(name, dependent: :purge_later) def has_one_attached(name, dependent: :purge_later)
class_eval <<-CODE, __FILE__, __LINE__ + 1 generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
def #{name} def #{name}
@active_storage_attached_#{name} ||= ActiveStorage::Attached::One.new("#{name}", self, dependent: #{dependent == :purge_later ? ":purge_later" : "false"}) @active_storage_attached_#{name} ||= ActiveStorage::Attached::One.new("#{name}", self, dependent: #{dependent == :purge_later ? ":purge_later" : "false"})
end end
@ -75,7 +75,7 @@ module ActiveStorage
# If the +:dependent+ option isn't set, all the attachments will be purged # If the +:dependent+ option isn't set, all the attachments will be purged
# (i.e. destroyed) whenever the record is destroyed. # (i.e. destroyed) whenever the record is destroyed.
def has_many_attached(name, dependent: :purge_later) def has_many_attached(name, dependent: :purge_later)
class_eval <<-CODE, __FILE__, __LINE__ + 1 generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
def #{name} def #{name}
@active_storage_attached_#{name} ||= ActiveStorage::Attached::Many.new("#{name}", self, dependent: #{dependent == :purge_later ? ":purge_later" : "false"}) @active_storage_attached_#{name} ||= ActiveStorage::Attached::Many.new("#{name}", self, dependent: #{dependent == :purge_later ? ":purge_later" : "false"})
end end

View file

@ -0,0 +1,54 @@
# frozen_string_literal: true
require "test_helper"
require "database/setup"
class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
include ActiveJob::TestHelper
setup do
@user = User.create!(name: "Josh")
end
teardown { ActiveStorage::Blob.all.each(&:purge) }
test "overriding has_one_attached methods works" do
# attach blob before messing with getter, which breaks `#attach`
@user.avatar.attach create_blob(filename: "funky.jpg")
# inherited only
assert_equal "funky.jpg", @user.avatar.filename.to_s
User.class_eval do
def avatar
super.filename.to_s.reverse
end
end
# override with super
assert_equal "funky.jpg".reverse, @user.avatar
User.send(:remove_method, :avatar)
end
test "overriding has_many_attached methods works" do
# attach blobs before messing with getter, which breaks `#attach`
@user.highlights.attach create_blob(filename: "funky.jpg"), create_blob(filename: "wonky.jpg")
# inherited only
assert_equal "funky.jpg", @user.highlights.first.filename.to_s
assert_equal "wonky.jpg", @user.highlights.second.filename.to_s
User.class_eval do
def highlights
super.reverse
end
end
# override with super
assert_equal "wonky.jpg", @user.highlights.first.filename.to_s
assert_equal "funky.jpg", @user.highlights.second.filename.to_s
User.send(:remove_method, :highlights)
end
end