Merge pull request #1212 from collectiveidea/fix-proxy-object-depreca…

…tion Fix proxy object deprecation
collectiveidea · Aug 13, 2024 · 61cfd03 · 61cfd03
2 parents b66bb64 + 21b3dad
commit 61cfd03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/lib/delayed/compatibility.rb b/lib/delayed/compatibility.rb
@@ -3,25 +3,13 @@
 module Delayed
   module Compatibility
     if ActiveSupport::VERSION::MAJOR >= 4
-      require 'active_support/proxy_object'
-
       def self.executable_prefix
         'bin'
       end
-
-      def self.proxy_object_class
-        ActiveSupport::ProxyObject
-      end
     else
-      require 'active_support/basic_object'
-
       def self.executable_prefix
         'script'
       end
-
-      def self.proxy_object_class
-        ActiveSupport::BasicObject
-      end
     end
   end
 end
diff --git a/lib/delayed/message_sending.rb b/lib/delayed/message_sending.rb
@@ -1,5 +1,11 @@
 module Delayed
-  class DelayProxy < Delayed::Compatibility.proxy_object_class
+  class DelayProxy < BasicObject
+    undef_method :==
+    undef_method :equal?
+
+    # Let DelayProxy raise exceptions.
+    define_method(:raise, ::Object.instance_method(:raise))
+
     def initialize(payload_class, target, options)
       @payload_class = payload_class
       @target = target