From 1acebd253031722c39983e195e94be76f29285d4 Mon Sep 17 00:00:00 2001 From: Tom Stuart Date: Wed, 3 Nov 2010 08:45:56 +0000 Subject: [PATCH] Backport BlankSlate removal from ActiveSupport::BasicObject [#5911 state:resolved] This is a backport of dd15a3fee0ded53cf91c7796e3527db366d1327a. --- activesupport/lib/active_support/basic_object.rb | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb index 1f77209..3b5277c 100644 --- a/activesupport/lib/active_support/basic_object.rb +++ b/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 @@ module ActiveSupport 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 -- 1.7.2