2 files changed, 21 insertions, 25 deletions

diff --git a/activestorage/lib/active_storage/attached/macros.rb b/activestorage/lib/active_storage/attached/macros.rb
index ef00033aeb..eb877f10c0 100644
--- a/activestorage/lib/active_storage/attached/macros.rb
+++ b/activestorage/lib/active_storage/attached/macros.rb
@@ -10,25 +10,23 @@ module ActiveStorage
     # There is no column defined on the model side, Active Storage takes
     # care of the mapping between your records and the attachment.
     #
-    # Under the covers, this relationship is implemented as a `has_one` association to a
-    # `ActiveStorage::Attachment` record and a `has_one-through` association to a
-    # `ActiveStorage::Blob` record. These associations are available as `avatar_attachment`
-    # and `avatar_blob`. But you shouldn't need to work with these associations directly in
+    # Under the covers, this relationship is implemented as a +has_one+ association to a
+    # ActiveStorage::Attachment record and a +has_one-through+ association to a
+    # ActiveStorage::Blob record. These associations are available as +avatar_attachment+
+    # and +avatar_blob+. But you shouldn't need to work with these associations directly in
     # most circumstances.
     #
-    # The system has been designed to having you go through the `ActiveStorage::Attached::One`
-    # proxy that provides the dynamic proxy to the associations and factory methods, like `#attach`.
+    # The system has been designed to having you go through the ActiveStorage::Attached::One
+    # proxy that provides the dynamic proxy to the associations and factory methods, like +#attach+.
     #
     # If the +:dependent+ option isn't set, the attachment will be purged
     # (i.e. destroyed) whenever the record is destroyed.
     def has_one_attached(name, dependent: :purge_later)
-      define_method(name) do
-        if instance_variable_defined?("@active_storage_attached_#{name}")
-          instance_variable_get("@active_storage_attached_#{name}")
-        else
-          instance_variable_set("@active_storage_attached_#{name}", ActiveStorage::Attached::One.new(name, self))
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}
+          @active_storage_attached_#{name} ||= ActiveStorage::Attached::One.new("#{name}", self)
         end
-      end
+      CODE
 
       has_one :"#{name}_attachment", -> { where(name: name) }, class_name: "ActiveStorage::Attachment", as: :record
       has_one :"#{name}_blob", through: :"#{name}_attachment", class_name: "ActiveStorage::Blob", source: :blob
@@ -51,25 +49,23 @@ module ActiveStorage
     #
     #   Gallery.where(user: Current.user).with_attached_photos
     #
-    # Under the covers, this relationship is implemented as a `has_many` association to a
-    # `ActiveStorage::Attachment` record and a `has_many-through` association to a
-    # `ActiveStorage::Blob` record. These associations are available as `photos_attachments`
-    # and `photos_blobs`. But you shouldn't need to work with these associations directly in
+    # Under the covers, this relationship is implemented as a +has_many+ association to a
+    # ActiveStorage::Attachment record and a +has_many-through+ association to a
+    # ActiveStorage::Blob record. These associations are available as +photos_attachments+
+    # and +photos_blobs+. But you shouldn't need to work with these associations directly in
     # most circumstances.
     #
-    # The system has been designed to having you go through the `ActiveStorage::Attached::Many`
-    # proxy that provides the dynamic proxy to the associations and factory methods, like `#attach`.
+    # The system has been designed to having you go through the ActiveStorage::Attached::Many
+    # proxy that provides the dynamic proxy to the associations and factory methods, like +#attach+.
     #
     # If the +:dependent+ option isn't set, all the attachments will be purged
     # (i.e. destroyed) whenever the record is destroyed.
     def has_many_attached(name, dependent: :purge_later)
-      define_method(name) do
-        if instance_variable_defined?("@active_storage_attached_#{name}")
-          instance_variable_get("@active_storage_attached_#{name}")
-        else
-          instance_variable_set("@active_storage_attached_#{name}", ActiveStorage::Attached::Many.new(name, self))
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}
+          @active_storage_attached_#{name} ||= ActiveStorage::Attached::Many.new("#{name}", self)
         end
-      end
+      CODE
 
       has_many :"#{name}_attachments", -> { where(name: name) }, as: :record, class_name: "ActiveStorage::Attachment"
       has_many :"#{name}_blobs", through: :"#{name}_attachments", class_name: "ActiveStorage::Blob", source: :blob
diff --git a/activestorage/lib/active_storage/attached/many.rb b/activestorage/lib/active_storage/attached/many.rb
index 1723756831..cc3e70ffe2 100644
--- a/activestorage/lib/active_storage/attached/many.rb
+++ b/activestorage/lib/active_storage/attached/many.rb
@@ -5,7 +5,7 @@ module ActiveStorage
 
     # Returns all the associated attachment records.
     #
-    # All methods called on this proxy object that aren't listed here will automatically be delegated to `attachments`.
+    # All methods called on this proxy object that aren't listed here will automatically be delegated to +attachments+.
     def attachments
       record.public_send("#{name}_attachments")
     end