diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/basic_object.rb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb index 5e79de993f..009a521a40 100644 --- a/activesupport/lib/active_support/basic_object.rb +++ b/activesupport/lib/active_support/basic_object.rb @@ -1,5 +1,14 @@ -# Ruby 1.9 introduces BasicObject. Use Builder's BlankSlate until then. -unless defined? BasicObject - require 'blankslate' - BasicObject = BlankSlate +# Ruby 1.9 introduces BasicObject which differs slighly from Builder's BlankSlate +# that had been used so far ActiveSupport::BasicObject provides a barebones object with +# the same method on both versions. +module ActiveSupport + if RUBY_VERSION >= '1.9' + class BasicObject < ::BasicObject + undef_method :== + undef_method :equal? + end + else + require 'blankslate' + BasicObject = BlankSlate + end end |