Skip to content
Browse files

Backport BlankSlate removal from ActiveSupport::BasicObject [#5911 st…

…ate:resolved]

This is a backport of dd15a3f.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
  • Loading branch information...
1 parent 25139ac commit 44db47c63e669bdad74e4ac92a79fde13f6b839d @tomstuart tomstuart committed with pixeltrix Nov 3, 2010
Showing with 7 additions and 10 deletions.
  1. +7 −10 activesupport/lib/active_support/basic_object.rb
View
17 activesupport/lib/active_support/basic_object.rb
@@ -1,13 +1,7 @@
-# A base class with no predefined methods that tries to behave like Builder's
-# BlankSlate in Ruby 1.9. In Ruby pre-1.9, this is actually the
-# Builder::BlankSlate class.
-#
-# Ruby 1.9 introduces BasicObject which differs slightly from Builder's
-# BlankSlate that has been used so far. ActiveSupport::BasicObject provides a
-# barebones base class that emulates Builder::BlankSlate while still relying on
-# Ruby 1.9's BasicObject in Ruby 1.9.
module ActiveSupport
if defined? ::BasicObject
+ # A class with no predefined methods that behaves similarly to Builder's
+ # BlankSlate. Used for proxy classes.
class BasicObject < ::BasicObject
undef_method :==
undef_method :equal?
@@ -18,7 +12,10 @@ def raise(*args)
end
end
else
- require 'blankslate'
- BasicObject = BlankSlate
+ class BasicObject #:nodoc:
+ instance_methods.each do |m|
+ undef_method(m) if m.to_s !~ /(?:^__|^nil\?$|^send$|^object_id$)/
+ end
+ end
end
end

0 comments on commit 44db47c

Please sign in to comment.
Something went wrong with that request. Please try again.