From fda9a852a35a1a72dd882ced204920baef8c28d4 Mon Sep 17 00:00:00 2001 From: David Reese Date: Thu, 6 Aug 2009 15:42:42 -0500 Subject: [PATCH] Make BlankSlate play nice with Ruby 1.9#methods --- .../vendor/builder-2.1.2/blankslate.rb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/blankslate.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/blankslate.rb index da6034d..713a37b 100644 --- a/activesupport/lib/active_support/vendor/builder-2.1.2/blankslate.rb +++ b/activesupport/lib/active_support/vendor/builder-2.1.2/blankslate.rb @@ -20,10 +20,11 @@ class BlankSlate # Hide the method named +name+ in the BlankSlate class. Don't # hide +instance_eval+ or any method beginning with "__". def hide(name) - if instance_methods.include?(name.to_s) and + method_name = RUBY_VERSION < '1.9' ? name.to_s : name.to_sym + if instance_methods.include?(method_name) and name !~ /^(__|instance_eval)/ @hidden_methods ||= {} - @hidden_methods[name.to_sym] = instance_method(name) + @hidden_methods[name.to_sym] = instance_method(method_name) undef_method name end end -- 1.6.0