ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

de-conflict autoextend const_added method 

refs AE-855

Change-Id: Ib2f622aaf0fbbc703e33888890cdd2a1b2cb90f3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/343689
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Isaac Moore <isaac.moore@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
This commit is contained in:
Aaron Ogata 2024-03-25 13:06:06 -07:00
parent 91751a3b7a
commit e39a1f7ba3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user_observer.rb
View File

@ -2,4 +2,4 @@
# to deal with any lingering references (e.g. jobs, plugins) # to deal with any lingering references (e.g. jobs, plugins)
UserObserver = UserObservationLink UserObserver = UserObservationLink
Autoextend.const_added("UserObserver", source: :inherited) Autoextend.ae_const_added("UserObserver", source: :inherited)

12
gems/autoextend/lib/autoextend.rb
View File

@ -22,7 +22,7 @@ require_relative "autoextend/railtie" if defined?(Rails::Railtie)
module Autoextend module Autoextend
class << self class << self
def const_added(const, source:, recursive: false) def ae_const_added(const, source:, recursive: false)
const_name = const.is_a?(String) ? const : const.name const_name = const.is_a?(String) ? const : const.name
return [] unless const_name return [] unless const_name
@ -44,7 +44,7 @@ module Autoextend
child_const = const.const_get(child, false) child_const = const.const_get(child, false)
next unless child_const.is_a?(Module) next unless child_const.is_a?(Module)
const_added(child_const, source:, recursive: true) ae_const_added(child_const, source:, recursive: true)
end end
end end
@ -144,7 +144,7 @@ module Autoextend
loader.on_load do |_cpath, value, _abspath| loader.on_load do |_cpath, value, _abspath|
next unless value.is_a?(Module) next unless value.is_a?(Module)
Autoextend.const_added(value, source: :Zeitwerk, recursive: true) Autoextend.ae_const_added(value, source: :Zeitwerk, recursive: true)
end end
end end
end end
@ -184,7 +184,7 @@ end
module Autoextend::ClassMethods module Autoextend::ClassMethods
def inherited(klass) def inherited(klass)
Autoextend.const_added(klass, source: :inherited) Autoextend.ae_const_added(klass, source: :inherited)
super super
end end
end end
@ -193,14 +193,14 @@ end
# only when it gets included into a class. # only when it gets included into a class.
module Autoextend::ModuleMethods module Autoextend::ModuleMethods
def prepended(klass) def prepended(klass)
Autoextend.const_added(self, source: :prepended).each do |extension| Autoextend.ae_const_added(self, source: :prepended).each do |extension|
extension.extend(klass, source: :prepended) extension.extend(klass, source: :prepended)
end end
super super
end end
def included(klass) def included(klass)
Autoextend.const_added(self, source: :included).each do |extension| Autoextend.ae_const_added(self, source: :included).each do |extension|
extension.extend(klass, source: :included) extension.extend(klass, source: :included)
end end
super super