From 95e7e56efcad98b6b89e407ced78512ea16268e6 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 9 May 2013 15:12:31 -0700
Subject: object based callbacks cannot be duplicated

---
 activesupport/lib/active_support/callbacks.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 511162f20f..2ea41ab2f2 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -89,10 +89,7 @@ module ActiveSupport
     end
 
     class Callback #:nodoc:#
-      class Basic < Callback
-      end
-
-      class Object < Callback
+      class Unduplicable < Callback # :nodoc:
         def duplicates?(other)
           false
         end
@@ -100,10 +97,10 @@ module ActiveSupport
 
       def self.build(chain, filter, kind, options, _klass)
         klass = case filter
-                when Array, Symbol, String
-                  Callback::Basic
+                when Symbol, String
+                  Callback
                 else
-                  Callback::Object
+                  Callback::Unduplicable
                 end
         klass.new chain, filter, kind, options, _klass
       end
-- 
cgit v1.2.3